[Xbmc-addons] Scripts branch, eden-pre, updated. fbc1db09369843f00f70012dd0c87103aeaca7ac

Mon, 16 May 2011 13:39:31 -0700 

The branch, eden-pre has been updated
       via  fbc1db09369843f00f70012dd0c87103aeaca7ac (commit)
      from  348468ae2bc8f80de98d029e207d10e6aef811bb (commit)

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

commit fbc1db09369843f00f70012dd0c87103aeaca7ac
Author: amet <[email protected]>
Date:   Tue May 17 00:38:48 2011 +0400

    [script.xbmc.subtitles] - v2.9.5
    
    - added: Subscenter.org service, thanks Ori Varon
    - added: Asia-Team.net thx to Fran CM
    - fixed: Undertexter and Swesub

diff --git a/script.xbmc.subtitles/addon.xml b/script.xbmc.subtitles/addon.xml
index 8f6e78d..563855c 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.4"
+       version="2.9.5"
        provider-name="Amet, mr_blobby">
   <requires>
     <import addon="xbmc.python" version="2.0"/>
@@ -17,13 +17,13 @@
     <summary lang="nl">XBMC Ondertitels</summary>
     <summary lang="bg">XBMC Субтитри</summary>    
     <summary lang="pt">Legendas XBMC</summary>    
-    <description lang="en">Search and download subtitles from 19 
websites:Bierdopje.com, Italiansubs.net, LegendasDivx.com, Legendas.tv, 
Napiprojekt.pl, OmniSubs.net, Ondertitel.com, OpenSubtitles.org, Podnapisi.net, 
PT-SUBS.NET, theSubDB.com, Subdivx.com, Sublight.si, Subscene.com, Swesub.nu, 
Sratim.co.il, Titlovi.com, Titulky.com and Undertexter.se.Subtitle button on 
OSD needs to be activated and path set to XBMC Subtitles under System-> Skin-> 
Addon Scripts</description>
-    <description lang="es">Busca y descarga subtítulos de:Bierdopje.com, 
Italiansubs.net, LegendasDivx.com, Legendas.tv, Napiprojekt.pl, OmniSubs.net, 
Ondertitel.com, OpenSubtitles.org, Podnapisi.net, PT-SUBS.NET, theSubDB.com, 
Subdivx.com, Sublight.si, Subscene.com, Swesub.nu, Sratim.co.il, Titlovi.com, 
Titulky.com y Undertexter.se.El botón de subtitulos en el OSD debe ser 
añadido, y la ruta al addon debe ponerse en Sistema-> Skin-> Addons de 
Scripts</description>
-    <description lang="hu">Film feliratok keresése letöltése 
az:Bierdopje.com, Italiansubs.net, Legendas.tv, Napiprojekt.pl, OmniSubs.net, 
Ondertitel.com, OpenSubtitles.org, Podnapisi.net, theSubDB.com, Subdivx.com, 
Sublight.si, Subscene.com, Swesub.nu, Sratim.co.il, Titlovi.com, Titulky.com 
és Undertexter.se webhelyekról.A dalszöveg OSD gombot aktiválni kell az 
elérési út megadásával a Beállítások -> Skin -> Szkriptek 
alatt.</description>
-    <description lang="sr">Претражи и скини преводе са 
19 веб страница:Bierdopje.com, Italiansubs.net, Legendas.tv, 
Napiprojekt.pl, OmniSubs.net, Ondertitel.com, OpenSubtitles.org, Podnapisi.net, 
theSubDB.com, Subdivx.com, Sublight.si, Subscene.com, Sratim.co.il, Swesub.nu, 
Titlovi.com, Titulky.com и Undertexter.se.Дугме за преводе на 
OSD треба да се активира и изабере XBMC Subtitles у 
Систем-> Маска-> Скрипт додаци</description>
-    <description lang="nl">Zoek en download ondertitels van 19 
websites:Bierdopje.com, Italiansubs.net, Legendas.tv, Napiprojekt.pl, 
OmniSubs.net, Ondertitel.com, OpenSubtitles.org, Podnapisi.net, theSubDB.com, 
Subdivx.com, Sublight.si, Subscene.com, Swesub.nu, Sratim.co.il, Titlovi.com, 
Titulky.com en Undertexter.se.De ondertitel knop in het OSD scherm moet zijn 
geactiveerd met het pad naar XBMC Subtitles via Systeem-> Skin-> Addon 
Scripts.</description>
-    <description lang="bg"> Търси и сваляй субтитри от 
19 уебсайта: Bierdopje.com, Italiansubs.net, Legendas.tv, 
Napiprojekt.pl, OmniSubs.net, Ondertitel.com, OpenSubtitles.org, Podnapisi.net, 
theSubDB.com, Subdivx.com, Sublight.si, Subscene.com, Swesub.nu, Sratim.co.il, 
Titlovi.com, Titulky.com и Undertexter.se. Бутонът за 
субтитри в OSD менюто над филма трябва да 
бъде активиран и пътя към приложението 
трябва да бъде указан, като и за двете 
отивате в менюто на Система(System)-> Кожа(Skin)-> 
Добавка(Addon Scripts)</description>     <platform>all</platform>
-    <description lang="pt">Procura e download de legendas em 19 websites: 
Bierdopje.com, Italiansubs.net, LegendasDivx.com, Legendas.tv, Napiprojekt.pl, 
OmniSubs.net, Ondertitel.com, OpenSubtitles.org, Podnapisi.net, PT-SUBS.NET, 
theSubDB.com, Subdivx.com, Sublight.si, Subscene.com, Swesub.nu, Sratim.co.il, 
Titlovi.com, Titulky.com e Undertexter.se. O botão das legendas deve ser 
adicionado no OSD e o caminho põe-se em Sistema-> Skin-> Addons de 
Scripts</description>
+    <description lang="en">Search and download subtitles from 19 
websites:Bierdopje.com, Italiansubs.net, LegendasDivx.com, Legendas.tv, 
Napiprojekt.pl, OmniSubs.net, Ondertitel.com, OpenSubtitles.org, Podnapisi.net, 
PT-SUBS.NET, theSubDB.com, Subdivx.com, Sublight.si, Subscene.com, Swesub.nu, 
Subscenter.org, Titlovi.com, Titulky.com and Undertexter.se.Subtitle button on 
OSD needs to be activated and path set to XBMC Subtitles under System-> Skin-> 
Addon Scripts</description>
+    <description lang="es">Busca y descarga subtítulos de:Bierdopje.com, 
Italiansubs.net, LegendasDivx.com, Legendas.tv, Napiprojekt.pl, OmniSubs.net, 
Ondertitel.com, OpenSubtitles.org, Podnapisi.net, PT-SUBS.NET, theSubDB.com, 
Subdivx.com, Sublight.si, Subscene.com, Swesub.nu, Subscenter.org, Titlovi.com, 
Titulky.com y Undertexter.se.El botón de subtitulos en el OSD debe ser 
añadido, y la ruta al addon debe ponerse en Sistema-> Skin-> Addons de 
Scripts</description>
+    <description lang="hu">Film feliratok keresése letöltése 
az:Bierdopje.com, Italiansubs.net, Legendas.tv, Napiprojekt.pl, OmniSubs.net, 
Ondertitel.com, OpenSubtitles.org, Podnapisi.net, theSubDB.com, Subdivx.com, 
Sublight.si, Subscene.com, Swesub.nu, Subscenter.org, Titlovi.com, Titulky.com 
és Undertexter.se webhelyekról.A dalszöveg OSD gombot aktiválni kell az 
elérési út megadásával a Beállítások -> Skin -> Szkriptek 
alatt.</description>
+    <description lang="sr">Претражи и скини преводе са 
19 веб страница:Bierdopje.com, Italiansubs.net, Legendas.tv, 
Napiprojekt.pl, OmniSubs.net, Ondertitel.com, OpenSubtitles.org, Podnapisi.net, 
theSubDB.com, Subdivx.com, Sublight.si, Subscene.com, Subscenter.org, 
Swesub.nu, Titlovi.com, Titulky.com и Undertexter.se.Дугме за 
преводе на OSD треба да се активира и изабере 
XBMC Subtitles у Систем-> Маска-> Скрипт 
додаци</description>
+    <description lang="nl">Zoek en download ondertitels van 19 
websites:Bierdopje.com, Italiansubs.net, Legendas.tv, Napiprojekt.pl, 
OmniSubs.net, Ondertitel.com, OpenSubtitles.org, Podnapisi.net, theSubDB.com, 
Subdivx.com, Sublight.si, Subscene.com, Swesub.nu, Subscenter.org, Titlovi.com, 
Titulky.com en Undertexter.se.De ondertitel knop in het OSD scherm moet zijn 
geactiveerd met het pad naar XBMC Subtitles via Systeem-> Skin-> Addon 
Scripts.</description>
+    <description lang="bg"> Търси и сваляй субтитри от 
19 уебсайта: Bierdopje.com, Italiansubs.net, Legendas.tv, 
Napiprojekt.pl, OmniSubs.net, Ondertitel.com, OpenSubtitles.org, Podnapisi.net, 
theSubDB.com, Subdivx.com, Sublight.si, Subscene.com, Swesub.nu, 
Subscenter.org, Titlovi.com, Titulky.com и Undertexter.se. Бутонът за 
субтитри в OSD менюто над филма трябва да 
бъде активиран и пътя към приложението 
трябва да бъде указан, като и за двете 
отивате в менюто на Система(System)-> Кожа(Skin)-> 
Добавка(Addon Scripts)</description>     <platform>all</platform>
+    <description lang="pt">Procura e download de legendas em 19 websites: 
Bierdopje.com, Italiansubs.net, LegendasDivx.com, Legendas.tv, Napiprojekt.pl, 
OmniSubs.net, Ondertitel.com, OpenSubtitles.org, Podnapisi.net, PT-SUBS.NET, 
theSubDB.com, Subdivx.com, Sublight.si, Subscene.com, Swesub.nu, 
Subscenter.org, Titlovi.com, Titulky.com e Undertexter.se. O botão das 
legendas deve ser adicionado no OSD e o caminho põe-se em Sistema-> Skin-> 
Addons de Scripts</description>
     <platform>all</platform>
   </extension>
 </addon>
diff --git a/script.xbmc.subtitles/changelog.txt 
b/script.xbmc.subtitles/changelog.txt
index 19736f7..4fd72ea 100644
--- a/script.xbmc.subtitles/changelog.txt
+++ b/script.xbmc.subtitles/changelog.txt
@@ -1,3 +1,8 @@
+2.9.5
+- added: Subscenter.org service, thanks Ori Varon
+- added: Asia-Team.net thx to Fran CM
+- fixed: Undertexter and Swesub
+
 2.9.4
 - added: New services PT-SUBS.net and OmniSubs.net, thx to highlandr
 - removed: Sratim service until API is sorted out
diff --git a/script.xbmc.subtitles/resources/lib/services/Swesub/service.py 
b/script.xbmc.subtitles/resources/lib/services/Swesub/service.py
index 6d961bd..d6115b0 100644
--- a/script.xbmc.subtitles/resources/lib/services/Swesub/service.py
+++ b/script.xbmc.subtitles/resources/lib/services/Swesub/service.py
@@ -10,28 +10,73 @@ main_url = "http://swesub.nu/";
 # Regular expression patterns
 
#====================================================================================================================
 
-# subtitle pattern example:
-"""
-<img src='e107_themes/memnockChristmasMod/images/bullet2.gif' alt='' 
style='vertical-align: middle' /> <b><a class='visit' 
href='download.php?view.23644'>A Christmas Carol - En julsaga</a></b><br /><div 
class='smalltext'><a 
href='download.php?list.'></a></div>Disney's.A.Christmas.Carol.2010.1080p.MKV.AC3.DTS....<br
 /><span class='smalltext'>Datum: söndag 28 november 2010 - 22:36:38</span><br 
/><br />
-"""
-subtitle_pattern = "<a class=\'visit\' 
href=\'download\.php\?view\.(\d{1,10})\'>[^\r\n\t]*?</a></b><br /><div 
class=\'smalltext\'><a 
href=\'download\.php\?list\.\'></a></div>([^\r\n\t]*?)<br /><span 
class=\'smalltext\'>"
+# direct link pattern example:
+"""http://swesub.nu/title/tt0389722/""";
+titleurl_pattern = 'http://swesub.nu/title/tt(\d{4,10})/'
+# group(1) = movienumber
+
+# find correct movie pattern example:
+"""<h2><a href="/title/tt0389722/">30 Days of Night (2007)</a></h2>"""
+title_pattern = '<h2><a href="/title/tt(\d{4,10})/">([^\r\n\t]*?) 
\((\d{4})\)</a></h2>'
+# group(1) = movienumber, group(2) = title, group(3) = year
+
+# videosubtitle pattern examples:
+"""<a href="/download/25182/" rel="nofollow" class="dxs">I Am Number Four 2011 
PPVRiP-IFLIX  (1 cd)</a>"""
+"""<a href="/download/21581/" rel="nofollow" 
class="ssg">Avatar.2009.DVDRiP.XViD-iMBT (2 cd)</a>"""
+videosubtitle_pattern = '<a 
href="/download/(\d{1,10})/"[^\n\r\t>]*?>([^\n\r\t]*?)\(1 cd\)</a>'
 # group(1) = id, group(2) = filename
 
 
#====================================================================================================================
 # Functions
 
#====================================================================================================================
 
-
-def getallsubs(searchstring, languageshort, languagelong, subtitles_list):
-    url = main_url + "search.php?q=&r=0&s=S%F6k&in=" + 
urllib.quote_plus(searchstring) + "&ex=&ep=&be=" + 
urllib.quote_plus(searchstring) + "&adv=0"
-    content = geturl(url)
+def getallvideosubs(searchstring, file_original_path, movienumber, 
languageshort, languagelong, subtitles_list):
+    url = main_url + 'title/tt' + str(movienumber) + '/'
+    content, return_url = geturl(url)
     if content is not None:
-        log( __name__ ,"Getting '%s' subs ..." % (languageshort))
-        for matches in re.finditer(subtitle_pattern, content, re.IGNORECASE | 
re.DOTALL):
+        for matches in re.finditer(videosubtitle_pattern, content, 
re.IGNORECASE | re.DOTALL):
             id = matches.group(1)
             filename = string.strip(matches.group(2))
-            log( __name__ ,"Subtitles found: %s (id = %s)" % (filename, id))
-            subtitles_list.append({'rating': '0', 'no_files': 1, 'filename': 
filename, 'sync': False, 'id' : id, 'language_flag': 'flags/' + languageshort + 
'.gif', 'language_name': languagelong})
+            if searchstring in filename:
+                log( __name__ ,"Subtitles found: %s (id = %s)" % (filename, 
id))
+                if isexactmatch(filename, 
os.path.basename(file_original_path)):
+                    subtitles_list.append({'rating': '0', 'no_files': 1, 
'filename': filename, 'sync': True, 'id' : id, 'language_flag': 'flags/' + 
languageshort + '.gif', 'language_name': languagelong})
+                else:
+                    subtitles_list.append({'rating': '0', 'no_files': 1, 
'filename': filename, 'sync': False, 'id' : id, 'language_flag': 'flags/' + 
languageshort + '.gif', 'language_name': languagelong})
+
+
+def isexactmatch(subsfile, videofile):
+    match = re.match("(.*)\.", videofile)
+    if match:
+        videofile = string.lower(match.group(1))
+        subsfile = string.lower(subsfile)
+        log( __name__ ," comparing subtitle file with videofile to see if it 
is a match (sync):\nsubtitlesfile  = '%s'\nvideofile      = '%s'" % 
(string.lower(subsfile), string.lower(videofile)) )
+        if string.find(string.lower(subsfile),string.lower(videofile)) > -1:
+            log( __name__ ," found matching subtitle file, marking it as 
'sync': '%s'" % (string.lower(subsfile)) )
+            return True
+        else:
+            return False
+    else:
+        return False
+
+
+def findtitlenumber(title, year):
+    movienumber = None
+    if year: # movie
+        url = main_url + '/?s=' + urllib.quote_plus('%s (%s)' % (title, year))
+    else: # tv show
+        url = main_url + '/?s=' + urllib.quote_plus(title)
+    content, return_url = geturl(url)
+    if content is not None:
+        match = re.search(titleurl_pattern, return_url, re.IGNORECASE | 
re.DOTALL)
+        if match:
+            movienumber = match.group(1)
+        else:
+            match = re.search(title_pattern, content, re.IGNORECASE | 
re.DOTALL)
+            if match:
+                if (string.lower(match.group(2)) == string.lower(title)):
+                    movienumber = match.group(1)
+    return movienumber
 
 
 def geturl(url):
@@ -42,31 +87,45 @@ def geturl(url):
     try:
         response = my_urlopener.open(url)
         content    = response.read()
+        return_url = response.geturl()
     except:
         log( __name__ ,"Failed to get url:%s" % (url))
         content    = None
-    return content
+        return_url = None
+    return content, return_url
 
 
 def search_subtitles( file_original_path, title, tvshow, year, season, 
episode, set_temp, rar, lang1, lang2, lang3, stack ): #standard input
     subtitles_list = []
     msg = ""
     if len(tvshow) == 0:
-        searchstring = title
+        movienumber = findtitlenumber(title, year)
+        if movienumber is not None:
+            log( __name__ ,"Movienumber found for: %s (%s)" % (title, year))
+            getallvideosubs('', file_original_path, movienumber, "sv", 
"Swedish", subtitles_list)
+        else:
+            log( __name__ ,"Movienumber not found for: %s (%s)" % (title, 
year))
     if len(tvshow) > 0:
-        searchstring = "%s S%#02dE%#02d" % (tvshow, int(season), int(episode))
-    log( __name__ ,"Search string = %s" % (searchstring))
+        movienumber = findtitlenumber(tvshow, None)
+        if movienumber is not None:
+            log( __name__ ,"Movienumber found for: %s (%s)" % (title, year))
+            searchstring = "S%#02dE%#02d" % (int(season), int(episode))
+            getallvideosubs(searchstring, file_original_path, movienumber, 
"sv", "Swedish", subtitles_list)
+        else:
+            log( __name__ ,"Movienumber not found for: %s (%s)" % (title, 
year))
 
-    swedish = 0
-    if string.lower(lang1) == "swedish": swedish = 1
-    elif string.lower(lang2) == "swedish": swedish = 2
-    elif string.lower(lang3) == "swedish": swedish = 3
+#    log( __name__ ,"Search string = %s" % (searchstring))
 
-    if (swedish > 0):
-        getallsubs(searchstring, "sv", "Swedish", subtitles_list)
+#    swedish = 0
+#    if string.lower(lang1) == "swedish": swedish = 1
+#    elif string.lower(lang2) == "swedish": swedish = 2
+#    elif string.lower(lang3) == "swedish": swedish = 3
 
-    if (swedish == 0):
-        msg = "Won't work, Swesub.nu is only for Swedish subtitles."
+#    if (swedish > 0):
+#        getallsubs(searchstring, "sv", "Swedish", subtitles_list)
+
+#    if (swedish == 0):
+#        msg = "Won't work, Swesub.nu is only for Swedish subtitles."
 
     return subtitles_list, "", msg #standard output
 
@@ -74,9 +133,9 @@ def search_subtitles( file_original_path, title, tvshow, 
year, season, episode,
 def download_subtitles (subtitles_list, pos, zip_subs, tmp_sub_dir, 
sub_folder, session_id): #standard input
     id = subtitles_list[pos][ "id" ]
     language = subtitles_list[pos][ "language_name" ]
-    url = main_url + "request.php?" + id
+    url = main_url + "download/" + id + "/"
     log( __name__ ,"Fetching subtitles using url %s" % (url))
-    content = geturl(url)
+    content, return_url = geturl(url)
     if content is not None:
         header = content[:4]
         if header == 'Rar!':
@@ -84,7 +143,7 @@ def download_subtitles (subtitles_list, pos, zip_subs, 
tmp_sub_dir, sub_folder,
             packed = True
         elif header == 'PK':
             local_tmp_file = os.path.join(tmp_sub_dir, "swesub.zip")
-            packed = True                   
+            packed = True
         else: # never found/downloaded an unpacked subtitles file, but just to 
be sure ...
             local_tmp_file = os.path.join(tmp_sub_dir, "swesub.srt") # assume 
unpacked subtitels file is an '.srt'
             subs_file = local_tmp_file
@@ -100,7 +159,7 @@ def download_subtitles (subtitles_list, pos, zip_subs, 
tmp_sub_dir, sub_folder,
             files = os.listdir(tmp_sub_dir)
             init_filecount = len(files)
             max_mtime = 0
-            filecount = init_filecount                        
+            filecount = init_filecount
             # determine the newest file from tmp_sub_dir
             for file in files:
                 if (string.split(file,'.')[-1] in ['srt','sub','txt']):
@@ -125,11 +184,10 @@ def download_subtitles (subtitles_list, pos, zip_subs, 
tmp_sub_dir, sub_folder,
             if waittime == 20:
                 log( __name__ ,"Failed to unpack subtitles in '%s'" % 
(tmp_sub_dir))
             else:
-                log( __name__ ,"Unpacked files in '%s'" % (tmp_sub_dir))       
 
+                log( __name__ ,"Unpacked files in '%s'" % (tmp_sub_dir))
                 for file in files:
                     # there could be more subtitle files in tmp_sub_dir, so 
make sure we get the newly created subtitle file
                     if (string.split(file, '.')[-1] in ['srt', 'sub', 'txt']) 
and (os.stat(os.path.join(tmp_sub_dir, file)).st_mtime > init_max_mtime): # 
unpacked file is a newly created subtitle file
-                        log( __name__ ,"Unpacked subtitles file '%s'" % 
(file))        
+                        log( __name__ ,"Unpacked subtitles file '%s'" % (file))
                         subs_file = os.path.join(tmp_sub_dir, file)
         return False, language, subs_file #standard output
-            
\ No newline at end of file
diff --git 
a/script.xbmc.subtitles/resources/lib/services/Undertexter/service.py 
b/script.xbmc.subtitles/resources/lib/services/Undertexter/service.py
index 3e2fb9b..06dc0d8 100644
--- a/script.xbmc.subtitles/resources/lib/services/Undertexter/service.py
+++ b/script.xbmc.subtitles/resources/lib/services/Undertexter/service.py
@@ -14,25 +14,26 @@ debug_pretext = ""
 
 # subtitle pattern example:
 """
-                                            <a 
href="http://www.undertexter.se/?p=undertext&id=20093"; alt="Julie & Julia 
(Julie and Julia)" title="Julie & Julia (Julie and Julia)"><b>
-                                            Julie & Julia (Julie and Julia)</b>
+<a href="http://www.engsub.net/86981/"; alt=....
+or
+<a href="http://www.undertexter.se/22743/"; alt="Dexter S05E01 - My Bad" 
title="Dexter S05E01 - My Bad"><b>
+                                            Dexter S05E01 - My Bad</b>
                                             </a></td>
                                         </tr>
                                         <tr>
-                                          <td colspan="2" align="left" 
valign="top" bgColor="#f2f2f2"  style="padding-top: 0px; padding-left: 4px; 
padding-right: 0px; padding-bottom: 0px; border-bottom: 1px solid rgb(153, 153, 
153); border-color: #E1E1E1" >
+                                          <td colspan="2" align="left" 
valign="top" bgColor="#f9f9f9"  style="padding-top: 0px; padding-left: 4px; 
padding-right: 0px; padding-bottom: 0px; border-bottom: 1px solid rgb(153, 153, 
153); border-color: #E1E1E1" >
                                             (1 cd)
-                                                                               
         <br> <img src="bilder/spacer.gif" height="2"><br>
-
-                                            Nedladdningar: 316<br>
-                                            <img src="bilder/spacer.gif" 
height="3"><br>
-                                            
Julie.&.Julia.2009.720p.BluRay.DTS.x264-EbP</td>
-                                        </tr>
-
+                                                                               
         <br> <img src="http://www.undertexter.se/bilder/spacer.gif"; 
height="2"><br>
+                                            Nedladdningar: 2328<br>
+                                            <img 
src="http://www.undertexter.se/bilder/spacer.gif"; height="3"><br>
+                                            
Dexter.S05E01.720p.HDTV.x264-ORENJI</td>
 """
-subtitle_pattern = "<a href=\"http://www.undertexter.se/\?p=[^ 
\r\n\t]*?&id=(\d{1,10})\" alt=\"[^\r\n\t]*?\" title=\"[^\r\n\t]*?\"><b>\
+sv_subtitle_pattern = "<a href=\"http://www.undertexter.se/(\d{1,10})/\" 
alt=\"[^\r\n\t]*?\" title=\"[^\r\n\t]*?\"><b>\
 [ \r\n]*?[^\r\n\t]*?</b>.{400,500}?\(1 cd\).{250,550}?[ 
\r\n]*([^\r\n\t]*?)</td>[ \r\n]*?[^\r\n\t]*?</tr>"
+# group(1) = id, group(2) = filename
 
-
+en_subtitle_pattern = "<a href=\"http://www.engsub.net/(\d{1,10})/\" 
alt=\"[^\r\n\t]*?\" title=\"[^\r\n\t]*?\"><b>\
+[ \r\n]*?[^\r\n\t]*?</b>.{400,500}?\(1 cd\).{250,550}?[ 
\r\n]*([^\r\n\t]*?)</td>[ \r\n]*?[^\r\n\t]*?</tr>"
 # group(1) = id, group(2) = filename
 
 
@@ -40,12 +41,13 @@ subtitle_pattern = "<a 
href=\"http://www.undertexter.se/\?p=[^ \r\n\t]*?&id=(\d{
 # Functions
 
#====================================================================================================================
 
-
 def getallsubs(searchstring, languageshort, languagelong, subtitles_list):
     if languageshort == "sv":
         url = main_url + 
"?group1=on&p=soek&add=arkiv&submit=S%F6k&select2=&select3=&select=&str=" + 
urllib.quote_plus(searchstring)
+        subtitle_pattern = sv_subtitle_pattern
     if languageshort == "en":
         url = main_url + 
"?group1=on&p=eng_search&add=arkiv&submit=S%F6k&select2=&select3=&select=&str=" 
+ urllib.quote_plus(searchstring)
+        subtitle_pattern = en_subtitle_pattern
     content = geturl(url)
     if content is not None:
         log( __name__ ,"%s Getting '%s' subs ..." % (debug_pretext, 
languageshort))
@@ -124,7 +126,7 @@ def download_subtitles (subtitles_list, pos, zip_subs, 
tmp_sub_dir, sub_folder,
     if string.lower(language) == "swedish":
         url = main_url + "laddatext.php?id=" + id
     if string.lower(language) == "english":
-        url = eng_download_url + "download.php?id=" + id
+        url = eng_download_url + "subtitle.php?id=" + id
     log( __name__ ,"%s Fetching subtitles using url %s" % (debug_pretext, url))
     content = geturl(url)
     if content is not None:
diff --git a/script.xbmc.subtitles/resources/settings.xml 
b/script.xbmc.subtitles/resources/settings.xml
index 0ec5692..206184b 100644
--- a/script.xbmc.subtitles/resources/settings.xml
+++ b/script.xbmc.subtitles/resources/settings.xml
@@ -40,6 +40,8 @@
       <setting id="OmniSubs" type="bool" label="OmniSubs.net" default="false"/>
       <setting id="Omniuser" type="text"  visible= "eq(-1,true)" 
enable="eq(-1,true)" label="30136" default=""/>
       <setting id="Omnipass" type="text" option = "hidden" visible= 
"eq(-2,true)" enable="eq(-2,true)" label="30137" default=""/>
+      <setting id="Subscenter" type="bool" label="Subscenter.org" 
default="false"/>
+      <setting id="AsiaTeam" type="bool" label="Asia-Team.net" 
default="false"/>
     </category>
     <category label="30106">
       <setting id="defmovieservice" type="fileenum" mask="/" label="30113" 
default="OpenSubtitles" values="/resources/lib/services" />

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

Summary of changes:
 script.xbmc.subtitles/addon.xml                    |   16 +-
 script.xbmc.subtitles/changelog.txt                |    5 +
 .../services/{Argenteam => AsiaTeam}/__init__.py   |    0
 .../resources/lib/services/AsiaTeam/logo.png       |  Bin 0 -> 45102 bytes
 .../services/{Argenteam => AsiaTeam}/service.py    |  140 +++++++-----
 .../resources/lib/services/Subscenter/logo.png     |  Bin 0 -> 17417 bytes
 .../resources/lib/services/Subscenter/service.py   |  238 ++++++++++++++++++++
 .../resources/lib/services/Swesub/service.py       |  122 ++++++++---
 .../resources/lib/services/Undertexter/service.py  |   30 ++--
 script.xbmc.subtitles/resources/settings.xml       |    2 +
 10 files changed, 438 insertions(+), 115 deletions(-)
 copy script.xbmc.subtitles/resources/lib/services/{Argenteam => 
AsiaTeam}/__init__.py (100%)
 create mode 100644 
script.xbmc.subtitles/resources/lib/services/AsiaTeam/logo.png
 copy script.xbmc.subtitles/resources/lib/services/{Argenteam => 
AsiaTeam}/service.py (55%)
 create mode 100644 
script.xbmc.subtitles/resources/lib/services/Subscenter/logo.png
 create mode 100644 
script.xbmc.subtitles/resources/lib/services/Subscenter/service.py


hooks/post-receive
-- 
Scripts


------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to