diff --git a/addons.xml b/addons.xml index 46b97f6c..4fbc4d30 100644 --- a/addons.xml +++ b/addons.xml @@ -820,7 +820,7 @@ For Non-PRC OS environment (Windows7|WindowsXP):[CR]"Control Panel"|"Region and diff --git a/addons.xml.md5 b/addons.xml.md5 index 5b1d226a..23ed8470 100644 --- a/addons.xml.md5 +++ b/addons.xml.md5 @@ -1 +1 @@ -f7f88029deb5145b28fa165723e0b979 \ No newline at end of file +37026c9bc3fd0e948f391677209e0471 \ No newline at end of file diff --git a/repo/service.subtitles.zimuku/changelog-1.0.4.txt b/repo/service.subtitles.zimuku/changelog-1.0.4.txt new file mode 100644 index 00000000..8c9bd4d2 --- /dev/null +++ b/repo/service.subtitles.zimuku/changelog-1.0.4.txt @@ -0,0 +1,14 @@ +1.0.4 +- add User-Agent in http request to get subtitles + +1.0.3 +- fixed can't get subtitles because site changed + +1.0.2 +- fixed can't remove temp dir under android + +1.0.1 +- support search subtitles for tv shows in library + +1.0.0 +- initial \ No newline at end of file diff --git a/repo/service.subtitles.zimuku/service.subtitles.zimuku-1.0.4.zip b/repo/service.subtitles.zimuku/service.subtitles.zimuku-1.0.4.zip new file mode 100644 index 00000000..e062c040 Binary files /dev/null and b/repo/service.subtitles.zimuku/service.subtitles.zimuku-1.0.4.zip differ diff --git a/service.subtitles.zimuku/addon.xml b/service.subtitles.zimuku/addon.xml index 6ea7560a..34d5ecd9 100644 --- a/service.subtitles.zimuku/addon.xml +++ b/service.subtitles.zimuku/addon.xml @@ -1,7 +1,7 @@  diff --git a/service.subtitles.zimuku/changelog.txt b/service.subtitles.zimuku/changelog.txt index b6f502e8..8c9bd4d2 100644 --- a/service.subtitles.zimuku/changelog.txt +++ b/service.subtitles.zimuku/changelog.txt @@ -1,4 +1,7 @@ -1.0.3 +1.0.4 +- add User-Agent in http request to get subtitles + +1.0.3 - fixed can't get subtitles because site changed 1.0.2 diff --git a/service.subtitles.zimuku/service.py b/service.subtitles.zimuku/service.py index 0389cc9e..0e328239 100644 --- a/service.subtitles.zimuku/service.py +++ b/service.subtitles.zimuku/service.py @@ -5,6 +5,7 @@ import sys import xbmc import urllib +import urllib2 import xbmcvfs import xbmcaddon import xbmcgui,xbmcplugin @@ -26,6 +27,7 @@ ZIMUKU_API = 'http://www.zimuku.net/search?q=%s' ZIMUKU_BASE = 'http://www.zimuku.net' +UserAgent = 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)' def log(module, msg): xbmc.log((u"%s::%s - %s" % (__scriptname__,module,msg,)).encode('utf-8'),level=xbmc.LOGDEBUG ) @@ -44,7 +46,9 @@ def Search( item ): else: url = ZIMUKU_API % (item['title']) try: - socket = urllib.urlopen(url) + req = urllib2.Request(url) + req.add_header('User-Agent', UserAgent) + socket = urllib2.urlopen(req) data = socket.read() socket.close() soup = BeautifulSoup(data) @@ -55,7 +59,9 @@ def Search( item ): moviename = it.find("div", class_="title").a.text.encode('utf-8') movieurl = '%s%s' % (ZIMUKU_BASE, it.find("div", class_="title").a.get('href').encode('utf-8')) try: - socket = urllib.urlopen(movieurl) + req = urllib2.Request(movieurl) + req.add_header('User-Agent', UserAgent) + socket = urllib2.urlopen(req) data = socket.read() socket.close() soup = BeautifulSoup(data).find("div", class_="subs box clearfix") @@ -113,11 +119,16 @@ def Download(url,lang): subtitle_list = [] exts = [".srt", ".sub", ".smi", ".ssa", ".ass" ] try: - socket = urllib.urlopen( url ) + req = urllib2.Request(url) + req.add_header('User-Agent', UserAgent) + socket = urllib2.urlopen(req) data = socket.read() + socket.close() soup = BeautifulSoup(data) url = '%s%s' % (ZIMUKU_BASE, soup.find("li", class_="dlsub").a.get('href').encode('utf-8')) - socket = urllib.urlopen( url ) + req = urllib2.Request(url) + req.add_header('User-Agent', UserAgent) + socket = urllib2.urlopen(req) filename = socket.headers['Content-Disposition'].split('filename=')[1] if filename[0] == '"' or filename[0] == "'": filename = filename[1:-1]