[Xbmc-addons] Scripts branch, dharma, updated. 54c1b26f5ee1cfe20bb48975d0323b9cfe0d3ee2

Thu, 14 Jul 2011 10:21:50 -0700 

The branch, dharma has been updated
       via  54c1b26f5ee1cfe20bb48975d0323b9cfe0d3ee2 (commit)
      from  302a96af54fd431736df0a98f65741b8cc2634f5 (commit)

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

commit 54c1b26f5ee1cfe20bb48975d0323b9cfe0d3ee2
Author: amet <[email protected]>
Date:   Thu Jul 14 19:20:50 2011 +0200

    [script.xbmc.subtitles] -v 2.5.5
    
    - fix: titulky.com service

diff --git a/script.xbmc.subtitles/addon.xml b/script.xbmc.subtitles/addon.xml
index 1373a46..e19b8c5 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.5.4"
+       version="2.5.5"
        provider-name="Amet, mr_blobby">
   <requires>
     <import addon="xbmc.python" version="1.0"/>
diff --git a/script.xbmc.subtitles/changelog.txt 
b/script.xbmc.subtitles/changelog.txt
index b51a35c..d065636 100644
--- a/script.xbmc.subtitles/changelog.txt
+++ b/script.xbmc.subtitles/changelog.txt
@@ -1,3 +1,6 @@
+2.5.5
+- fix: titulky.com service
+
 2.5.4
 - fixed: OpenSubtitles search
 - added: SuperSubtitles service, thx kispaljr and mukka
diff --git a/script.xbmc.subtitles/resources/language/Czech/strings.xml 
b/script.xbmc.subtitles/resources/language/Czech/strings.xml
index 594397d..0dbb85f 100644
--- a/script.xbmc.subtitles/resources/language/Czech/strings.xml
+++ b/script.xbmc.subtitles/resources/language/Czech/strings.xml
@@ -8,16 +8,16 @@
     <string id="642">Vyhledávám titulky %s</string>
     <string id="646">Připojuji...</string>
     <string id="649">Stahuji titulky...</string>
-    <string id="652">Soubor s titulky je stažen a rozbalen</string>
+    <string id="652">Soubor s titulky byl stažen a rozbalen</string>
     <string id="653">Připojení selhalo</string>
     <string id="654">Chyba při rozbalování titulků</string>
     <string id="655">Titulky k dispozici lokálně</string>
     <string id="656">Služba neodpověděla do časového limitu</string>
-    <string id="657">No Subtitles Found!</string>    
+    <string id="657">Titulky nenalezeny!</string>
     <string id="744">titulků pro</string>
     <string id="747">Hledat pomocí názvu složky</string>
     <string id="748">Titulky nelze uložit do vybrané složky</string>
-    <string id="750">Chcete tyto titulky aktivovat dočasně_</string>
+    <string id="750">Chcete tyto titulky aktivovat dočasně?</string>
     <string id="751">Vložte název filmu (rok)</string>
     <string id="755">Server je přetížen, zkuste to prosím později</string>
     <string id="756">Přihlášení selhalo. Zkontroluje nastavení.</string>
@@ -26,7 +26,8 @@
     <string id="759">Vložte kontrolní kód</string>
     <string id="760">Dostupné služby</string>
     <string id="761">Pro stažení těchto titulků je třeba 
přihlášení,[CR]nastavte prosím přihlašovací údaje</string>
-
+    <string id="762">Nastavení</string>
+    <string id="763">Automaticky stáhnout první 'sync' titulky</string>
   <!-- Script Settings -->
   
     <string id="30100">Jakyky</string>
@@ -53,7 +54,16 @@
     <string id="30127">- Itasa heslo</string>
     <string id="30128">- Titulky jméno</string>
     <string id="30129">- Titulky heslo</string>
-  
+    <string id="30130">Pokud nejsou titulky nalezeny, použít jinou 
službu</string>
+    <string id="30131">Automaticky stáhnout první "sync" titulky</string>
+    <string id="30132">- LegendasDivx jméno</string>
+    <string id="30133">- LegendasDivx heslo</string>
+    <string id="30134">- PTSubs jméno</string>
+    <string id="30135">- PTSubs heslo</string>
+    <string id="30136">- OmniSubs jméno</string>
+    <string id="30137">- OmniSubs heslo</string>
+    <string id="30138">- LegendasZone jméno</string>
+    <string id="30139">- LegendasZone heslo</string>
   <!-- Languages  -->
   
     <string id="30201">Albanian</string>
diff --git a/script.xbmc.subtitles/resources/lib/services/Titulky/logo.png 
b/script.xbmc.subtitles/resources/lib/services/Titulky/logo.png
index 6109692..91e7432 100644
Binary files a/script.xbmc.subtitles/resources/lib/services/Titulky/logo.png 
and b/script.xbmc.subtitles/resources/lib/services/Titulky/logo.png differ
diff --git a/script.xbmc.subtitles/resources/lib/services/Titulky/service.py 
b/script.xbmc.subtitles/resources/lib/services/Titulky/service.py
index 9bc1d9d..a1f99be 100644
--- a/script.xbmc.subtitles/resources/lib/services/Titulky/service.py
+++ b/script.xbmc.subtitles/resources/lib/services/Titulky/service.py
@@ -15,25 +15,27 @@ _ = sys.modules[ "__main__" ].__language__
 __scriptname__ = sys.modules[ "__main__" ].__scriptname__
 __cwd__        = sys.modules[ "__main__" ].__cwd__
 __settings__ = sys.modules[ "__main__" ].__settings__
+
 """
-            <tr class="row2">
-                    <td><a href="Pulp-Fiction-118518.htm" >Pulp 
Fiction</a></td>
-          <td align="center"><a class="fixedTip" 
title="Pulp.Fiction.1994.720p.BluRay.x264-SiNNERS"><img src="img/ico/rel.gif" 
atl="release"/></a></td>        
-          <td>&nbsp;</td>
-          <td>1994</td>
-                    <td>18.11.2008</td>        
-          <td align="right">681</td>
-          <td>CZ</td>
-          <td>1</td>
-          <td align="right">8138.46MB</td>
-                    <td>
-                           <a href="" onclick="UD('119203');return false;" > 
aAaX</a>
-                      </td>
+<tr class="r1"> 
+                    <td><a href="Animal-Farm-96061.htm" >Animal Farm</a></td> 
+          <td align="center"><a class="fixedTip" 
title="Animal.Farm.1954.DVDRip.XViD.iNT-JoLLyRoGeR"><img 
src="css/new/verze-release.png" atl="release"/></a></td>        
+          <td>&nbsp;</td> 
+          <td>1954</td> 
+                    <td>15.2.2008</td>        
+          <td align="right">2415</td> 
+          <td><img alt="CZ" src="css/new/flag-CZ-small.gif" /></td> 
+          <td>1</td> 
+          <td align="right">699.16MB</td> 
+                    <td> 
+                           <a href="javascript:void(0)" 
onclick="UD('126284');return false;" > DaftXK</a> 
+                      </td> 
         </tr>
 
+
 """
 
-subtitle_pattern='..<tr class=\"row[12]\">\s+?<td?[= \w\"]+><a 
href=\"[\w-]+-(?P<id>\d+).htm\"[ ]?>(?P<title>[\w\- ]*)</a></td>\s+?<td?[= 
\w\"]+>(<a?[= \w\"]+title=\"(?P<sync>[,\{\}\w.\d \(\)\]\[-]+)\"><img?[= 
\w\\./"]+></a>)?</td>\s+?<td?[= \w\"]+>(?P<tvshow>[\w\;\&]+)</td>\s+<td?[= 
\w\"]+>(?P<year>\d+)</td>\s+<td?[= \w\"]+>[\w\;\&\.\d]+</td>\s+<td?[= 
\w\"]+>(?P<downloads>\d+)</td>\s+<td?[= \w\"]+>(?P<lang>\w{2})</td>\s+<td?[= 
\w\"]+>(?P<cds>\w+)</td>\s+<td?[= \w\"]+>(?P<size>[\w\.]+)MB</td>'
+subtitle_pattern='<tr class=\"r[12]*\">\s+<td[^>]*><a 
href=\"[\w-]+-(?P<id>\d+).htm\"[ 
]?>(?P<title>[^<]+)</a></td>\s+?<td[^>]*>(<a?[= 
\w\"]+title=\"(?P<sync>[^\"]+)\"><img[^>]+></a>)?</td>\s+?<td[^>]*>(?P<tvshow>[^<]+)</td>\s+<td[^>]*>(?P<year>\d+)</td>\s+<td[^<]+</td>\s+<td[^>]*>(?P<downloads>\d+)</td>\s+<td?[^>]*><img
 
alt=\"(?P<lang>\w{2})\"[^\>]+></td>\s+<td>(?P<cds>\w+)</td>\s+<td[^>]+>(?P<size>[\w\.]+)MB</td>\s+<td>\s+(<a[^<]+</a>)?(<i[^<]+</i>)?\s+</td>\s+</tr>'
 
 control_image_pattern='(secode.php\?[\w\d=]+)'
 session_id_pattern='secode.php\?PHPSESSID=([\w\d]+)'
@@ -43,7 +45,7 @@ countdown_pattern='CountDown\((\d+)\)'
 <a rel="nofollow" id="downlink" 
href="/idown.php?id=48504441">www.titulky.com/idown.php?id=48504441</a>
 """
 
-sublink_pattern='<a?[= \w\"]+href="([\w\.\?\d=/]+)\"'
+sublink_pattern='<a?[= \w\"]+href="([^\"]+)\"'
 def search_subtitles( file_original_path, title, tvshow, year, season, 
episode, set_temp, rar, lang1, lang2, lang3, stack ): #standard input
        # need to filter titles like <Localized movie name> (<Movie name>)
        br_index = title.find('(')
@@ -179,7 +181,7 @@ class TitulkyClient(object):
                subtitles_list = []
                max_downloads=1
                for matches in re.finditer(subtitle_pattern, content, 
re.IGNORECASE | re.DOTALL):
-                       # print matches.group('id') +' ' 
+matches.group('title')+' '+ str(matches.group('sync'))+' '+ 
matches.group('tvshow')+' '+ matches.group('year')+' '+ 
matches.group('downloads')+' '+ matches.group('lang')+' '+ 
matches.group('cds')+' '+matches.group('size')
+               #       print matches.group('id') +' ' 
+matches.group('title')+' '+ str(matches.group('sync'))+' '+ 
matches.group('tvshow')+' '+ matches.group('year')+' '+ 
matches.group('downloads')+' '+ matches.group('lang')+' '+ 
matches.group('cds')+' '+matches.group('size')
                        file_name = matches.group('sync')
                        if file_name == None: # if no sync info is found, just 
use title instead of None
                                file_name = matches.group('title') 

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

Summary of changes:
 script.xbmc.subtitles/addon.xml                    |    2 +-
 script.xbmc.subtitles/changelog.txt                |    3 ++
 .../resources/language/Czech/strings.xml           |   20 +++++++++---
 .../resources/lib/services/Titulky/logo.png        |  Bin 32992 -> 5302 bytes
 .../resources/lib/services/Titulky/service.py      |   34 ++++++++++---------
 5 files changed, 37 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
Scripts


------------------------------------------------------------------------------
AppSumo Presents a FREE Video for the SourceForge Community by Eric 
Ries, the creator of the Lean Startup Methodology on "Lean Startup 
Secrets Revealed." This video shows you how to validate your ideas, 
optimize your ideas and identify your business strategy.
http://p.sf.net/sfu/appsumosfdev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to