September 2015 - tor-commits - lists.torproject.org

[gettor/master] Adapted to new format for links files. Read config from file with ConfigParser. Added logging
by ilv＠torproject.org 22 Sep '15

22 Sep '15

commit 7a4c1c507682fb2d468ac7f2d4bc56402a21e23b Author: ilv <ilv(a)users.noreply.github.com> Date: Fri Jun 6 13:02:52 2014 -0400 Adapted to new format for links files. Read config from file with ConfigParser. Added logging --- src/gettor.py | 101 ++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 72 insertions(+), 29 deletions(-) diff --git a/src/gettor.py b/src/gettor.py index 02f5eb2..2157898 100644 --- a/src/gettor.py +++ b/src/gettor.py @@ -2,6 +2,22 @@ import os import re import inspect import logging +import ConfigParser + +""" + GetTor main module. + + Classes: + Core: Get links from providers. + + Methods: + Core.get_links(): Get the links. It throws ValueError and + RuntimeError on failure. + + Exceptions: + ValueError: Request for an unsupported locale/operating system. + RuntimeError: Something went wrong internally. +""" class Core: @@ -13,19 +29,39 @@ class Core: get_links(operating_system, locale) """ - def __init__(self): + def __init__(self, config_file): """ Initialize a Core object by reading a configuration file. + Raises a RuntimeError if the configuration file doesn't exists. + Parameters: none """ - # Read configuration file + logging.basicConfig() + logger = logging.getLogger(__name__) + + config = ConfigParser.ConfigParser() - # Dummy info. This should be read from a configuration file. - self.basedir = './providers/' - self.supported_locales = ['en', 'es'] - self.supported_os = ['windows', 'linux', 'osx'] + if os.path.isfile(config_file): + logger.debug("Reading configuration from %s" % config_file) + config.read(config_file) + else: + logger.error("Error while trying to read %s" % config_file) + raise RuntimeError("Couldn't read the configuration file %s" + % config_file) + + # To do: check for unspecified sections and/or options + self.basedir = config.get('general', 'basedir') + self.linksdir = config.get('links', 'linksdir') + self.supported_locales = config.get('links', 'locales').split(', ') + self.supported_os = config.get('links', 'os').split(', ') + self.loglevel = config.get('log', 'loglevel') + self.logdir = config.get('log', 'logdir') + self.logger = logger + self.logger.setLevel(logging.getLevelName(self.loglevel)) + + self.logger.debug("New core object created") def get_links(self, operating_system, locale): """ @@ -39,13 +75,15 @@ class Core: (e.g. SMTP). """ - # Log requests self._log_request(operating_system, locale) if locale not in self.supported_locales: + self.logger.warning("Request for unsupported locale: %s" % locale) raise ValueError("Locale %s not supported at the moment" % locale) if operating_system not in self.supported_os: + self.logger.warning("Request for unsupported operating system: %s" + % operating_system) raise ValueError("Operating system %s not supported at the moment" % operating_system) @@ -53,8 +91,10 @@ class Core: links = self._get_links(operating_system, locale) if links is None: + self.logger.error("Couldn't get the links", exc_info=True) raise RuntimeError("Something went wrong with GetTor's core") + self.logger.info("Returning the links") return links def _get_links(self, operating_system, locale): @@ -70,18 +110,29 @@ class Core: locale: string describing the locale """ - # There should be a 'providers' directory inside self.basedir + # We read the links files from the 'linksdir' inside 'basedir' + # + # Each .links file uses the ConfigParser's format. + # There should be a section [provider] with the option 'name' for + # the provider's name (e.g. Dropbox) # - # Each .links file begins with a string describing the provider. - # After that, every line should have the following format: + # Following sections should specify the operating system and its + # options should be the locale. When more than one link is available + # per operating system and locale (always) the links should be + # specified as a multiline value. Each link has the format: # - # operating_system locale link package_signature key_fingerprint + # link link_signature key_fingerprint # # e.g. # - # Dropbox - # linux en https://foo.bar https://foo.bar.asc 111-222-333-444 - # osx es https://bar.baz https://bar.baz.asc 555-666-777-888 + # [provider] + # name: Dropbox + # + # [linux] + # en: https://foo.bar https://foo.bar.asc 111-222-333-444, + # https://foo.bar https://foo.bar.asc 555-666-777-888 + # + # es: https://bar.baz https://bar.baz.asc 555-666-777-888 # links = [] @@ -98,20 +149,13 @@ class Core: # to check if no links were found. providers = {} + self.logger.info("Reading links from providers directory") # We trust links have been generated properly + config = ConfigParser.ConfigParser() for name in links: - link_file = open(name, 'r') - provider_name = link_file.readline() - - for line in link_file: - words = line.split(' ') - if words[0] == operating_system and words[1] == locale: - providers.setdefault(provider_name, []).append( - "%s %s %s" % - (words[2], words[3], words[4].replace('-', ' ')) - ) - - link_file.close() + config.read(name) + provider_name = config.get('provider', 'name') + providers[provider_name] = config.get(operating_system, locale) # Create the final links list with all providers all_links = [] @@ -136,6 +180,5 @@ class Core: caller = inspect.stack()[2] module = inspect.getmodule(caller[0]) - # Dummy print for now. Should be done with logging - print "\nCalled by %s\nOS: %s\nLocale: %s\n" % \ - (str(module), operating_system, locale) + self.logger.info("\n%s did a request for %s, %s\n" % + (str(module), operating_system, locale))

1 0

[gettor/master] Adapted to read config from file (it fails if file doesn't exists)
by ilv＠torproject.org 22 Sep '15

22 Sep '15

commit fc698384da9f48de6aef6f40cd3d33d7ee34c047 Author: ilv <ilv(a)users.noreply.github.com> Date: Fri Jun 6 13:03:27 2014 -0400 Adapted to read config from file (it fails if file doesn't exists) --- src/core_demo.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/core_demo.py b/src/core_demo.py index 3513e46..d30f2a4 100644 --- a/src/core_demo.py +++ b/src/core_demo.py @@ -5,12 +5,11 @@ import gettor -core = gettor.Core() - try: + core = gettor.Core('gettor.cfg') links = core.get_links('linux', 'en') print links except ValueError as e: - print "Value error! " + str(e) + print "Value error: " + str(e) except RuntimeError as e: - print "Internal error! " + str(e) + print "Internal error: " + str(e)

1 0

[gettor/master] Example configuration file. There sould be a document explaining its options [pending]
by ilv＠torproject.org 22 Sep '15

22 Sep '15

commit 42c30d7e5dd5a0ca3d5c2bd882f98bbae3eafb42 Author: ilv <ilv(a)users.noreply.github.com> Date: Fri Jun 6 13:05:14 2014 -0400 Example configuration file. There sould be a document explaining its options [pending] --- src/gettor.cfg | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/gettor.cfg b/src/gettor.cfg new file mode 100644 index 0000000..e56cf3a --- /dev/null +++ b/src/gettor.cfg @@ -0,0 +1,11 @@ +[general] +basedir: ./providers/ + +[links] +linksdir: providers/ +os: linux, windows, osx +locales: es, en + +[log] +logdir = log/ +loglevel = INFO

1 0

[gettor/master] This change is for code, not design
by ilv＠torproject.org 22 Sep '15

22 Sep '15

commit ed5021254a8ee4ce43cb6c5ce774aa4ad1e99c01 Author: ilv <ilv(a)users.noreply.github.com> Date: Sat Jun 7 10:02:57 2014 -0400 This change is for code, not design --- spec/design/core.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/design/core.txt b/spec/design/core.txt index cb7945f..cc7b05d 100644 --- a/spec/design/core.txt +++ b/spec/design/core.txt @@ -5,7 +5,6 @@ Changes: [0.03] Changed proposed format for link files to RFC 882 (ConfigParser). Read configuration from file with ConfigParser. - Added logging. [0.02] Combine official mirrors with providers links (as another provider). Eliminated on demand link generation. Now it reads from files.

1 0

[webwml/master] Ask for a minimum of 10$ in donations
by sebastian＠torproject.org 22 Sep '15

22 Sep '15

commit d10b7aa206ad92a5e915da468142277ad733472d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Sep 22 23:38:38 2015 +0200 Ask for a minimum of 10$ in donations --- donate/en/donate.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/donate/en/donate.wml b/donate/en/donate.wml index a196300..b28f1ac 100644 --- a/donate/en/donate.wml +++ b/donate/en/donate.wml @@ -83,7 +83,7 @@ Account</small> <option value="GBP">£</option> </select> </li> - <li><input type="radio" class="radio" name="amount" value="5.00"><label for="5">5 </label></li> + <li><input type="radio" class="radio" name="amount" value="10.00"><label for="10">10 </label></li> <li><input type="radio" class="radio" name="amount" value="23.00"><label for="23">23 </label></li> <li><input type="radio" class="radio" name="amount" value="100.00" checked="checked"><label for="100">100 </label></li> <li><input type="radio" class="radio" name="amount" value="256.00"><label for="256">256</label></li>

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 22 Sep '15

22 Sep '15

commit 5494f757b2c404834c35ffa42884ef48bb2404c3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 22 21:45:55 2015 +0000 Update translations for tails-misc_completed --- hu.po | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/hu.po b/hu.po index 6accc76..015da7e 100644 --- a/hu.po +++ b/hu.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# benewfy <benewfy(a)gmail.com>, 2015 # Blackywantscookies <gaborcika(a)citromail.hu>, 2014 # Blackywantscookies <gaborcika(a)citromail.hu>, 2014 # iskr <iscreamd(a)gmail.com>, 2013 @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-10 18:53+0200\n" -"PO-Revision-Date: 2015-08-21 20:59+0000\n" -"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" +"POT-Creation-Date: 2015-09-20 19:32+0200\n" +"PO-Revision-Date: 2015-09-22 21:29+0000\n" +"Last-Translator: benewfy <benewfy(a)gmail.com>\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,11 +25,11 @@ msgstr "" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43 msgid "Tor is ready" -msgstr "Tor működésre kész." +msgstr "Tor készen áll." #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:44 msgid "You can now access the Internet." -msgstr "Mostmár hozzáférsz az internethez." +msgstr "Most már hozzáférsz az internethez." #: config/chroot_local-includes/etc/whisperback/config.py:64 #, python-format @@ -310,23 +311,23 @@ msgstr "Úgy néz ki blokkolva van a hálózati kapcsolatod. Lehet köze van a M msgid "This version of Tails has known security issues:" msgstr "A Tails ezen verziója ismert biztonsági problémákkal rendelkezik:" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:37 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:45 #, sh-format msgid "Network card ${nic} disabled" msgstr "Hálózati kártya ${nic} letiltva" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:38 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:46 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." msgstr "MAC spoofing nem sikerült a ${nic_name} (${nic}) hálózati kártyához így átmenetileg le lett tiltva.\nTalán újra kell indítanod a Tails-t és letiltani a MAC spoofing-ot. Nézd meg a dokumentációt itt <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'></a>." -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:47 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:55 msgid "All networking disabled" msgstr "Minden hálózat letiltva" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:48 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:56 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" @@ -472,8 +473,8 @@ msgid "I2P's router console is ready" msgstr "I2P-nek a router konzolja készen áll." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 -msgid "You can now access I2P's router console on http://127.0.0.1:7657." -msgstr "Most hozzáférhetsz az I2P-nek router konzoljához itt: http://127.0.0.1:7657." +msgid "You can now access I2P's router console in the I2P Browser." +msgstr "Most hozzáférhetsz az I2P útválasztó konzoljához az I2P böngészőben." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "I2P is not ready" @@ -481,10 +482,10 @@ msgstr "I2P nem áll készen." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:50 msgid "" -"Eepsite tunnel not built within six minutes. Check the router console at " -"http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information." -" Reconnect to the network to try again." -msgstr "EEpsite csatorna nem épült fel 6 perc alatt. Nézze meg a router konzolt itt: http://127.0.0.1:7657/log vagy a köteteket /var/log/i2p további információért. Kapcsolódjon újra a hálózathoz az újrapróbáláshoz. " +"Eepsite tunnel not built within six minutes. Check the router console in the" +" I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " +"the network to try again." +msgstr "Eepsite alagút nem épült fel hat percen belül. Ellenőrizd az útválasztó konzolt az I2P böngészőben vagy a naplókat a /var/log/i2p -ben a további információkért. Újracsatlakozás a hálózathoz az újrapróbálkozáshoz." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "I2P is ready" @@ -537,7 +538,7 @@ msgstr "Azonnali leállítás" #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1 msgid "Tor Browser" -msgstr "Tor Browser" +msgstr "Tor böngésző" #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2 msgid "Anonymous Web Browser"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 22 Sep '15

22 Sep '15

commit 5b3d1556d8633d70a604fc37cbfbe1ec5eef4021 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 22 21:45:51 2015 +0000 Update translations for tails-misc --- hu.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hu.po b/hu.po index b048bc1..015da7e 100644 --- a/hu.po +++ b/hu.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-20 19:32+0200\n" -"PO-Revision-Date: 2015-09-22 21:15+0000\n" +"PO-Revision-Date: 2015-09-22 21:29+0000\n" "Last-Translator: benewfy <benewfy(a)gmail.com>\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n" @@ -485,7 +485,7 @@ msgid "" "Eepsite tunnel not built within six minutes. Check the router console in the" " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " "the network to try again." -msgstr "" +msgstr "Eepsite alagút nem épült fel hat percen belül. Ellenőrizd az útválasztó konzolt az I2P böngészőben vagy a naplókat a /var/log/i2p -ben a további információkért. Újracsatlakozás a hálózathoz az újrapróbálkozáshoz." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "I2P is ready"

1 0

[tor-commits] [translation/tor-messenger-conversationsproperties_completed] Update translations for tor-messenger-conversationsproperties_completed
by translation＠torproject.org 22 Sep '15

22 Sep '15

commit 647887699f4bf046992450b1ae27dbe66a6265f7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 22 21:16:24 2015 +0000 Update translations for tor-messenger-conversationsproperties_completed --- hu/conversations.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hu/conversations.properties b/hu/conversations.properties index bcac36e..974960e 100644 --- a/hu/conversations.properties +++ b/hu/conversations.properties @@ -56,6 +56,17 @@ topicChanged=%1$S megváltoztatta a témát erre: %2$S. # %1$S is the user who cleared the topic. topicCleared=%1$S kitisztította a témát. +# LOCALIZATION NOTE (nickSet): +# This is displayed as a system message when a participant changes his/her +# nickname in a conversation. +# %1$S is the old nick. +# %2$S is the new nick. +nickSet=%1$S most %2$S -ként ismert. +# LOCALIZATION NOTE (nickSet.you): +# This is displayed as a system message when your nickname is changed. +# %S is your new nick. +nickSet.you=Most %S -ként vagy ismert. + # LOCALIZATION NOTE (messenger.conversations.selections.ellipsis): # ellipsis is used when copying a part of a message to show that the message was cut messenger.conversations.selections.ellipsis=[…]

1 0

[translation/tor-messenger-conversationsproperties] Update translations for tor-messenger-conversationsproperties
by translation＠torproject.org 22 Sep '15

22 Sep '15

commit c33f79a3c89eccec511429fae8b9e4a63f0d748a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 22 21:16:20 2015 +0000 Update translations for tor-messenger-conversationsproperties --- hu/conversations.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hu/conversations.properties b/hu/conversations.properties index 8a7a5c3..974960e 100644 --- a/hu/conversations.properties +++ b/hu/conversations.properties @@ -61,11 +61,11 @@ topicCleared=%1$S kitisztította a témát. # nickname in a conversation. # %1$S is the old nick. # %2$S is the new nick. -nickSet=%1$S is now known as %2$S. +nickSet=%1$S most %2$S -ként ismert. # LOCALIZATION NOTE (nickSet.you): # This is displayed as a system message when your nickname is changed. # %S is your new nick. -nickSet.you=You are now known as %S. +nickSet.you=Most %S -ként vagy ismert. # LOCALIZATION NOTE (messenger.conversations.selections.ellipsis): # ellipsis is used when copying a part of a message to show that the message was cut

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 22 Sep '15

22 Sep '15

commit f2df623e3840b6cc0f377149ef0a956a05407758 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 22 21:15:38 2015 +0000 Update translations for tails-misc --- hu.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hu.po b/hu.po index 0412fce..b048bc1 100644 --- a/hu.po +++ b/hu.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-20 19:32+0200\n" -"PO-Revision-Date: 2015-09-22 20:39+0000\n" +"PO-Revision-Date: 2015-09-22 21:15+0000\n" "Last-Translator: benewfy <benewfy(a)gmail.com>\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n" @@ -474,7 +474,7 @@ msgstr "I2P-nek a router konzolja készen áll." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 msgid "You can now access I2P's router console in the I2P Browser." -msgstr "" +msgstr "Most hozzáférhetsz az I2P útválasztó konzoljához az I2P böngészőben." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "I2P is not ready" @@ -538,7 +538,7 @@ msgstr "Azonnali leállítás" #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1 msgid "Tor Browser" -msgstr "Tor Browser" +msgstr "Tor böngésző" #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2 msgid "Anonymous Web Browser"

1 0