- tor-commits - lists.torproject.org

r24594: {arm} Dropping raw torctl access from the descriptor popup (simple (arm/trunk/src/interface)
by Damian Johnson 12 Apr '11

12 Apr '11

Author: atagar Date: 2011-04-12 16:15:00 +0000 (Tue, 12 Apr 2011) New Revision: 24594 Modified: arm/trunk/src/interface/controller.py arm/trunk/src/interface/descriptorPopup.py Log: Dropping raw torctl access from the descriptor popup (simpler, takes advantage of caching, and allows for restarts) Modified: arm/trunk/src/interface/controller.py =================================================================== --- arm/trunk/src/interface/controller.py 2011-04-12 16:03:46 UTC (rev 24593) +++ arm/trunk/src/interface/controller.py 2011-04-12 16:15:00 UTC (rev 24594) @@ -1462,7 +1462,7 @@ if key in (curses.KEY_DOWN, curses.KEY_UP, curses.KEY_PPAGE, curses.KEY_NPAGE): panels["conn"].handleKey(key) elif key in (ord('d'), ord('D')): - descriptorPopup.showDescriptorPopup(panels["popup"], stdscr, conn, panels["conn"]) + descriptorPopup.showDescriptorPopup(panels["popup"], stdscr, panels["conn"]) panels["conn"].redraw(True) panels["conn"].showLabel = True @@ -1481,7 +1481,7 @@ panels["conn"].showLabel = False panels["conn"].redraw(True) - descriptorPopup.showDescriptorPopup(panels["popup"], stdscr, conn, panels["conn"]) + descriptorPopup.showDescriptorPopup(panels["popup"], stdscr, panels["conn"]) setPauseState(panels, isPaused, page) curses.halfdelay(REFRESH_RATE * 10) # reset normal pausing behavior Modified: arm/trunk/src/interface/descriptorPopup.py =================================================================== --- arm/trunk/src/interface/descriptorPopup.py 2011-04-12 16:03:46 UTC (rev 24593) +++ arm/trunk/src/interface/descriptorPopup.py 2011-04-12 16:15:00 UTC (rev 24594) @@ -9,7 +9,7 @@ import controller import connPanel -from util import panel, uiTools +from util import panel, torTools, uiTools # field keywords used to identify areas for coloring LINE_NUM_COLOR = "yellow" @@ -28,8 +28,7 @@ State attributes of popup window for consensus descriptions. """ - def __init__(self, conn): - self.conn = conn + def __init__(self): self.fingerprint = "" self.entryColor = "white" self.text = [] @@ -47,18 +46,19 @@ self.showLineNum = False self.text.append(UNRESOLVED_MSG) else: + conn = torTools.getConn() + try: self.showLineNum = True - nsCommand = "ns/id/%s" % fingerprint - self.text.append(nsCommand) - self.text = self.text + self.conn.get_info(nsCommand)[nsCommand].split("\n") + self.text.append("ns/id/%s" % fingerprint) + self.text += conn.getConsensusEntry(fingerprint).split("\n") except (socket.error, TorCtl.ErrorReply, TorCtl.TorCtlClosed): self.text = self.text + [ERROR_MSG, ""] try: descCommand = "desc/id/%s" % fingerprint - self.text.append(descCommand) - self.text = self.text + self.conn.get_info(descCommand)[descCommand].split("\n") + self.text.append("desc/id/%s" % fingerprint) + self.text += conn.getDescriptorEntry(fingerprint).split("\n") except (socket.error, TorCtl.ErrorReply, TorCtl.TorCtlClosed): self.text = self.text + [ERROR_MSG] @@ -68,7 +68,7 @@ elif key == curses.KEY_PPAGE: self.scroll = max(self.scroll - height, 0) elif key == curses.KEY_NPAGE: self.scroll = max(0, min(self.scroll + height, len(self.text) - height)) -def showDescriptorPopup(popup, stdscr, conn, connectionPanel): +def showDescriptorPopup(popup, stdscr, connectionPanel): """ Presents consensus descriptor in popup window with the following controls: Up, Down, Page Up, Page Down - scroll descriptor @@ -76,7 +76,7 @@ Enter, Space, d, D - close popup """ - properties = PopupProperties(conn) + properties = PopupProperties() isVisible = True if not panel.CURSES_LOCK.acquire(False): return

1 0

r24593: {arm} Dropping the descriptor popup stubs from the new interface. (in arm/trunk: . src/interface/connections)
by Damian Johnson 12 Apr '11

12 Apr '11

Author: atagar Date: 2011-04-12 16:03:46 +0000 (Tue, 12 Apr 2011) New Revision: 24593 Modified: arm/trunk/ChangeLog arm/trunk/src/interface/connections/connEntry.py arm/trunk/src/interface/connections/entries.py Log: Dropping the descriptor popup stubs from the new interface. This was feature creep and its capabilities will be almost entirely redundant with raw control port access (which is coming in a couple releases). Modified: arm/trunk/ChangeLog =================================================================== --- arm/trunk/ChangeLog 2011-04-12 15:57:47 UTC (rev 24592) +++ arm/trunk/ChangeLog 2011-04-12 16:03:46 UTC (rev 24593) @@ -47,7 +47,7 @@ * fix: the 'startup.dataDirectory' config option was being ignored * fix: recognizing the proper private ip ranges of the 172.* block * fix: missing 'is default' option from config sort ordering - * fix (4/4/11): hidden service parsing issue when there's multiple spaces in the HiddenServicePort opition (caught by Nicolas Pouillard) + * fix (4/4/11, r24562): hidden service parsing issue when there's multiple spaces in the HiddenServicePort opition (caught by Nicolas Pouillard) 1/7/11 - version 1.4.1 (r24054) Platform specific enhancements including BSD compatibility and vastly improved performance on Linux. Modified: arm/trunk/src/interface/connections/connEntry.py =================================================================== --- arm/trunk/src/interface/connections/connEntry.py 2011-04-12 15:57:47 UTC (rev 24592) +++ arm/trunk/src/interface/connections/connEntry.py 2011-04-12 16:03:46 UTC (rev 24593) @@ -332,21 +332,6 @@ detailFormat = curses.A_BOLD | uiTools.getColor(CATEGORY_COLOR[self.getType()]) return [uiTools.DrawEntry(line, detailFormat) for line in self._getDetailContent(width)] - def _getDescriptors(self, width): - """ - Provides raw descriptor information for the relay. - - Arguments: - width - available space to display in - """ - - # TODO: Porting and refactoring the descriptorPopup.py functionality is - # gonna take quite a bit of work. This is a very rarely used feature and - # not worth delaying the 1.4.2 release any further, so this will be a part - # of 1.4.3. - - return [] - def resetDisplay(self): entries.ConnectionPanelLine.resetDisplay(self) self.cachedType = None Modified: arm/trunk/src/interface/connections/entries.py =================================================================== --- arm/trunk/src/interface/connections/entries.py 2011-04-12 15:57:47 UTC (rev 24592) +++ arm/trunk/src/interface/connections/entries.py 2011-04-12 16:03:46 UTC (rev 24593) @@ -154,25 +154,6 @@ # implementation of getDetails return [] - def getDescriptor(self, width): - """ - Provides a list of DrawEntry instances with descriptor information for - this connection. - - Arguments: - width - available space to display in - """ - - if self._descriptorCacheArgs != width: - self._descriptorCache = self._getDescriptor(width) - self._descriptorCacheArgs = width - - return self._descriptorCache - - def _getDescriptor(self, width): - # implementation of getDescriptor - return [] - def resetDisplay(self): """ Flushes cached display results.

1 0

r24592: {translation} updated translation documentation (translation/trunk/documentation)
by Runa Sandvik 12 Apr '11

12 Apr '11

Author: runa Date: 2011-04-12 15:57:47 +0000 (Tue, 12 Apr 2011) New Revision: 24592 Modified: translation/trunk/documentation/howto.txt Log: updated translation documentation Modified: translation/trunk/documentation/howto.txt =================================================================== --- translation/trunk/documentation/howto.txt 2011-04-12 15:53:33 UTC (rev 24591) +++ translation/trunk/documentation/howto.txt 2011-04-12 15:57:47 UTC (rev 24592) @@ -243,8 +243,8 @@ Vidalia Help Files: The Transifex configuration file, source files and translations can - be found here: - https://svn.torproject.org/vidalia/vidalia/trunk/src/vidalia/help/content/. + be found here: https://gitweb.torproject.org/vidalia.git (inside + src/vidalia/help/content/). 1. Converting Translations to HTML @@ -252,8 +252,8 @@ enough. To make use of the translations, you will need to convert the .po files to .html files. - You can use the following script to automate the process: - https://svn.torproject.org/vidalia/vidalia/trunk/src/vidalia/help/content/p… + You can use the po2html script inside src/vidalia/help/content/ + to automate the process. 2. Creating/Updating Translation Template Files @@ -269,9 +269,8 @@ Vidalia and Vidalia Installer: The Transifex configuration file, source file and translations can - be found here: - https://svn.torproject.org/vidalia/vidalia/trunk/src/vidalia/i18n/po/. - https://svn.torproject.org/vidalia/vidalia/trunk/pkg/win32/po/. + be found here: https://gitweb.torproject.org/vidalia.git (inside + src/vidalia/i18n/po/ and pkg/win32/po/). 1. Converting Translations and creating/updating Translation Template Files

1 0

r24591: {translation} updated translation priority (translation/trunk/projects/website/po/.tx)
by Runa Sandvik 12 Apr '11

12 Apr '11

Author: runa Date: 2011-04-12 15:53:33 +0000 (Tue, 12 Apr 2011) New Revision: 24591 Modified: translation/trunk/projects/website/po/.tx/config Log: updated translation priority Modified: translation/trunk/projects/website/po/.tx/config =================================================================== --- translation/trunk/projects/website/po/.tx/config 2011-04-12 09:49:57 UTC (rev 24590) +++ translation/trunk/projects/website/po/.tx/config 2011-04-12 15:53:33 UTC (rev 24591) @@ -48,11 +48,6 @@ source_file = templates/projects/3-low.torweather.pot source_lang = en -[torproject.website-docs-manual-pot] -file_filter = <lang>/docs/2-medium.manual.po -source_file = templates/docs/2-medium.manual.pot -source_lang = en - [torproject.5-website-press-2008-12-19-press-release-pot] file_filter = <lang>/press/4-optional.2008-12-19-roadmap-press-release.po source_file = templates/press/4-optional.2008-12-19-roadmap-press-release.pot @@ -246,7 +241,7 @@ source_file = templates/projects/3-low.puppettor.pot source_lang = en -[torproject.website-download-download-easy-pot] +[torproject.2-website-download-download-easy-pot] file_filter = <lang>/download/1-high.download-easy.po source_file = templates/download/1-high.download-easy.pot source_lang = en

1 0

[metrics-web/master] Add Torperf 0.0.1 tarball.
by karsten＠torproject.org 12 Apr '11

12 Apr '11

commit 7fc42547a9d586e8afdaa946e357b1c2d432158e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 12 14:28:30 2011 +0200 Add Torperf 0.0.1 tarball. --- web/WEB-INF/tools.jsp | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/web/WEB-INF/tools.jsp b/web/WEB-INF/tools.jsp index b744463..01e5a84 100644 --- a/web/WEB-INF/tools.jsp +++ b/web/WEB-INF/tools.jsp @@ -81,6 +81,9 @@ download files of various sizes over the Tor network and notes how long substeps take.</p> <ul> + <li>Download + <a href="dist/torperf-0.0.1.tar">Torperf 0.0.1</a> + (<a href="dist/torperf-0.0.1.tar.asc">sig</a>)</li> <li>Browse the <a href="https://gitweb.torproject.org/torperf.git">Git repository</a></li> <li><tt>git clone git://git.torproject.org/torperf</tt></li> </ul> @@ -96,7 +99,7 @@ <ul> <li>Download <a href="dist/exonerator-0.0.2.tar">ExoneraTor 0.0.2</a> - (<a href="dist/exonerator-0.0.2.tar.asc">sig</a>) + (<a href="dist/exonerator-0.0.2.tar.asc">sig</a>)</li> <li>Browse the <a href="https://gitweb.torproject.org/metrics-utils.git/tree/HEAD:/exonerator">Git repository</a> <li><tt>git clone git://git.torproject.org/metrics-utils</tt></li> </ul> @@ -111,7 +114,7 @@ <ul> <li>Download <a href="dist/visitor-0.0.4.tar">VisiTor 0.0.4</a> - (<a href="dist/visitor-0.0.4.tar.asc">sig</a>) + (<a href="dist/visitor-0.0.4.tar.asc">sig</a>)</li> <li>Browse the <a href="https://gitweb.torproject.org/metrics-utils.git/tree/HEAD:/visitor">Git repository</a></li> <li><tt>git clone git://git.torproject.org/metrics-utils</tt></li> </ul>

1 0

[torperf/master] Prepare change log for next version.
by karsten＠torproject.org 12 Apr '11

12 Apr '11

commit f152f1e47de3d7b3c3f4671410704dec1a62d647 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 12 14:24:50 2011 +0200 Prepare change log for next version. --- ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index e32939b..d05cd70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ Torperf change log: +Changes in version 0.0.2 - 2011-??-?? + Changes in version 0.0.1 - 2011-04-12 - Initial release

1 0

[torperf/master] Add a ChangeLog for version 0.0.1.
by karsten＠torproject.org 12 Apr '11

12 Apr '11

commit f503c0c1c2b33c467f4b0d5441118820ad4bc155 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 12 13:55:28 2011 +0200 Add a ChangeLog for version 0.0.1. --- ChangeLog | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..e32939b --- /dev/null +++ b/ChangeLog @@ -0,0 +1,5 @@ +Torperf change log: + +Changes in version 0.0.1 - 2011-04-12 + - Initial release +

1 0

r24590: {translation} include path to GetTor git repo (translation/trunk/documentation)
by Runa Sandvik 12 Apr '11

12 Apr '11

Author: runa Date: 2011-04-12 09:49:57 +0000 (Tue, 12 Apr 2011) New Revision: 24590 Modified: translation/trunk/documentation/howto.txt Log: include path to GetTor git repo Modified: translation/trunk/documentation/howto.txt =================================================================== --- translation/trunk/documentation/howto.txt 2011-04-12 09:26:02 UTC (rev 24589) +++ translation/trunk/documentation/howto.txt 2011-04-12 09:49:57 UTC (rev 24590) @@ -216,6 +216,9 @@ GetTor: + Everything GetTor can be found here: + https://gitweb.torproject.org/gettor.git + 1. Updating the Translations After pulling new translations from Transifex and checking them into

1 0

[metrics-web/master] Fix navigation on consensus-health page.
by karsten＠torproject.org 12 Apr '11

12 Apr '11

commit 045d6df204a1efa1e3ccf19de8d58b42b4a2e142 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 12 08:02:07 2011 +0200 Fix navigation on consensus-health page. --- .../ernie/cron/ConsensusHealthChecker.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/ernie/cron/ConsensusHealthChecker.java b/src/org/torproject/ernie/cron/ConsensusHealthChecker.java index 602d030..4e2adc4 100644 --- a/src/org/torproject/ernie/cron/ConsensusHealthChecker.java +++ b/src/org/torproject/ernie/cron/ConsensusHealthChecker.java @@ -476,6 +476,7 @@ public class ConsensusHealthChecker { + " <a href=\"status.html\">Status</a>\n" + " <br>\n" + " <font size=\"2\">\n" + + " <a href=\"networkstatus.html\">Network Status</a>\n" + " <a href=\"exonerator.html\">ExoneraTor</a>\n" + " <a href=\"relay-search.html\">Relay Search</a>\n" + " <a class=\"current\">Consensus Health</a>\n"

1 0

r24589: {translation} updated translation priority (translation/trunk/projects/torcheck/po/.tx)
by Runa Sandvik 12 Apr '11

12 Apr '11

Author: runa Date: 2011-04-12 09:26:02 +0000 (Tue, 12 Apr 2011) New Revision: 24589 Modified: translation/trunk/projects/torcheck/po/.tx/config Log: updated translation priority Modified: translation/trunk/projects/torcheck/po/.tx/config =================================================================== --- translation/trunk/projects/torcheck/po/.tx/config 2011-04-12 09:21:56 UTC (rev 24588) +++ translation/trunk/projects/torcheck/po/.tx/config 2011-04-12 09:26:02 UTC (rev 24589) @@ -1,4 +1,4 @@ -[torproject.torcheck-torcheck-pot] +[torproject.2-torcheck-torcheck-pot] source_file = templates/TorCheck.pot source_lang = en trans.af = af/TorCheck_af.po

1 0