[Xbmc-addons] Plugins branch, dharma, updated. 3e67d75d431d5fec4f4dcc83b091afa98293f562

[taxi gps]

The branch, dharma has been updated
       via  3e67d75d431d5fec4f4dcc83b091afa98293f562 (commit)
      from  3b0260b9c19d0850e43172c44d030a6a1cf6178b (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=3e67d75d431d5fec4f4dcc83b091afa98293f562

commit 3e67d75d431d5fec4f4dcc83b091afa98293f562
Author: taxigps <taxi...@sina.com>
Date:   Sat Jan 22 18:29:40 2011 +0800

    [plugin.program.utorrent] changed: handle fail to connect to daemon error

diff --git a/plugin.program.utorrent/addon.xml 
b/plugin.program.utorrent/addon.xml
index b7a0cb9..0972702 100644
--- a/plugin.program.utorrent/addon.xml
+++ b/plugin.program.utorrent/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="plugin.program.utorrent"
        name="uTorrent"
-       version="1.0.3"
+       version="1.0.4"
        provider-name="Taxigps">
   <requires>
     <import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.program.utorrent/changelog.txt 
b/plugin.program.utorrent/changelog.txt
index 4e54b61..66725a8 100644
--- a/plugin.program.utorrent/changelog.txt
+++ b/plugin.program.utorrent/changelog.txt
@@ -1,4 +1,7 @@
-[B]1.0.3 (2011.1.16)[/B]
+[B]1.0.4 (2011.1.22)[/B]
+changed: handle fail to connect to daemon error
+
+[B]1.0.3 (2011.1.16)[/B]
 fixed: split torrent items wrong when commas in the torrent name
 
 [B]1.0.2 (2011.1.15)[/B]
diff --git a/plugin.program.utorrent/default.py 
b/plugin.program.utorrent/default.py
index b69e0c0..4129e0f 100644
--- a/plugin.program.utorrent/default.py
+++ b/plugin.program.utorrent/default.py
@@ -1,7 +1,7 @@
 import urllib, sys, os, re, time
 import xbmcaddon, xbmcplugin, xbmcgui, xbmc
 
-# uTorrent Plugin v1.0.3
+# uTorrent Plugin v1.0.4
 
 # Plugin constants 
 __addonname__ = "uTorrent"
@@ -35,10 +35,14 @@ myClient = Client(**params)
 def getToken():
     tokenUrl = 'http://'+UT_ADDRESS+':'+UT_PORT+'/gui/token.html'
 
-    #try:
-    data = myClient.HttpCmd(tokenUrl)
-    #except:
-    #    sys.exit()
+    try:
+        data = myClient.HttpCmd(tokenUrl)
+    except:
+        dialog = xbmcgui.Dialog()
+        ret = dialog.yesno(__addonname__ + ' ' + 
__language__(32100).encode('utf8'), __language__(32101).encode('utf8'), 
__language__(32102).encode('utf8'))
+        if ret==True:
+            __addon__.openSettings()
+        sys.exit()
 
     match = re.compile("<div id='token' 
style='display:none;'>(.+?)</div>").findall(data)
     token = match[0]
diff --git a/plugin.program.utorrent/resources/language/Chinese 
(Simple)/strings.xml b/plugin.program.utorrent/resources/language/Chinese 
(Simple)/strings.xml
index 766be23..3b36358 100644
--- a/plugin.program.utorrent/resources/language/Chinese (Simple)/strings.xml   
+++ b/plugin.program.utorrent/resources/language/Chinese (Simple)/strings.xml   
@@ -34,4 +34,8 @@
        <string id="32014">开始所有</string>
        <string id="32015">限制上传/下载速度</string>
        <string id="32016">增加文件(从 Torrents 文件夹)</string>
+       <!-- error -->
+       <string id="32100">错误！</string>
+       <string id="32101">无法连接到守护进程。</string>
+       <string id="32102">你现在要修改设置吗？</string>
 </strings>
\ No newline at end of file
diff --git a/plugin.program.utorrent/resources/language/English/strings.xml 
b/plugin.program.utorrent/resources/language/English/strings.xml
index dd04933..b1da91d 100644
--- a/plugin.program.utorrent/resources/language/English/strings.xml
+++ b/plugin.program.utorrent/resources/language/English/strings.xml
@@ -34,4 +34,8 @@
        <string id="32014">Start All</string>
        <string id="32015">Limit Upload / Download Speeds</string>
        <string id="32016">Add Files (from Torrents dir.)</string>
+       <!-- error -->
+       <string id="32100">Error!</string>
+       <string id="32101">Fail to connect to daemon.</string>
+       <string id="32102">Are you change settings now?</string>
 </strings>
\ No newline at end of file

-----------------------------------------------------------------------

Summary of changes:
 plugin.program.utorrent/addon.xml                  |    2 +-
 plugin.program.utorrent/changelog.txt              |    5 ++++-
 plugin.program.utorrent/default.py                 |   14 +++++++++-----
 .../language/Chinese (Simple)/strings.xml          |    4 ++++
 .../resources/language/English/strings.xml         |    4 ++++
 5 files changed, 22 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Plugins


------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires 
February 28th, so secure your free ArcSight Logger TODAY! 
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons