Advertisement
Guest User

Untitled

a guest
Sep 3rd, 2012
229
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 7.08 KB | None | 0 0
  1. diff -crB script.xbmc.subtitles/resources/language/English/strings.xml script.xbmc.subtitles-gaco/resources/language/English/strings.xml
  2. *** script.xbmc.subtitles/resources/language/English/strings.xml 2012-09-04 05:41:01.991031862 +0200
  3. --- script.xbmc.subtitles-gaco/resources/language/English/strings.xml 2012-09-04 04:29:32.000000000 +0200
  4. ***************
  5. *** 74,80 ****
  6. <string id="30143">MicroDVD</string>
  7. <string id="30144">MPl2</string>
  8. <string id="30145">Use 'Subs' subfolder for storing subtitles</string>
  9. !
  10. <!-- Languages -->
  11.  
  12. <string id="30201">Albanian</string>
  13. --- 74,81 ----
  14. <string id="30143">MicroDVD</string>
  15. <string id="30144">MPl2</string>
  16. <string id="30145">Use 'Subs' subfolder for storing subtitles</string>
  17. ! <string id="30146">- napisy24.pl Username</string>
  18. ! <string id="30147">- napisy24.pl Password</string>
  19. <!-- Languages -->
  20.  
  21. <string id="30201">Albanian</string>
  22. diff -crB script.xbmc.subtitles/resources/language/Polish/strings.xml script.xbmc.subtitles-gaco/resources/language/Polish/strings.xml
  23. *** script.xbmc.subtitles/resources/language/Polish/strings.xml 2012-09-04 05:41:01.995031862 +0200
  24. --- script.xbmc.subtitles-gaco/resources/language/Polish/strings.xml 2012-09-04 04:29:32.000000000 +0200
  25. ***************
  26. *** 66,72 ****
  27. <string id="30138">- LegendasZone nazwa użytkownika</string>
  28. <string id="30139">- LegendasZone hasło</string>
  29. <string id="30140">- Wybierz rodzaj napisów:</string>
  30. !
  31. <!-- Languages -->
  32.  
  33. <string id="30201">albański</string>
  34. --- 66,73 ----
  35. <string id="30138">- LegendasZone nazwa użytkownika</string>
  36. <string id="30139">- LegendasZone hasło</string>
  37. <string id="30140">- Wybierz rodzaj napisów:</string>
  38. ! <string id="30146">- napisy24.pl Nazwa</string>
  39. ! <string id="30147">- napisy24.pl Hasło</string>
  40. <!-- Languages -->
  41.  
  42. <string id="30201">albański</string>
  43. Tylko w script.xbmc.subtitles-gaco/resources/lib: gui.pyc
  44. Tylko w script.xbmc.subtitles-gaco/resources/lib/services: __init__.pyc
  45. Tylko w script.xbmc.subtitles-gaco/resources/lib/services/Napiprojekt: __init__.pyc
  46. Tylko w script.xbmc.subtitles-gaco/resources/lib/services/Napiprojekt: service.pyc
  47. Tylko w script.xbmc.subtitles-gaco/resources/lib/services/Napisy24pl: __init__.pyc
  48. diff -crB script.xbmc.subtitles/resources/lib/services/Napisy24pl/service.py script.xbmc.subtitles-gaco/resources/lib/services/Napisy24pl/service.py
  49. *** script.xbmc.subtitles/resources/lib/services/Napisy24pl/service.py 2012-09-04 05:41:02.019031862 +0200
  50. --- script.xbmc.subtitles-gaco/resources/lib/services/Napisy24pl/service.py 2012-09-04 05:36:55.000000000 +0200
  51. ***************
  52. *** 8,13 ****
  53. --- 8,15 ----
  54. import urllib2, re, string, xbmc, sys, os
  55. from utilities import log, languageTranslate
  56. from BeautifulSoup import BeautifulSoup
  57. + from cookielib import CookieJar
  58. + from urllib import urlencode
  59.  
  60. _ = sys.modules[ "__main__" ].__language__
  61. __addon__ = sys.modules[ "__main__" ].__addon__
  62. ***************
  63. *** 20,28 ****
  64. subtitle_type = "mdvd"
  65. elif __addon__.getSetting( "Napisy24_type" ) == "3":
  66. subtitle_type = "mpl2"
  67. !
  68. main_url = "http://napisy24.pl/search.php?str="
  69. ! base_download_url = "http://napisy.me/download/"
  70. down_url = "%s%s/" % (base_download_url, subtitle_type)
  71.  
  72. def getallsubs(content, title, subtitles_list, file_original_path, stack, lang1, lang2, lang3):
  73. --- 22,30 ----
  74. subtitle_type = "mdvd"
  75. elif __addon__.getSetting( "Napisy24_type" ) == "3":
  76. subtitle_type = "mpl2"
  77. !
  78. main_url = "http://napisy24.pl/search.php?str="
  79. ! base_download_url = "http://napisy24.pl/download/"
  80. down_url = "%s%s/" % (base_download_url, subtitle_type)
  81.  
  82. def getallsubs(content, title, subtitles_list, file_original_path, stack, lang1, lang2, lang3):
  83. ***************
  84. *** 159,174 ****
  85. return subtitles_list, "", "" #standard output
  86.  
  87. def download_subtitles (subtitles_list, pos, zip_subs, tmp_sub_dir, sub_folder, session_id): #standard input
  88. ! import urllib
  89. ! f = urllib.urlopen(subtitles_list[pos][ "link" ])
  90. ! language = subtitles_list[pos][ "language_name" ]
  91. !
  92. local_tmp_file = os.path.join(tmp_sub_dir, "zipsubs.zip")
  93. log( __name__ ,"Saving subtitles to '%s'" % (local_tmp_file))
  94.  
  95. local_file = open(zip_subs, "w" + "b")
  96. local_file.write(f.read())
  97. local_file.close()
  98. !
  99. ! return True,language, "" #standard output
  100.  
  101. --- 161,181 ----
  102. return subtitles_list, "", "" #standard output
  103.  
  104. def download_subtitles (subtitles_list, pos, zip_subs, tmp_sub_dir, sub_folder, session_id): #standard input
  105. ! cj = CookieJar()
  106. ! opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))
  107. ! 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')]
  108. ! data = urlencode([('form_logowanieMail', __addon__.getSetting( "n24user" )), ('form_logowanieHaslo', __addon__.getSetting( "n24pass" )), ('postAction', 'sendLogowanie')])
  109. ! response = opener.open("http://napisy24.pl/logowanie/", data)
  110. ! f = opener.open(subtitles_list[pos][ "link" ])
  111. !
  112. local_tmp_file = os.path.join(tmp_sub_dir, "zipsubs.zip")
  113. log( __name__ ,"Saving subtitles to '%s'" % (local_tmp_file))
  114.  
  115. local_file = open(zip_subs, "w" + "b")
  116. local_file.write(f.read())
  117. local_file.close()
  118. ! opener.open("http://napisy24.pl/index.php?sendAction=Wyloguj")
  119. !
  120. ! language = subtitles_list[pos][ "language_name" ]
  121. ! return True, language, "" #standard output
  122.  
  123. Tylko w script.xbmc.subtitles-gaco/resources/lib/services/Napisy24pl: service.pyc
  124. Tylko w script.xbmc.subtitles-gaco/resources/lib: utilities.pyc
  125. diff -crB script.xbmc.subtitles/resources/settings.xml script.xbmc.subtitles-gaco/resources/settings.xml
  126. *** script.xbmc.subtitles/resources/settings.xml 2012-09-04 05:41:02.067031859 +0200
  127. --- script.xbmc.subtitles-gaco/resources/settings.xml 2012-09-04 04:29:32.000000000 +0200
  128. ***************
  129. *** 29,34 ****
  130. --- 29,36 ----
  131. <setting id="Napiprojekt" type="bool" label="Napiprojekt.pl (Polish/English subs only)" default="false"/>
  132. <setting id="Napisy24pl" type="bool" label="Napisy24.pl (Mostly Polish/English subs)" default="false"/>
  133. <setting id="Napisy24_type" type="enum" lvalues="30141|30142|30143|30144" visible= "eq(-1,true)" enable="eq(-1,true)" default="2" label="30140"/>
  134. + <setting id="n24user" type="text" visible= "eq(-2,true)" enable="eq(-2,true)" label="30146" default=""/>
  135. + <setting id="n24pass" type="text" option = "hidden" visible= "eq(-3,true)" enable="eq(-3,true)" label="30147" default=""/>
  136. <setting id="Napisyme" type="bool" label="Napisy.me (Mostly Polish/English subs from napisy24.pl database)" default="false"/>
  137. <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