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

Wed, 18 Jan 2012 12:33:09 -0800 

The branch, eden-pre has been updated
       via  cea99833af0aa1cd7d1f4a7684f1ab283654366d (commit)
       via  09dd4e003e151a63923b2d0711177565f1601560 (commit)
       via  4c151603e055303a87eced792e112fa4b46284d8 (commit)
      from  abceb108b2a88ab55cefb1602fd2a2f5f5bfc31e (commit)

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

commit cea99833af0aa1cd7d1f4a7684f1ab283654366d
Author: amet <[email protected]>
Date:   Thu Jan 19 00:32:33 2012 +0400

    [script.xbmc.subtitles] -v 2.9.31
    
    - fix: Subdivx, thx Enric Godes
    - updated: Bulgarian translation, thx NEOhidra
    - fix: Napisy24pl service, thx mrto

diff --git a/script.xbmc.subtitles/addon.xml b/script.xbmc.subtitles/addon.xml
index 56202de..93c33dd 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.30"
+       version="2.9.31"
        provider-name="Amet, mr_blobby">
   <requires>
     <import addon="xbmc.python" version="2.0"/>
@@ -10,6 +10,7 @@
   <extension point="xbmc.python.subtitles"
              library="default.py" />
   <extension point="xbmc.addon.metadata">
+    <summary lang="bg">XBMC субтитри</summary>
     <summary lang="en">XBMC Subtitles</summary>
     <summary lang="es">Subtítulos XBMC</summary> 
     <summary lang="hu">XBMC feliratok</summary> 
@@ -18,6 +19,7 @@
     <summary lang="bg">XBMC Субтитри</summary>
     <summary lang="pt">Legendas XBMC</summary>
     <summary lang="pl">Napisy XBMC</summary>
+    <description lang="bg">Търси и сваля субтитри от 
многобройни източници. Трябват ли ви 
субтитри на български език пробвайте 
OpenSubtitles.org. Ползващите Eden могат да вкл/изкл 
субтитрите от Настройки > Облик > Добавка > 
Видео OSD</description>
     <description lang="en">Search and download subtitles from multipe 
providers.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, Legendas-Zone.org, 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>
diff --git a/script.xbmc.subtitles/changelog.txt 
b/script.xbmc.subtitles/changelog.txt
index 9c51bc2..a165eba 100644
--- a/script.xbmc.subtitles/changelog.txt
+++ b/script.xbmc.subtitles/changelog.txt
@@ -1,3 +1,8 @@
+2.9.31
+- fix: Subdivx, thx Enric Godes
+- updated: Bulgarian translation, thx NEOhidra
+- fix: Napisy24pl service, thx mrto
+
 2.9.30
 - fix: stacked movie subs were not saved properly
 
diff --git a/script.xbmc.subtitles/resources/language/Bulgarian/strings.xml 
b/script.xbmc.subtitles/resources/language/Bulgarian/strings.xml
index ffbdb8b..a1ce129 100644
--- a/script.xbmc.subtitles/resources/language/Bulgarian/strings.xml
+++ b/script.xbmc.subtitles/resources/language/Bulgarian/strings.xml
@@ -4,99 +4,121 @@
   <!-- Bulgarian -->
   
     <string id="610">Търси </string>
-    <string id="612">Ръчно въвеждане на 
търсеното</string>
-    <string id="642">Търсене на субтитри %s</string>
+    <string id="612">Въведете низ за търсене</string>
+    <string id="642">Търсене на субтитри за %s</string>
     <string id="646">Свързване...</string>
     <string id="649">Сваляне на субтитри...</string>
-    <string id="652">Субтитрите са свалени и 
разархивирани</string>
+    <string id="652">Субтитрите са свалени и 
извлечени</string>
     <string id="653">Връзката пропадна</string>
-    <string id="654">Грешка при разархивирането на 
сутитрите</string>
-    <string id="655">Има налични субтитри в 
папката</string>
-    <string id="656">Търсенето не върна отговор в 
лимитираното време за това</string>
-    <string id="657">Не са открити субтитри!</string>
-    <string id="744">Открити субтитри за</string>
-    <string id="747">Използвай името на папката за 
търсене</string>
-    <string id="748">Не можете да запазите субтитри 
в избраната дестинация</string>
-    <string id="750">Желаете ли да пуснете тези 
субтитри временно?</string>
-    <string id="751">Въведе: Името на филма 
(Година)</string>
+    <string id="654">Възникна грешка при 
извличането на субтитрите</string>
+    <string id="655">Локално са налични 
субтитри</string>
+    <string id="656">Услугата не отговори в 
определеното време</string>
+    <string id="657">Не са намерени субтитри!</string>
+    <string id="744">намерени субтитри за</string>
+    <string id="747">Ползвай името на папката за 
търсене</string>
+    <string id="748">Субтитрите не могат да бъдат 
записани в избраното място</string>
+    <string id="750">Желаете ли субтитрите да бъдат 
активирани временно?</string>
+    <string id="751">Въведе: Името–на–филма 
(Годината-му)</string>
     <string id="755">Сървърът е претоварен, моля 
опитайте по-късно</string>
-    <string id="756">Влизането пропадна. Моля 
проверете вашите настройки в 
конфигурацията на приложението</string>
-    <string id="757">Сървърът изисква да 
пренапишете кодът от картинката</string>
-    <string id="758">Моля погледнете към зоната с 
известие</string> 
-    <string id="759">Въведи кодът от картинката, от 
зоната с известие</string>
-    <string id="760">Достъпни търсачки</string>
+    <string id="756">Вписването се провали. Моля, 
проверете настройките в конфигурацията на 
добавката</string>
+    <string id="757">Сървърът изисква да въведете 
код от картинка</string>
+    <string id="758">Моля, прегледайте зоната за 
известия</string> 
+    <string id="759">Въведи кода от картинката в 
зоната за известия</string>
+    <string id="760">Налични услуги</string>
+    <string id="761">Необходимо е да се впишете, за 
да свалите субтитрите,[CR]потвърдете 
настройките в конфигурацията на 
добавката</string>
     <string id="762">Настройки</string>
-
+    <string id="763">Свали автоматично първите 
субтитри, които са синхронни</string>
+    <string id="764">Сваляне на първите синхронни 
субтитри</string>
+    <string id="765">първите синхронни субтитри са 
свалени</string>
+    <string id="766">Изберете папка за 
субтитрите</string>
+       
   <!-- Script Settings -->
 
     <string id="30100">Езици</string>
-    <string id="30101">Първи език</string>
+    <string id="30101">Основен език</string>
     <string id="30102">Втори език</string>
-    <string id="30103">Търсачки</string>
-    <string id="30104">- Podnapisi.net Въведи име</string>
-    <string id="30105">- Podnapisi.net Въведи парола</string>
-    <string id="30106">Още опции</string>
-    <string id="30107">Свалянето на субтитри да бъде 
в папката на филма</string>
-    <string id="30108">- Определи сам мястото за 
сваляне</string>
-    <string id="30110">Ръчно въведи търсения 
текст</string>
+    <string id="30103">Услуги</string>
+    <string id="30104">- Въведете име за Podnapisi.net</string>
+    <string id="30105">- Въведете парола за 
Podnapisi.net</string>
+    <string id="30106">Допълнителни</string>
+    <string id="30107">Сваляй субтитрите в папката 
на филма</string>
+    <string id="30108">- Изберете място, къде да се 
свалят субтитрите</string>
+    <string id="30110">Ръчно въвеждане на низ за 
търсене</string>
     <string id="30111">Трети език</string>  
-    <string id="30113">Избери основна търсачка за 
филм</string>
-    <string id="30114">Избери основна търсачка за 
сериал</string>
-    <string id="30118">Изпиши името на субтитрите в 
страницата с резултати</string>
-    <string id="30119">Използвай името на папката за 
търсене</string>
-    <string id="30121">Добави означение за език към 
името на файла </string>
-    <string id="30122">Определи време за отговор на 
търсенето</string>
-    <string id="30123">- Legendas.TV Въведи име</string>
-    <string id="30124">- Legendas.TV Въведи парола</string>
-    <string id="30125">Изключи хеш търсенето</string>
-    <string id="30126">- Itasa Въведи име</string>
-    <string id="30127">- Itasa Въведи парола</string>
-  
+    <string id="30113">Изберете стандартна услуга за 
филми</string>
+    <string id="30114">Изберете стандартна услуга за 
ТВ Сериали</string>
+    <string id="30118">Показвай името на файла в 
страницата с резултати</string>
+    <string id="30119">Ползвай името на папката за 
търсене</string>
+    <string id="30121">Добавяй означение за език към 
името на файла </string>
+    <string id="30122">Определете макс. време за 
отговор при търсене</string>
+    <string id="30123">- Въведете име за Legendas.TV</string>
+    <string id="30124">- Въведете парола за 
Legendas.TV</string>
+    <string id="30125">Без hash търсене</string>
+    <string id="30126">- Въведете име за Itasa</string>
+    <string id="30127">- Въведете парола за Itasa</string>
+    <string id="30128">- Въведете име за Titulky</string>
+    <string id="30129">- Въведете парола за Titulky</string>
+    <string id="30130">Търси в следващата налична 
услуга ако няма резултати</string>
+    <string id="30131">Сваляй автоматично първите 
субтитри, които са синхронни</string>
+    <string id="30132">- Въведете име за </string>
+    <string id="30133">- Въведете парола за 
LegendasDivx</string>
+    <string id="30134">- Въведете име за PTSubs</string>
+    <string id="30135">- Въведете парола за PTSubs</string>
+    <string id="30136">- Въведете име за OmniSubs</string>
+    <string id="30137">- Въведете парола за OmniSubs</string>
+    <string id="30138">- Въведете име за LegendasZone</string>
+    <string id="30139">- Въведете парола за 
LegendasZone</string>
+    <string id="30140">- Изберете тип субтитри:</string>
+    <string id="30141">SubRip</string>
+    <string id="30142">TMPlayer</string>
+    <string id="30143">MicroDVD</string>
+    <string id="30144">MPl2</string>
+       
   <!-- Languages  -->
   
-    <string id="30201">Albanian</string>
-    <string id="30202">Arabic</string>
-    <string id="30203">Belarusian</string>
-    <string id="30204">Bosnian (Latin)</string>
-    <string id="30205">Bulgarian</string>
-    <string id="30206">Catalan</string>
-    <string id="30207">Chinese</string>
-    <string id="30208">Croatian</string>
-    <string id="30209">Czech</string>
-    <string id="30210">Danish</string>
-    <string id="30211">Dutch</string>
-    <string id="30212">English</string>
-    <string id="30213">Estonian</string>
-    <string id="30214">Finnish</string>
-    <string id="30215">French</string>
-    <string id="30216">German</string>
-    <string id="30217">Greek</string>
-    <string id="30218">Hebrew</string>
-    <string id="30219">Hindi</string>
-    <string id="30220">Hungarian</string>
-    <string id="30221">Icelandic</string>
-    <string id="30222">Indonesian</string>
-    <string id="30224">Italian</string>
-    <string id="30225">Japanese</string>
-    <string id="30226">Korean</string>
-    <string id="30227">Latvian</string>
-    <string id="30228">Lithuanian</string>
-    <string id="30229">Macedonian</string>
-    <string id="30230">Norwegian</string>
-    <string id="30232">Polish</string>
-    <string id="30233">Portuguese</string>
-    <string id="30234">Portuguese (Brazil)</string>
-    <string id="30235">Romanian</string>
-    <string id="30236">Russian</string>
-    <string id="30237">SerbianLatin</string>
-    <string id="30238">Slovak</string>
-    <string id="30239">Slovenian</string>
-    <string id="30240">Spanish</string>
-    <string id="30242">Swedish</string>
-    <string id="30243">Thai</string>
-    <string id="30244">Turkish</string>
-    <string id="30245">Ukrainian</string>
-    <string id="30246">Vietnamese</string>
-    <string id="30247">Farsi</string>  
+    <string id="30201">албански</string>
+    <string id="30202">арабски</string>
+    <string id="30203">беларуски</string>
+    <string id="30204">босненски (Latin)</string>
+    <string id="30205">български</string>
+    <string id="30206">каталонски</string>
+    <string id="30207">китайски</string>
+    <string id="30208">хърватски</string>
+    <string id="30209">чешки</string>
+    <string id="30210">датски</string>
+    <string id="30211">нидерландски (холандски)</string>
+    <string id="30212">английски</string>
+    <string id="30213">естонски</string>
+    <string id="30214">фински (финландски)</string>
+    <string id="30215">френски</string>
+    <string id="30216">немски</string>
+    <string id="30217">гръцки</string>
+    <string id="30218">иврит</string>
+    <string id="30219">хинди</string>
+    <string id="30220">унгарски</string>
+    <string id="30221">исландски</string>
+    <string id="30222">индонезийски</string>
+    <string id="30224">италиански</string>
+    <string id="30225">японски</string>
+    <string id="30226">корейски</string>
+    <string id="30227">латвийски</string>
+    <string id="30228">литовски</string>
+    <string id="30229">македонски</string>
+    <string id="30230">норвежки</string>
+    <string id="30232">полски</string>
+    <string id="30233">португалски</string>
+    <string id="30234">португалски (Brazil)</string>
+    <string id="30235">румънски</string>
+    <string id="30236">руски</string>
+    <string id="30237">сръбски (Latin)</string>
+    <string id="30238">словашки</string>
+    <string id="30239">словенски</string>
+    <string id="30240">испански</string>
+    <string id="30242">шведски</string>
+    <string id="30243">тайски (тайландски)</string>
+    <string id="30244">турски</string>
+    <string id="30245">украински</string>
+    <string id="30246">виетнамски</string>
+    <string id="30247">персийски (фарси)</string>  
     
 </strings>
\ No newline at end of file
diff --git a/script.xbmc.subtitles/resources/lib/services/Napisy24pl/service.py 
b/script.xbmc.subtitles/resources/lib/services/Napisy24pl/service.py
index 59c1fde..d3441c6 100644
--- a/script.xbmc.subtitles/resources/lib/services/Napisy24pl/service.py
+++ b/script.xbmc.subtitles/resources/lib/services/Napisy24pl/service.py
@@ -1,13 +1,13 @@
 # -*- coding: UTF-8 -*-
 
-# Attention this is a Frankenstein Monster. Patched from other pieces of code,
-# ugly and may not work at all. Feel free to improve, change anything.
-# I do not know how to code, especially in Python, at all. 
+# Frankenstein Monster v 2.0
+# Feel free to improve, change anything.
 # Credits to amet, Guilherme Jardim, and many more.
 # mrto
 
 import urllib2, re, string, xbmc, sys, os
 from utilities import log, languageTranslate
+from BeautifulSoup import BeautifulSoup
 
 _ = sys.modules[ "__main__" ].__language__
 __addon__ = sys.modules[ "__main__" ].__addon__
@@ -25,69 +25,102 @@ main_url = "http://napisy24.pl/search.php?str=";
 base_download_url = "http://napisy.me/download/";
 down_url = "%s%s/" % (base_download_url, subtitle_type)
 
-subtitle_pattern = 'a href=\"/download/(\d+)/\"><strong>(.+?)</strong></a>'
-
-def getallsubs(content, title, subtitles_list, file_original_path, stack):
-    nr_lista = 0
-    wydanie_re = '<td.+?>(.+?)<br />'
-    rozmiar_re = 'Rozmiar pliku: <strong>(.+?)</strong>'
-    ocena_re = 'rednia ocena: (\d\,\d\d)<br />'
-    jezyk_re = '<img src="images/ico_flag_(..)_2.png" alt="'
-    ilosc_plyt_re = '<td.+?style="text-align: center;">[\r\n\t ]+?(\d)[\r\n\t 
]+?</td>'
-    wydanie_lista = re.findall(wydanie_re, content)
-    jezyk_lista = re.findall(jezyk_re, content)
-    rozmiar_lista = re.findall(rozmiar_re, content)
-    ocena_lista = re.findall(ocena_re, content)
-    ilosc_plyt_lista = re.findall(ilosc_plyt_re, content)
-    for matches in re.finditer(subtitle_pattern, content):
-        numer_napisu, tytul = matches.groups()
-        wydanie = wydanie_lista[nr_lista]
-        ocena = ocena_lista[nr_lista]
-        jezyk = jezyk_lista[nr_lista]
-        ilosc_plyt = ilosc_plyt_lista[nr_lista]
-        nr_lista +=1
-        link = "%s%s/" % (down_url, numer_napisu)
-        log( __name__ ,"Subtitles found: %s %s (link=%s)" % (tytul, wydanie, 
link))
-        obraz_flagi = "flags/%s.gif" % (jezyk)
-        lang = languageTranslate(jezyk,2,0)
-        tytul_pelny = '%s %s' % (tytul, wydanie)
-        wydanie_sclean = wydanie.replace(" ","")
-        wydanie_clean = wydanie_sclean.replace(",",";")
-        wydanie_srednik = '%s;' % (wydanie_clean)
-        for wydania in re.finditer('(.+?);', wydanie_srednik):
-            wydania = wydania.group()
-            wydania_clean = wydania.replace(";","")
-            wydania_upper = wydania_clean.upper()
-            filepatch_upper = file_original_path.upper()
-            if wydania_upper in filepatch_upper:
-                sync_value = True
+def getallsubs(content, title, subtitles_list, file_original_path, stack, 
lang1, lang2, lang3):
+    soup = BeautifulSoup(content)
+    subs = soup("tr")
+    sub_str = str(subs[1:])
+    first_row = True
+    for row in subs[1:]:
+        sub_number_re = 'a href=\"/download/(\d+)/\"><strong>'
+        title_re = '<a href="/download/\d+?/"><strong>(.+?)</strong></a>'
+        release_re = '<td>(.+?)<br />|<td.+?>(.+?)<br />'
+        rating_re = 'rednia ocena: (\d\,\d\d)<br />'
+        lang_re = '<img src="images/ico_flag_(..)_2.png" alt="'
+        disc_amount_re = '<td.+?style="text-align: center;">[\r\n\t 
]+?(\d)[\r\n\t ]+?</td>'
+        video_file_size_re = 'Rozmiar pliku: <strong>(\d+?)</strong>'
+        video_file_size_re_multi = 'Rozmiar pliku:<br />- CD1: 
<strong>(\d+?)</strong>'
+        archive_re = '<a href="/download/archiwum/(\d+?)/">'
+        row_str = str(row)
+        archive = re.findall(archive_re, row_str)
+        if len(archive) == 0:
+            if first_row == True:
+                sub_number = re.findall(sub_number_re, row_str)
+                subtitle = re.findall(title_re, row_str)
+                release = re.findall(release_re, row_str)
+                disc_amount = re.findall(disc_amount_re, row_str)
+                first_row = False
             else:
-                sync_value = False
-        ocena_dot = ocena.replace(",",".")
-        if ocena_dot == '0.00':
-            sub_rating = '0'
-        else:
-            sub_rating = int(round(float(ocena_dot) * 1.666,0))
+                file_size, SubHash = 
xbmc.subHashAndFileSize(file_original_path)
+                if disc_amount[0] > '1':
+                    video_file_size = re.findall(video_file_size_re_multi, 
row_str)
+                else:
+                    video_file_size = re.findall(video_file_size_re, row_str)
                 
-        if stack == True:
-            if ilosc_plyt == '1':
-                log( __name__ ,"Stacked file nonstacked subs")
-            else:
-                subtitles_list.append({'filename': tytul_pelny, 'sync': 
sync_value, 'link': link, 'language_flag': obraz_flagi, 'language_name': 
lang,'rating': '%s' % (sub_rating)})
-        else:
-            if  ilosc_plyt == '1':
-                subtitles_list.append({'filename': tytul_pelny, 'sync': 
sync_value, 'link': link, 'language_flag': obraz_flagi, 'language_name': 
lang,'rating':'%s' % (sub_rating)})
-            else:
-                log( __name__ ,"Nonstacked file stacked subs")
+                if len(video_file_size) == 0:
+                    video_file_size.append('0')
+                    sync_value = False
+                else:
+                    video_file_size = unicode(video_file_size[0], "UTF-8")
+                    video_file_size = video_file_size.replace(u"\u00A0", "")
+                    if file_size == video_file_size:
+                        sync_value = True
+                    else:
+                        sync_value = False
+
+                rating = re.findall(rating_re, row_str)
+                language = re.findall(lang_re, row_str)
+                
+                if len(language) > 0:
+                    first_row = True
+                    link = "%s%s/" % (down_url, sub_number[0])
+                    log( __name__ ,"Subtitles found: %s %s (link=%s)" % 
(subtitle[0], release, link))
+
+                    flag_pic = "flags/%s.gif" % (language[0])
+                    lang = languageTranslate(language[0],2,0)
+
+                    if lang == lang1 or lang == lang2 or lang == lang3:
+                        
+                        for rel in re.findall("\'(.*?)\'", str(release)):
+
+                            rel = rel.replace(",",":").replace(" ","")
+
+                            if len(rel) > 1:
+                                rel_semicolon = "%s;" % (rel)
+                                for rel_sync in re.findall('(.+?);', 
rel_semicolon):
+                                    if rel_sync.upper() in 
file_original_path.upper():
+                                        sync_value = True
+
+                        filename_release = "%s - %s" % (subtitle[0], 
rel_semicolon)
+
+                        rating_dot = rating[0].replace(",",".")
+                        if rating_dot == '0.00':
+                            sub_rating = '0'
+                        else:
+                            sub_rating = int(round(float(rating_dot) * 
1.666,0))
+
+                        if stack == False:
+                            if disc_amount[0] > '1':
+                                log( __name__ ,"Nonstacked video file - 
stacked subs")
+                            else:
+                                subtitles_list.append({'filename': 
filename_release, 'sync': sync_value, 'link': link, 'language_flag': flag_pic, 
'language_name': lang,'rating': '%s' % (sub_rating)})
+                        else:
+                            if disc_amount[0] > '1':
+                                subtitles_list.append({'filename': 
filename_release, 'sync': sync_value, 'link': link, 'language_flag': flag_pic, 
'language_name': lang,'rating': '%s' % (sub_rating)})
+                            else:
+                                log( __name__ ,"Stacked video file - 
nonstacked subs")
+                    else:
+                        continue
+                else:
+                    continue
 
 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:
-      for rok in re.finditer(' \(\d\d\d\d\)', tvshow):
-          rok = rok.group()
-          if len(rok) > 0:
-              tvshow = tvshow.replace(rok, "")
+      for year in re.finditer(' \(\d\d\d\d\)', tvshow):
+          year = year.group()
+          if len(year) > 0:
+              tvshow = tvshow.replace(year, "")
           else:
               continue
       tvshow_plus = tvshow.replace(" ","+")
@@ -102,26 +135,40 @@ def search_subtitles( file_original_path, title, tvshow, 
year, season, episode,
       url = '%s%s+%sx%s' % (main_url, tvshow_plus, season_full, episode_full)
     else:
       original_title = xbmc.getInfoLabel("VideoPlayer.OriginalTitle")
-      log( __name__ ,"Original title: [%s]" % (original_title))
-      movie_title_plus = original_title.replace(" ","+")
-      url = '%s%s' % (main_url, movie_title_plus)
-    log( __name__ , "Pobieram z [ %s ]" % (url))     
+      if len(original_title) == 0:
+        log( __name__ ,"Original title not set")
+        movie_title_plus = title.replace(" ","+")
+        url = '%s%s' % (main_url, movie_title_plus)
+      else:
+        log( __name__ ,"Original title: [%s]" % (original_title))
+        movie_title_plus = original_title.replace(" ","+")
+        url = '%s%s' % (main_url, movie_title_plus)
+    log( __name__ , "Fetching from [ %s ]" % (url))
     response = urllib2.urlopen(url)
     content = response.read()
-    getallsubs(content, title, subtitles_list, file_original_path, stack)
+    re_pages_string = 'postAction%3DszukajZaawansowane">(\d)</a>'
+    page_nr = re.findall(re_pages_string, content)
+    getallsubs(content, title, subtitles_list, file_original_path, stack, 
lang1, lang2, lang3)
+    for i in page_nr:
+        main_url_pages = 'http://napisy24.pl/szukaj/&stronaArch=1&strona='
+        rest_url = '%26postAction%3DszukajZaawansowane'
+        url_2 = '%s%s&szukajNapis=%s%s' % (main_url_pages, i, title, rest_url)
+        response = urllib2.urlopen(url_2)
+        content = response.read()    
+        getallsubs(content, title, subtitles_list, file_original_path, stack, 
lang1, lang2, lang3)
     return subtitles_list, "", "" #standard output
 
 def download_subtitles (subtitles_list, pos, zip_subs, tmp_sub_dir, 
sub_folder, session_id): #standard input
     import urllib
     f = urllib.urlopen(subtitles_list[pos][ "link" ])
     language = subtitles_list[pos][ "language_name" ]
-   
+
     local_tmp_file = os.path.join(tmp_sub_dir, "zipsubs.zip")
     log( __name__ ,"Saving subtitles to '%s'" % (local_tmp_file))
     
     local_file = open(zip_subs, "w" + "b")
     local_file.write(f.read())
     local_file.close()
-   
+
     return True,language, "" #standard output
 
diff --git a/script.xbmc.subtitles/resources/lib/services/Napisyme/service.py 
b/script.xbmc.subtitles/resources/lib/services/Napisyme/service.py
index 326bff1..0449bf4 100644
--- a/script.xbmc.subtitles/resources/lib/services/Napisyme/service.py
+++ b/script.xbmc.subtitles/resources/lib/services/Napisyme/service.py
@@ -76,9 +76,14 @@ def search_subtitles( file_original_path, title, tvshow, 
year, season, episode,
       url = '%s%s+%sx%s' % (main_url, tvshow_plus, season_full, episode_full)
     else:
       original_title = xbmc.getInfoLabel("VideoPlayer.OriginalTitle")
-      log( __name__ ,"Original title: [%s]" % (original_title))
-      movie_title_plus = original_title.replace(" ","+")
-      url = '%s%s' % (main_url, movie_title_plus)
+      if len(original_title) == 0:
+        log( __name__ ,"Original title not set")
+        movie_title_plus = title.replace(" ","+")
+        url = '%s%s' % (main_url, movie_title_plus)
+      else:
+        log( __name__ ,"Original title: [%s]" % (original_title))
+        movie_title_plus = original_title.replace(" ","+")
+        url = '%s%s' % (main_url, movie_title_plus)
     log( __name__ , "Pobieram z [ %s ]" % (url))     
     response = urllib2.urlopen(url)
     content = response.read()
diff --git a/script.xbmc.subtitles/resources/lib/services/Subdivx/service.py 
b/script.xbmc.subtitles/resources/lib/services/Subdivx/service.py
index 5a8d459..2caa84e 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=&oxfecha=2&pg=" + 
str(page) + "&buscar=" + urllib.quote_plus(searchstring)
+        url = main_url + "index.php?accion=5&masdesc=&oxdown=1&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=&oxfecha=2&pg=" + 
str(page) + "&buscar=" + urllib.quote_plus(searchstring)
+        url = main_url + "index.php?accion=5&masdesc=&oxdown=1&pg=" + 
str(page) + "&buscar=" + urllib.quote_plus(searchstring)
         content = geturl(url)
 
     # Bubble sort, to put syncs on top

http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=09dd4e003e151a63923b2d0711177565f1601560

commit 09dd4e003e151a63923b2d0711177565f1601560
Author: amet <[email protected]>
Date:   Thu Jan 19 00:26:49 2012 +0400

    [script.web.viewer] -v 0.8.1
    
    - Fixed bug causing page load to fail when launched as a skin shortcut

diff --git a/script.web.viewer/addon.xml b/script.web.viewer/addon.xml
index 158e69a..39fdb7c 100644
--- a/script.web.viewer/addon.xml
+++ b/script.web.viewer/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.web.viewer"
        name="Web Viewer"
-       version="0.8.0"
+       version="0.8.1"
        provider-name="Rick Phillips (ruuk)">
   <requires>
     <import addon="xbmc.python" version="2.0"/>
diff --git a/script.web.viewer/changelog.txt b/script.web.viewer/changelog.txt
index d712950..37f43a7 100644
--- a/script.web.viewer/changelog.txt
+++ b/script.web.viewer/changelog.txt
@@ -1,6 +1,10 @@
 Web Viewer Changelog
 
-Current Version : 0.8.0
+Current Version : 0.8.1
+
+*** 0.8.1 ***
+
+Fixed bug causing page load to fail when launched as a skin shortcut
 
 *** 0.8.0 ***
 
diff --git a/script.web.viewer/lib/webviewer/webviewer.py 
b/script.web.viewer/lib/webviewer/webviewer.py
index 3d2c4b6..901a954 100644
--- a/script.web.viewer/lib/webviewer/webviewer.py
+++ b/script.web.viewer/lib/webviewer/webviewer.py
@@ -9,7 +9,7 @@ __plugin__ = 'Web Viewer'
 __author__ = 'ruuk (Rick Phillips)'
 __url__ = 'http://code.google.com/p/webviewer-xbmc/'
 __date__ = '12-27-2011'
-__version__ = '0.8.0'
+__version__ = '0.8.1'
 __addon__ = xbmcaddon.Addon(id='script.web.viewer')
 __language__ = __addon__.getLocalizedString
 
@@ -2139,10 +2139,11 @@ if __name__ == '__main__':
        #start_url = 'http://forum.xbmc.org'
        #start_url='http://www.cs.tut.fi/~jkorpela/forms/file.html'
        start_url = ''
-       try: start_url = sys.argv[0]
+       try: start_url = sys.argv[1]
        except: pass
        
        if not start_url: start_url = getHome() or 
'http://wiki.xbmc.org/index.php?title=XBMC_Online_Manual'
+       print start_url
        apath = xbmc.translatePath(__addon__.getAddonInfo('path'))
        if not 
os.path.exists(os.path.join(apath,'resources','skins','Default','720p','script-webviewer-page.xml')):
                apath = 'Q:\\scripts\\.modules\\script.web.viewer\\' #for 
XBMC4Xbox when used as a module

http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=4c151603e055303a87eced792e112fa4b46284d8

commit 4c151603e055303a87eced792e112fa4b46284d8
Author: amet <[email protected]>
Date:   Thu Jan 19 00:24:47 2012 +0400

    [weather.worldweatheronline] -v1.0.6
    
    - fix: some cities would error on fetch, it all works if I would RTFM

diff --git a/weather.worldweatheronline/addon.xml 
b/weather.worldweatheronline/addon.xml
index 266a8e8..4f39261 100644
--- a/weather.worldweatheronline/addon.xml
+++ b/weather.worldweatheronline/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="weather.worldweatheronline"
        name="World Weather Online"
-       version="1.0.5"
+       version="1.0.6"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.python" version="2.0"/>
diff --git a/weather.worldweatheronline/changelog.txt 
b/weather.worldweatheronline/changelog.txt
index 0deaa3b..1b1e415 100644
--- a/weather.worldweatheronline/changelog.txt
+++ b/weather.worldweatheronline/changelog.txt
@@ -1,3 +1,6 @@
+1.0.6
+- fix: some cities would error on fetch, it all works if I would RTFM
+
 1.0.5
 - fix: display region/state if it exists
 
diff --git a/weather.worldweatheronline/default.py 
b/weather.worldweatheronline/default.py
index c43b09c..ac0329b 100644
--- a/weather.worldweatheronline/default.py
+++ b/weather.worldweatheronline/default.py
@@ -38,7 +38,7 @@ from utilities import *
 
 DEVELOPER_KEY  = "75b745967f114856110511"
 NUMBER_OF_DAYS = 4
-SEARCH_URL     = 
"http://www.worldweatheronline.com/feed/search.ashx?key=%s&query=%s&format=xml";
+SEARCH_URL     = 
"http://free.worldweatheronline.com/feed/search.ashx?key=%s&query=%s&format=xml";
 LOCATION_URL   = 
"http://free.worldweatheronline.com/feed/weather.ashx?q=%s&format=xml&num_of_days=%i&key=%s";
 
 WEATHER_WINDOW = xbmcgui.Window( 12600 )

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

Summary of changes:
 script.web.viewer/addon.xml                        |    2 +-
 script.web.viewer/changelog.txt                    |    6 +-
 script.web.viewer/lib/webviewer/webviewer.py       |    5 +-
 script.xbmc.subtitles/addon.xml                    |    4 +-
 script.xbmc.subtitles/changelog.txt                |    5 +
 .../resources/language/Bulgarian/strings.xml       |  186 +++++++++++---------
 .../resources/lib/services/Napisy24pl/service.py   |  179 ++++++++++++-------
 .../resources/lib/services/Napisyme/service.py     |   11 +-
 .../resources/lib/services/Subdivx/service.py      |    4 +-
 weather.worldweatheronline/addon.xml               |    2 +-
 weather.worldweatheronline/changelog.txt           |    3 +
 weather.worldweatheronline/default.py              |    2 +-
 12 files changed, 249 insertions(+), 160 deletions(-)


hooks/post-receive
-- 
Scripts


------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to