Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -crB script.xbmc.subtitles/resources/language/English/strings.xml script.xbmc.subtitles-gaco/resources/language/English/strings.xml
- *** script.xbmc.subtitles/resources/language/English/strings.xml 2012-09-04 05:41:01.991031862 +0200
- --- script.xbmc.subtitles-gaco/resources/language/English/strings.xml 2012-09-04 04:29:32.000000000 +0200
- ***************
- *** 74,80 ****
- <string id="30143">MicroDVD</string>
- <string id="30144">MPl2</string>
- <string id="30145">Use 'Subs' subfolder for storing subtitles</string>
- !
- <!-- Languages -->
- <string id="30201">Albanian</string>
- --- 74,81 ----
- <string id="30143">MicroDVD</string>
- <string id="30144">MPl2</string>
- <string id="30145">Use 'Subs' subfolder for storing subtitles</string>
- ! <string id="30146">- napisy24.pl Username</string>
- ! <string id="30147">- napisy24.pl Password</string>
- <!-- Languages -->
- <string id="30201">Albanian</string>
- diff -crB script.xbmc.subtitles/resources/language/Polish/strings.xml script.xbmc.subtitles-gaco/resources/language/Polish/strings.xml
- *** script.xbmc.subtitles/resources/language/Polish/strings.xml 2012-09-04 05:41:01.995031862 +0200
- --- script.xbmc.subtitles-gaco/resources/language/Polish/strings.xml 2012-09-04 04:29:32.000000000 +0200
- ***************
- *** 66,72 ****
- <string id="30138">- LegendasZone nazwa użytkownika</string>
- <string id="30139">- LegendasZone hasło</string>
- <string id="30140">- Wybierz rodzaj napisów:</string>
- !
- <!-- Languages -->
- <string id="30201">albański</string>
- --- 66,73 ----
- <string id="30138">- LegendasZone nazwa użytkownika</string>
- <string id="30139">- LegendasZone hasło</string>
- <string id="30140">- Wybierz rodzaj napisów:</string>
- ! <string id="30146">- napisy24.pl Nazwa</string>
- ! <string id="30147">- napisy24.pl Hasło</string>
- <!-- Languages -->
- <string id="30201">albański</string>
- Tylko w script.xbmc.subtitles-gaco/resources/lib: gui.pyc
- Tylko w script.xbmc.subtitles-gaco/resources/lib/services: __init__.pyc
- Tylko w script.xbmc.subtitles-gaco/resources/lib/services/Napiprojekt: __init__.pyc
- Tylko w script.xbmc.subtitles-gaco/resources/lib/services/Napiprojekt: service.pyc
- Tylko w script.xbmc.subtitles-gaco/resources/lib/services/Napisy24pl: __init__.pyc
- diff -crB script.xbmc.subtitles/resources/lib/services/Napisy24pl/service.py script.xbmc.subtitles-gaco/resources/lib/services/Napisy24pl/service.py
- *** script.xbmc.subtitles/resources/lib/services/Napisy24pl/service.py 2012-09-04 05:41:02.019031862 +0200
- --- script.xbmc.subtitles-gaco/resources/lib/services/Napisy24pl/service.py 2012-09-04 05:36:55.000000000 +0200
- ***************
- *** 8,13 ****
- --- 8,15 ----
- import urllib2, re, string, xbmc, sys, os
- from utilities import log, languageTranslate
- from BeautifulSoup import BeautifulSoup
- + from cookielib import CookieJar
- + from urllib import urlencode
- _ = sys.modules[ "__main__" ].__language__
- __addon__ = sys.modules[ "__main__" ].__addon__
- ***************
- *** 20,28 ****
- subtitle_type = "mdvd"
- elif __addon__.getSetting( "Napisy24_type" ) == "3":
- subtitle_type = "mpl2"
- !
- main_url = "http://napisy24.pl/search.php?str="
- ! base_download_url = "http://napisy.me/download/"
- down_url = "%s%s/" % (base_download_url, subtitle_type)
- def getallsubs(content, title, subtitles_list, file_original_path, stack, lang1, lang2, lang3):
- --- 22,30 ----
- subtitle_type = "mdvd"
- elif __addon__.getSetting( "Napisy24_type" ) == "3":
- subtitle_type = "mpl2"
- !
- main_url = "http://napisy24.pl/search.php?str="
- ! base_download_url = "http://napisy24.pl/download/"
- down_url = "%s%s/" % (base_download_url, subtitle_type)
- def getallsubs(content, title, subtitles_list, file_original_path, stack, lang1, lang2, lang3):
- ***************
- *** 159,174 ****
- 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
- --- 161,181 ----
- return subtitles_list, "", "" #standard output
- def download_subtitles (subtitles_list, pos, zip_subs, tmp_sub_dir, sub_folder, session_id): #standard input
- ! cj = CookieJar()
- ! opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))
- ! opener.addheaders = [("Referer", "http://napisy24.pl"), ('User-agent', 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/536.6 (KHTML, like Gecko) Chrome/20.0.1092.0 Safari/536.6')]
- ! data = urlencode([('form_logowanieMail', __addon__.getSetting( "n24user" )), ('form_logowanieHaslo', __addon__.getSetting( "n24pass" )), ('postAction', 'sendLogowanie')])
- ! response = opener.open("http://napisy24.pl/logowanie/", data)
- ! f = opener.open(subtitles_list[pos][ "link" ])
- !
- 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()
- ! opener.open("http://napisy24.pl/index.php?sendAction=Wyloguj")
- !
- ! language = subtitles_list[pos][ "language_name" ]
- ! return True, language, "" #standard output
- Tylko w script.xbmc.subtitles-gaco/resources/lib/services/Napisy24pl: service.pyc
- Tylko w script.xbmc.subtitles-gaco/resources/lib: utilities.pyc
- diff -crB script.xbmc.subtitles/resources/settings.xml script.xbmc.subtitles-gaco/resources/settings.xml
- *** script.xbmc.subtitles/resources/settings.xml 2012-09-04 05:41:02.067031859 +0200
- --- script.xbmc.subtitles-gaco/resources/settings.xml 2012-09-04 04:29:32.000000000 +0200
- ***************
- *** 29,34 ****
- --- 29,36 ----
- <setting id="Napiprojekt" type="bool" label="Napiprojekt.pl (Polish/English subs only)" default="false"/>
- <setting id="Napisy24pl" type="bool" label="Napisy24.pl (Mostly Polish/English subs)" default="false"/>
- <setting id="Napisy24_type" type="enum" lvalues="30141|30142|30143|30144" visible= "eq(-1,true)" enable="eq(-1,true)" default="2" label="30140"/>
- + <setting id="n24user" type="text" visible= "eq(-2,true)" enable="eq(-2,true)" label="30146" default=""/>
- + <setting id="n24pass" type="text" option = "hidden" visible= "eq(-3,true)" enable="eq(-3,true)" label="30147" default=""/>
- <setting id="Napisyme" type="bool" label="Napisy.me (Mostly Polish/English subs from napisy24.pl database)" default="false"/>
- <setting id="Napisyme_type" type="enum" lvalues="30141|30142|30143|30144" visible= "eq(-1,true)" enable="eq(-1,true)" default="2" label="30140"/>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement