Changeset 42563 for titan

Timestamp:

07/28/18 00:01:46 (6 years ago)

Author:

obi

Message:

fix vidcloud

Location:

titan/mediathek/localhoster

Files:

• lib/common.py (modified) (1 diff)
• vidcloud.py (modified) (4 diffs)

titan/mediathek/localhoster/lib/common.py

@@ -42 +42 @@
 IOS_USER_AGENT = 'Mozilla/5.0 (iPhone; CPU iPhone OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5376e Safari/8536.25'
 ANDROID_USER_AGENT = 'Mozilla/5.0 (Linux; Android 4.4.2; Nexus 4 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.114 Mobile Safari/537.36'
+EDGE_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; ServiceUI 13) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.140 Safari/537.36 Edge/17.17134'
+CHROME_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.181 Safari/537.36'
 SMU_USER_AGENT = 'URLResolver for Kodi/%s' % (addon_version)

titan/mediathek/localhoster/vidcloud.py

@@ -16 +16 @@
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
-import re, urllib, json
+import lib.common as common
+import re
+import sys
+from lib.net import Net
 from lib import helpers
-import lib.common as common
 
 class VidCloudResolver(object):
@@ -24 +26 @@
     domains = ['vidcloud.co', 'loadvid.online']
     pattern = '(?://|\.)((?:vidcloud.co|loadvid.online))/(?:embed|v)/([0-9a-zA-Z]+)'
-
-    def __init__(self):
-        self.net = common.Net()
 
     def __init__(self):
@@ -52 +51 @@
                 '''src":\s*"(?P<url>[^"]+)(?:[^}>\]]+)label":\s*"(?P<label>[^"]+)'''], generic_patterns=False)
             if sources:
-                return helpers.pick_source(sources) + helpers.append_headers(headers)
+                print helpers.pick_source(sources) + helpers.append_headers(headers)
 
         raise ResolverError("Unable to locate video")
@@ -59 +58 @@
         return 'https://vidcloud.co/player?fid=%s&page=embed' % media_id
 
-sys.stdout = VideoweedResolver()
+sys.stdout = VidCloudResolver()