The branch, eden-pre has been updated
       via  fd930642ac9f0f3c1c0b327f8ea29da4a1576c3a (commit)
      from  943164f2bf6e76d4f63e5693a932a3e867f112eb (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=fd930642ac9f0f3c1c0b327f8ea29da4a1576c3a

commit fd930642ac9f0f3c1c0b327f8ea29da4a1576c3a
Author: amet <[email protected]>
Date:   Sun Dec 25 21:26:42 2011 +0400

    [script.xbmc.subtitles] -v 2.9.29
    
    - fix: Subscenter service version 1.3 - Fixed null values in website 
dictionary, thx orivar
    - fix: Subdivix, thx Enric Godes

diff --git a/script.xbmc.subtitles/addon.xml b/script.xbmc.subtitles/addon.xml
index 58de8c1..da951ce 100644
--- a/script.xbmc.subtitles/addon.xml
+++ b/script.xbmc.subtitles/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.xbmc.subtitles"
        name="XBMC Subtitles"
-       version="2.9.28"
+       version="2.9.29"
        provider-name="Amet, mr_blobby">
   <requires>
     <import addon="xbmc.python" version="2.0"/>
diff --git a/script.xbmc.subtitles/changelog.txt 
b/script.xbmc.subtitles/changelog.txt
index 3526e09..1d7db72 100644
--- a/script.xbmc.subtitles/changelog.txt
+++ b/script.xbmc.subtitles/changelog.txt
@@ -1,3 +1,7 @@
+2.9.29
+- fix: Subscenter service version 1.3 - Fixed null values in website 
dictionary, thx orivar
+- fix: Subdivix, thx Enric Godes
+
 2.9.28
 - fixed Subcenter Service
 
diff --git a/script.xbmc.subtitles/resources/lib/services/Subdivx/service.py 
b/script.xbmc.subtitles/resources/lib/services/Subdivx/service.py
index 2caa84e..5a8d459 100644
--- a/script.xbmc.subtitles/resources/lib/services/Subdivx/service.py
+++ b/script.xbmc.subtitles/resources/lib/services/Subdivx/service.py
@@ -36,7 +36,7 @@ subtitle_pattern =  
"<div\sid=\"buscador_detalle_sub\">(.+?)</div><div\sid=\"bus
 def getallsubs(searchstring, languageshort, languagelong, file_original_path, 
subtitles_list):
     page = 1
     if languageshort == "es":
-        url = main_url + "index.php?accion=5&masdesc=&oxdown=1&pg=" + 
str(page) + "&buscar=" + urllib.quote_plus(searchstring)
+        url = main_url + "index.php?accion=5&masdesc=&oxfecha=2&pg=" + 
str(page) + "&buscar=" + urllib.quote_plus(searchstring)
 
     content = geturl(url)
     log( __name__ ,"%s Getting '%s' subs ..." % (debug_pretext, languageshort))
@@ -61,7 +61,7 @@ def getallsubs(searchstring, languageshort, languagelong, 
file_original_path, su
             log( __name__ ,"%s Subtitles found: %s (id = %s)" % 
(debug_pretext, filename, id))
             subtitles_list.append({'rating': str(downloads), 'no_files': 
no_files, 'filename': filename, 'sync': sync, 'id' : id, 'server' : server, 
'language_flag': 'flags/' + languageshort + '.gif', 'language_name': 
languagelong})
         page = page + 1
-        url = main_url + "index.php?accion=5&masdesc=&oxdown=1&pg=" + 
str(page) + "&buscar=" + urllib.quote_plus(searchstring)
+        url = main_url + "index.php?accion=5&masdesc=&oxfecha=2&pg=" + 
str(page) + "&buscar=" + urllib.quote_plus(searchstring)
         content = geturl(url)
 
     # Bubble sort, to put syncs on top
diff --git a/script.xbmc.subtitles/resources/lib/services/Subscenter/service.py 
b/script.xbmc.subtitles/resources/lib/services/Subscenter/service.py
index 1e17726..518dce3 100644
--- a/script.xbmc.subtitles/resources/lib/services/Subscenter/service.py
+++ b/script.xbmc.subtitles/resources/lib/services/Subscenter/service.py
@@ -2,11 +2,12 @@
 
 
#===============================================================================
 # Subscenter.org subtitles service.
-# Version: 1.2
+# Version: 1.3
 #
 # Change log:
 # 1.1 - Fixed downloading of non-Hebrew subtitles.
 # 1.2 - Added key field for download URL
+# 1.3 - Fixed null values in website dictionary (changed to None)
 #
 # Created by: Ori Varon
 
#===============================================================================
@@ -76,6 +77,8 @@ def 
getAllSubtitles(subtitlePageID,languageList,subtitlesList):
     toExec = "foundSubtitles = "+subtitlePage[tempStart+len("subtitles_groups 
= "):tempEnd]
     # Remove junk at the end of the line
     toExec = toExec[:toExec.rfind("}")+1]
+    # Replace "null" with "None"
+    toExec = toExec.replace("null","None")
     exec(toExec)
     log( __name__ ,"Built webpage dictionary")
     for language in foundSubtitles.keys():

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

Summary of changes:
 script.xbmc.subtitles/addon.xml                    |    2 +-
 script.xbmc.subtitles/changelog.txt                |    4 ++++
 .../resources/lib/services/Subdivx/service.py      |    4 ++--
 .../resources/lib/services/Subscenter/service.py   |    5 ++++-
 4 files changed, 11 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Scripts

------------------------------------------------------------------------------
Write once. Port to many.
Get the SDK and tools to simplify cross-platform app development. Create 
new or port existing apps to sell to consumers worldwide. Explore the 
Intel AppUpSM program developer opportunity. appdeveloper.intel.com/join
http://p.sf.net/sfu/intel-appdev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to