darba versija

Downloader.py

@@ -88,24 +88,35 @@ class DownloadWithProgressFragmented:
 
     def start_download(self):
         print "Start download"
-        try:
-            r = requests.get(self.url,headers=self.headers)
-        except Exception as e:
-            #self.deferred.errback("Cannot open manifsest file - %s"%url)
-            self.deferred.errback(e)
-        if not r.content.startswith("#EXTM3U"):
-            self.deferred.errback(Exception("Not valid manifest file - %s"%self.url))
-        streams = re.findall(r"#EXT-X-STREAM-INF:.*?BANDWIDTH=(\d+).*?\n(.+?)$", r.content, re.IGNORECASE | re.MULTILINE)
-        if streams:
-            streams = sorted(streams, key=lambda item: int(item[0]), reverse=True)
-            url = streams[0][1]
-            if not url.startswith("http"):
-                url = self.base_url + url
+        url = self.url
+        while True:
+            base_url = url.split("?")[0]
+            base_url = "/".join(base_url.split("/")[:-1])+"/"
             try:
-                r = requests.get(url, headers=self.headers)
+                r = requests.get(url,headers=self.headers)
             except Exception as e:
-                self.deferred.errback(Exception("Cannot open manifsest file - %s"%url))
-        self.base_url = "/".join(url.split("/")[:-1])+"/"
+                #self.deferred.errback("Cannot open manifsest file - %s"%url)
+                self.deferred.errback(e)
+            if not r.content.startswith("#EXTM3U"):
+                self.deferred.errback(Exception("Not valid manifest file - %s"%self.url))
+            streams = re.findall(r"#EXT-X-STREAM-INF:.*?BANDWIDTH=(\d+).*?\n(.+?)$", r.content, re.IGNORECASE | re.MULTILINE)
+            if streams:
+                streams = sorted(streams, key=lambda item: int(item[0]), reverse=True)
+                url = streams[0][1]
+                if not url.startswith("http"):
+                    url = base_url + url
+                try:
+                    r = requests.get(url, headers=self.headers)
+                except Exception as e:
+                    self.deferred.errback(Exception("Cannot open manifsest file - %s"%url))
+                if "#EXT-X-STREAM-INF" in r.content:
+                    continue
+                else:
+                    break
+            else:
+                self.deferred.errback(Exception("No streams found for - %s"%url))
+
+        self.base_url = base_url
         self.ts_list = re.findall(r"#EXTINF:([\d\.]+),.*?\n(.+?)$", r.content, re.IGNORECASE | re.MULTILINE)
         if not len(self.ts_list):
             self.deferred.errback(Exception("Cannot read fragment list in  manifsest file - %s"%url))
@@ -241,7 +252,7 @@ def stop():
 
 ###############################################
 
-def download_video(url,output,headers=None):
+def download_video_file(url,output,headers=None):
     #output = stream["name"].replace("\\"," ").replace(":"," ").replace("|"," ")
     if not headers:
         headers = {"user-agent":"Enigma2"}
@@ -267,6 +278,7 @@ if __name__ == "__main__":
         output = sys.argv[2]
     else:
         url = url2 = "http://walterebert.com/_/playground/videos/sintel-trailer.m3u8"
+        url = "http://str5e.lattelecom.tv/mobile-vod/mp4:sv_ka_sapni_lv_hq.mp4/playlist.m3u8?resource_id=like_a_dream&auth_token=ISVlUKAuwHJEFFKlHQ9e/GVIoKExOwcu0ymn2AEyeOhn2BAwzmy+csGxUe9MeKooEdjS+xJfmP6XPCuqlZIpe4k/UfGAwn0BQ/chunklist_w1465619955.m3u8?resource_id=like_a_dream&auth_token=ISVlUKAuwHJEFFKlHQ9e%2FGVIoKExOwcu0ymn2AEyeOhn2BAwzmy+csGxUe9MeKooEdjS+xJfmP6XPCuqlZIpe4k%2FUfGAwn0BQ%2FuGk9oBsD4%3D"
         output = "tmp\\test"
         #url = "https://r3---sn-bavc5ajvh-gpme.googlevideo.com/videoplayback?key=yt6&mime=video%2Fmp4&sparams=clen%2Cdur%2Cei%2Cgir%2Cid%2Cinitcwndbps%2Cip%2Cipbits%2Citag%2Clmt%2Cmime%2Cmm%2Cmn%2Cms%2Cmv%2Cpl%2Cratebypass%2Crequiressl%2Csource%2Cupn%2Cexpire&expire=1490986184&lmt=1490940183963773&dur=1302.639&itag=18&ratebypass=yes&mm=31&requiressl=yes&ipbits=0&upn=azFGj8gY02w&ip=85.254.87.15&pl=23&ei=aFDeWLzqDcn-dLC_gdAM&signature=083F353AC09CD98A70AD7D9438DD3C91C781166B.715456B9C35F040BDC4728CA76A0D1779B684A90&source=youtube&mv=m&mt=1490964451&ms=au&mn=sn-bavc5ajvh-gpme&gir=yes&clen=73596250&id=o-AGH9y-hWn1MtW1VzCyI_8XYYEWODsTDBZbfagQH3BrfQ&initcwndbps=4493750"
         #url = "http://techslides.com/demos/sample-videos/small.mp4"
@@ -275,7 +287,7 @@ if __name__ == "__main__":
         #url = "http://vod-hls-uk-live.akamaized.net/usp/auth/vod/piff_abr_full_hd/a3e90e-b08ktytr/vf_b08ktytr_f9d55583-afc7-49bb-9bf4-d8f1ac99f56f.ism.hlsv2.ism/vf_b08ktytr_f9d55583-afc7-49bb-9bf4-d8f1ac99f56f.ism.hlsv2-audio=128000-video=5070000.m3u8"
         #url = "https://58174450afee9.streamlock.net/vod/mp4:_definst_/f/e/8e49fc32.mp4/playlist.m3u8?safwerwfasendtime=1490877870&safwerwfasstarttime=1490859339&safwerwfashash=hS2FfVZysQVazBQ6RJn1IhUevBkKxIF09Ly3BjfT43U="
     active = 2
-    d1 = download_video(url,output)
+    d1 = download_video_file(url,output)
     reactor.run()
 
 

file.py

@@ -87,6 +87,8 @@ def open(url, mode="r", encoding=""):
 def exists(url):
     p = parse_url(url)
     if p["protocol"] == "file":
+        if isinstance(url, str):
+            url = url.decode("utf8")
         return os.path.exists(url)
     elif p["protocol"] in ("ftp", "http", "https"):
         try:
@@ -101,6 +103,8 @@ def exists(url):
 def isdir(url):
     p = parse_url(url)
     if p["protocol"] == "file":
+        if isinstance(url, str):
+            url = url.decode("utf8")
         return os.path.isdir(url)
     elif p["protocol"] in ("ftp"):
         file = ftplib.FTP(p["host"], p["user"], p["password"])

project.wpr

@@ -13,9 +13,6 @@ proj.directory-list = [{'dirloc': loc('.'),
 proj.file-type = 'normal'
 proj.launch-config = {loc('ContentSources.py'): ('project',
         (u'config::home streams_bernu.cfg',
-         '')),
-                      loc('Downloader.py'): ('project',
-        (u'http://player.tvnet.lv/stream/amlst:75136/playlist.m3u8 downloads\\ccc',
          '')),
                       loc('iub_db.py'): ('project',
         (u'-d 90   -s -o',
@@ -42,14 +39,18 @@ proj.launch-config = {loc('ContentSources.py'): ('project',
         (u'home',
          ''))}
 [user attributes]
-debug.breakpoints = {loc('Downloader.py'): {182L: (0,
+debug.breakpoints = {loc('Downloader.py'): {94: (0,
         None,
         1,
         0),
-        231: (0,
-              None,
-              1,
-              0)},
+        102L: (0,
+               None,
+               1,
+               0),
+        193L: (0,
+               None,
+               1,
+               0)},
                      loc('iub.py'): {102: (0,
         None,
         1,
@@ -200,6 +201,7 @@ debug.breakpoints = {loc('Downloader.py'): {182L: (0,
         0)}}
 debug.err-values = {None: {},
                     loc('ContentSources.py'): {},
+                    loc('Downloader.py'): {},
                     loc('iub_db.py'): {},
                     loc('iub_email.py'): {},
                     loc('iubx.py'): {},
@@ -276,8 +278,8 @@ debug.recent-run-args = {loc('ContentSources.py'): [u'config::home streams_bernu
         u'home cli'],
                          loc('sources/ltc.py'): [u'ltc::videonoma']}
 debug.run-args = {}
-debug.var-col-widths = [0.41872791519434627,
-                        0.5812720848056537]
+debug.var-col-widths = [0.15347490347490347,
+                        0.8465250965250966]
 edit.bookmarks = {'list_action': (loc('run.py'),
                                   {'attrib-starts': [('Main',
         17),
@@ -827,11 +829,11 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                        'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #6'): {'column-widths': [1.0],
-                                       'expanded-nodes': [],
+        loc('unknown:<untitled> #6'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #4'): {'expanded-nodes': [],
+        loc('unknown:<untitled> #4'): {'column-widths': [1.0],
+                                       'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
         loc('unknown:<untitled> #5'): {'expanded-nodes': [],
@@ -971,14 +973,18 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         -1,
         -1),
                        'attrib-starts': [],
-                       'first-line': 0L,
+                       'first-line': 92L,
                        'folded-linenos': [],
-                       'history': {},
+                       'history': {u'file:C:/Data/Programming/Kodi/plugin.video.playstream/resources/lib/content/Downloader.py': ['p'\
+        'rint self.url\n',
+        'print url\n',
+        'print base_url\n',
+        'print r.content\n']},
                        'launch-id': None,
-                       'sel-line': 0L,
-                       'sel-line-start': 0L,
-                       'selection_end': 0L,
-                       'selection_start': 0L,
+                       'sel-line': 92L,
+                       'sel-line-start': 6549L,
+                       'selection_end': 6683L,
+                       'selection_start': 6683L,
                        'zoom': 0L}),
                      ('debug-watch',
                       'wide',
@@ -990,10 +996,12 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                        ('eval',
         u'theme'),
                                        ('eval',
-        u'item')],
+        u'item'),
+                                       ('eval',
+        u'url')],
                        'tree-state': {'expanded-nodes': [(0,),
         (1,)],
-                                      'selected-nodes': [(2,)],
+                                      'selected-nodes': [(3,)],
                                       'top-node': (0,)}}),
                      ('messages',
                       'wide',
@@ -1035,22 +1043,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
          'sel-line': 362L,
          'sel-line-start': 16151L,
          'selection_end': 16181L,
-         'selection_start': 16181L,
+         'selection_start': 16172L,
          'zoom': 0L},
-        1526594111.402],
-        [loc('sources/filmix.py'),
-         {'attrib-starts': [('Source',
-                             31),
-                            ('Source.get_movie_info',
-                             355)],
-          'first-line': 354L,
-          'folded-linenos': [],
-          'sel-line': 362L,
-          'sel-line-start': 16151L,
-          'selection_end': 16181L,
-          'selection_start': 16172L,
-          'zoom': 0L},
-         1526594111.565],
+        1526594111.565],
         [loc('sources/filmix.py'),
          {'attrib-starts': [('Source',
                              31),
@@ -1284,9 +1279,22 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
           'selection_end': 8610L,
           'selection_start': 8610L,
           'zoom': 0L},
-         1527705483.405]],
+         1527705483.405],
+        [loc('sources/filmix.py'),
+         {'attrib-starts': [('Source',
+                             31),
+                            ('Source.get_content',
+                             56)],
+          'first-line': 83L,
+          'folded-linenos': [],
+          'sel-line': 94L,
+          'sel-line-start': 3471L,
+          'selection_end': 3471L,
+          'selection_start': 3471L,
+          'zoom': 0L},
+         1528141882.377]],
         20),
-        'current-loc': loc('sources/filmix.py'),
+        'current-loc': loc('Downloader.py'),
         'editor-state-list': [(loc('run.py'),
                                {'attrib-starts': [('Main',
         22),
@@ -1369,14 +1377,16 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'selection_start': 8920L,
                                 'zoom': 0L}),
                               (loc('Downloader.py'),
-                               {'attrib-starts': [('get_header',
-        195)],
-                                'first-line': 175L,
-                                'folded-linenos': [],
-                                'sel-line': 198L,
-                                'sel-line-start': 7992L,
-                                'selection_end': 8012L,
-                                'selection_start': 8012L,
+                               {'attrib-starts': [('print_progress',
+        237)],
+                                'first-line': 248L,
+                                'folded-linenos': [9L,
+        47L,
+        76L],
+                                'sel-line': 239L,
+                                'sel-line-start': 9698L,
+                                'selection_end': 9724L,
+                                'selection_start': 9724L,
                                 'zoom': 0L}),
                               (loc('sources/euronews.py'),
                                {'attrib-starts': [],
@@ -1429,7 +1439,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'selection_end': 3471L,
                                 'selection_start': 3471L,
                                 'zoom': 0L})],
-        'has-focus': False,
+        'has-focus': True,
         'locked': False},
         [loc('run.py'),
          loc('util.py'),
@@ -1444,7 +1454,6 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
          loc('changelog.md'),
          loc('sources/filmix.py')]),
                                'open_files': [u'ContentSources.py',
-        u'Downloader.py',
         u'changelog.md',
         u'resolver.py',
         u'run.py',
@@ -1454,9 +1463,10 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         u'sources/ltc.py',
         u'sources/replay.py',
         u'util.py',
-        u'sources/filmix.py']},
+        u'sources/filmix.py',
+        u'Downloader.py']},
         'saved_notebook_display': None,
-        'split_percents': {0: 0.5061155630535639},
+        'split_percents': {0: 0.47474747474747475},
         'splits': 2,
         'tab_location': 'top',
         'user_data': {}},
@@ -1469,7 +1479,8 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                          0,
                          2434,
                          1440)}]}
-guimgr.recent-documents = [loc('sources/filmix.py'),
+guimgr.recent-documents = [loc('Downloader.py'),
+                           loc('sources/filmix.py'),
                            loc('util.py'),
                            loc('sources/ltc.py'),
                            loc('sources/replay.py'),
@@ -1479,7 +1490,6 @@ guimgr.recent-documents = [loc('sources/filmix.py'),
                            loc('ContentSources.py'),
                            loc('sources/euronews.py'),
                            loc('resolver.py'),
-                           loc('Downloader.py'),
                            loc('sources/lmt.py')]
 guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
         'ib-starts': [('NavigableString',

sources/ltc.py

@@ -89,7 +89,7 @@ X-Requested-With: XMLHttpRequest
                 ("TV arhīvs", "ltc::arhivs","","TV arhīvs atseviškiem kanāliem"),
                 ("Bērnu", "ltc::videonoma/bernu","","Videonomas bērnu filmas un seriāli"),
                 ("Filmas", "ltc::videonoma/filmas","","Videonomas filmas"),
-                ("Premiere filas", "ltc::videonoma/premiere","","Videonomas premiere filmas"),
+                ("Premiere filmas", "ltc::videonoma/premiere","","Videonomas premiere filmas"),
                 ("Seriāli", "ltc::videonoma/series","","Videonomas seriāli"),
                 ("360 Play", "ltc::videonoma/360play","","Videonomas lattelecom saturs"),  # TODO
                 #("Videonoma", "ltc::videonoma","","Filmas (arī Priemiere) un seriāli"),
@@ -214,7 +214,7 @@ X-Requested-With: XMLHttpRequest
                 data2 = re.sub("until_id=\d+","until_id="+item["id"],data)
             else:
                 data2 = data + "&until_id=%s"%item["id"]
-            content.append(("Next page",self.name+"::"+data2,"","Go to next page"))
+            content.append(("Next page",self.name+"::"+data2,"next.png","Go to next page"))
             return content
 
         ### Arhīva kanānālu saraksts
@@ -343,7 +343,7 @@ X-Requested-With: XMLHttpRequest
             if m:
                 page = int(m.group(1))
                 data2 = re.sub("page=\d+","page=%s"%(page+1),data)
-                content.append(("Next page",self.name+"::"+data2,"","Go to next page"))
+                content.append(("Next page",self.name+"::"+data2,"next.png","Go to next page"))
             return content
 
         ### Filmas galvenā ###
@@ -452,7 +452,7 @@ X-Requested-With: XMLHttpRequest
                 else:
                     section = re.search('data-section="(\d+)"', r).group(1)
                     data2 = "load_more.json?pack=1&section=%s" % section
-                content.append(("Next page",self.name+"::"+data2,"","Go to next page"))
+                content.append(("Next page",self.name+"::"+data2,"next.png","Go to next page"))
             return content