Fix for URL redirection

taxigps · Jan 22, 2017 · 920a669 · 920a669
1 parent 99304a3
commit 920a669
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/service.subtitles.zimuzu/addon.xml b/service.subtitles.zimuzu/addon.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="service.subtitles.zimuzu"
        name="ZiMuZu"
-       version="1.0.1"
+       version="1.0.2"
        provider-name="xodidox">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
+    <import addon="script.module.requests" version="1.1.0"/>
     <import addon="script.module.beautifulsoup4" version="4.3.2"/>
   </requires>
   <extension point="xbmc.subtitle.module"

diff --git a/service.subtitles.zimuzu/changelog.txt b/service.subtitles.zimuzu/changelog.txt
@@ -1,4 +1,7 @@
-1.0.1
+1.0.2
+- Fix for URL redirection
+
+1.0.1
 - Minor tweak
 
 1.0.0

diff --git a/service.subtitles.zimuzu/service.py b/service.subtitles.zimuzu/service.py
@@ -7,6 +7,7 @@
 import urllib
 import urllib2
 import xbmcvfs
+import requests
 import xbmcaddon
 import xbmcgui,xbmcplugin
 from bs4 import BeautifulSoup
@@ -25,8 +26,12 @@
 
 sys.path.append (__resource__)
 
-ZIMUZU_API = 'http://www.zimuzu.tv/search?keyword=%s&type=subtitle'
-ZIMUZU_BASE = 'http://www.zimuzu.tv'
+try:
+    ZIMUZU_BASE = requests.get('http://www.zimuzu.tv', allow_redirects=False).headers['Location'].rstrip('/')
+except:
+    ZIMUZU_BASE = 'http://www.zimuzu.tv'
+
+ZIMUZU_API = ZIMUZU_BASE + '/search?keyword=%s&type=subtitle'
 UserAgent  = 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)'
 
 def log(module, msg):
@@ -102,7 +107,7 @@ def rmtree(path):
         rmtree(os.path.join(path, dir))
     for file in files:
         xbmcvfs.delete(os.path.join(path, file))
-    xbmcvfs.rmdir(path) 
+    xbmcvfs.rmdir(path)
 
 def Download(url):
     try: rmtree(__temp__)