a

Downloader.py

@@ -189,7 +189,7 @@ class DownloadWithProgressFragmented:
         self.deferred.errback() # TODO
 
     def addProgress(self, progress_callback):
-        print "[addProgress]"
+        #print "[addProgress]"
         self.progress_callback = progress_callback
 
 #####################################################################################################
@@ -222,72 +222,58 @@ def get_ext(mtype):
         return ".mp4","http"
 
 
-
 ##############################################
 def print_progress(currentbytes, totalbytes):
     progress = float(currentbytes)/float(totalbytes)*100
     print "%s (%i/%i)"%(progress,currentbytes,totalbytes)
 
 def download_ok(*args):
-    print "Download OK"
-    reactor.stop()
+    print "Finished"
+    stop()
 
 def download_err(e):
     print "Download Error %s"%e.getBriefTraceback()
-    pass
+    stop()
+
 def stop():
     reactor.stop()
+
 ###############################################
 
-def download_video(stream):
-    stream = stream[0]
-    url = stream["url"]
-    headers = stream["headers"]
-    output = stream["name"].replace("\\"," ").replace(":"," ").replace("|"," ")
+def download_video(url,output,headers=None):
+    #output = stream["name"].replace("\\"," ").replace(":"," ").replace("|"," ")
+    if not headers:
+        headers = {"user-agent":"Enigma2"}
     try:
-        h = get_header(url,headers={"user-agent":"Enigma2"})
+        h = get_header(url,headers=headers)
         mtype = h.get("content-type")
         ext,stream_type = get_ext(mtype)
     except:
         ext,stream_type = (".ts","hls")
-    #output = urlparse.urlparse(url)[2].split('/')[-1] + ext
     output = output+ext
-    output = os.path.join("downloads", output)
     if stream_type == "hls":
         d = DownloadWithProgressFragmented(url,output,headers={"user-agent":"Enigma2"})
     else:
         d = DownloadWithProgress(url,output,headers={"user-agent":"Enigma2"})
     d.addProgress(print_progress)
     d.start().addCallback(download_ok).addErrback(download_err)
-    reactor.run()
+    return d
 
 
 if __name__ == "__main__":
     if len(sys.argv)>2:
         url= sys.argv[1]
-        output = sys.argv[1]
+        output = sys.argv[2]
     else:
-        url = "http://walterebert.com/playground/video/hls/ts/480x270.m3u8"
-        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 = url2 = "http://walterebert.com/playground/video/hls/ts/480x270.m3u8"
+        #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"
         #url = "http://wx17.poiuytrew.pw/s/c507282042b1bf25e0b72c34a68426f3/hd_30/Jackie.2016.D.iTunes.BDRip.1080p_720.mp4"
         #url = "http://player.tvnet.lv/live/amlst:11/chunklist_w361981294_b528000.m3u8"
         #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="
-    try:
-        h = get_header(url,headers={"user-agent":"Enigma2"})
-        mtype = h.get("content-type")
-        ext,stream_type = get_ext(mtype)
-    except:
-        ext,stream_type = (".ts","hls")
-    output = urlparse.urlparse(url)[2].split('/')[-1] + ext
-    output = os.path.join("downloads", output)
-    if stream_type == "hls":
-        d = DownloadWithProgressFragmented(url,output,headers={"user-agent":"Enigma2"})
-    else:
-        d = DownloadWithProgress(url,output,headers={"user-agent":"Enigma2"})
-    d.addProgress(print_progress)
-    d.start().addCallback(download_ok).addErrback(download_err)
+    active = 2
+    d1 = download_video(url,output)
     reactor.run()
 
 

project.wpr

@@ -13,6 +13,9 @@ 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',
@@ -39,7 +42,15 @@ proj.launch-config = {loc('ContentSources.py'): ('project',
         (u'home',
          ''))}
 [user attributes]
-debug.breakpoints = {loc('iub.py'): {102: (0,
+debug.breakpoints = {loc('Downloader.py'): {182L: (0,
+        None,
+        1,
+        0),
+        231: (0,
+              None,
+              1,
+              0)},
+                     loc('iub.py'): {102: (0,
         None,
         1,
         0),
@@ -145,6 +156,9 @@ debug.err-values = {None: {},
 debug.recent-run-args = {loc('ContentSources.py'): [u'config::home streams_bernu.cfg',
         u'ltc::home',
         u'config::home'],
+                         loc('Downloader.py'): [u'http://player.tvnet.lv/stream/amlst:75136/playlist.m3u8 downloads\\ccc',
+        u'http://player.tvnet.lv/stream/amlst:75136/playlist.m3u8 downloads\\bbb',
+        u'http://player.tvnet.lv/stream/amlst:75136/playlist.m3u8 aaa.mp4'],
                          loc('iub_db.py'): [u'-d 90   -s -o',
         u'-d 40   -rg -o',
         u'-d 40   -s -o',
@@ -225,7 +239,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                {'tree-state': {'file-sort-method': 'by name',
         'list-files-first': 0,
         'tree-states': {'deep': {'expanded-nodes': [(1,)],
-                                 'selected-nodes': [(13,)],
+                                 'selected-nodes': [(14,)],
                                  'top-node': (0,)}},
         'tree-style': 'deep'}}),
                               ('snippets',
@@ -818,7 +832,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                        'fRegexFlags': 46,
                                        'fReplaceText': u'www.shortcut.lv',
                                        'fReverse': False,
-                                       'fSearchText': u'order=',
+                                       'fSearchText': u'downloads',
                                        'fStartPos': 0,
                                        'fStyle': 'text',
                                        'fWholeWords': False,
@@ -892,9 +906,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         -1,
         -1),
                        'attrib-starts': [],
-                       'first-line': 11L,
+                       'first-line': 19L,
                        'folded-linenos': [],
                        'history': {None: [],
+                                   u'file:C:/Data/Programming/enigma2/PlayStream2/content/Downloader.py': ['s'\
+        'elf\n',
+        'self.agent\n',
+        'self.url\n',
+        'args\n'],
                                    u'file:C:/Data/Programming/enigma2/PlayStream2/content/run.py': ['p'\
         'rint url\n',
         're.search(r"tracks\\|(\\w+)\\|(\\w+)\\|(\\w+)\\|files\\|(\\w+)\\|('\
@@ -969,10 +988,10 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         'print data2\n',
         'item\n']},
                        'launch-id': None,
-                       'sel-line': 23L,
-                       'sel-line-start': 746L,
-                       'selection_end': 746L,
-                       'selection_start': 746L,
+                       'sel-line': 31L,
+                       'sel-line-start': 918L,
+                       'selection_end': 918L,
+                       'selection_start': 918L,
                        'zoom': 0L}),
                      ('debug-watch',
                       'wide',
@@ -1020,97 +1039,19 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                        'selection_end': 374L,
                        'selection_start': 374L,
                        'zoom': 0L})],
-        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/ltc.py'),
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/mtgplay.py'),
         {'attrib-starts': [('Source',
-                            27),
-                           ('Source.__init__',
-                            29)],
-         'first-line': 56L,
+                            40),
+                           ('Source.get_content',
+                            51)],
+         'first-line': 82L,
          'folded-linenos': [],
-         'sel-line': 56L,
-         'sel-line-start': 2171L,
-         'selection_end': 2171L,
-         'selection_start': 2171L,
+         'sel-line': 90L,
+         'sel-line-start': 3441L,
+         'selection_end': 3441L,
+         'selection_start': 3441L,
          'zoom': 0L},
-        1512899545.957],
-        [loc('sources/ltc.py'),
-         {'attrib-starts': [('Source',
-                             27),
-                            ('Source.get_content',
-                             74)],
-          'first-line': 96L,
-          'folded-linenos': [],
-          'sel-line': 105L,
-          'sel-line-start': 4365L,
-          'selection_end': 4365L,
-          'selection_start': 4365L,
-          'zoom': 0L},
-         1512900011.185],
-        [loc('sources/ltc.py'),
-         {'attrib-starts': [('Source',
-                             27),
-                            ('Source.get_content',
-                             74)],
-          'first-line': 97L,
-          'folded-linenos': [],
-          'sel-line': 103L,
-          'sel-line-start': 4140L,
-          'selection_end': 4332L,
-          'selection_start': 4140L,
-          'zoom': 0L},
-         1512900746.171],
-        [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             22),
-                            ('Main.show_content',
-                             183)],
-          'first-line': 176L,
-          'folded-linenos': [],
-          'sel-line': 186L,
-          'sel-line-start': 7392L,
-          'selection_end': 7413L,
-          'selection_start': 7413L,
-          'zoom': 0L},
-         1512900756.483],
-        [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             22),
-                            ('Main.initUI',
-                             47)],
-          'first-line': 60L,
-          'folded-linenos': [],
-          'sel-line': 69L,
-          'sel-line-start': 2705L,
-          'selection_end': 2705L,
-          'selection_start': 2705L,
-          'zoom': 0L},
-         1512901312.202],
-        [loc('sources/ltc.py'),
-         {'attrib-starts': [('Source',
-                             27),
-                            ('Source.get_content',
-                             74)],
-          'first-line': 78L,
-          'folded-linenos': [],
-          'sel-line': 83L,
-          'sel-line-start': 3077L,
-          'selection_end': 3168L,
-          'selection_start': 3168L,
-          'zoom': 0L},
-         1512906372.564],
-        [loc('sources/mtgplay.py'),
-         {'attrib-starts': [('Source',
-                             40),
-                            ('Source.get_content',
-                             51)],
-          'first-line': 82L,
-          'folded-linenos': [],
-          'sel-line': 90L,
-          'sel-line-start': 3441L,
-          'selection_end': 3441L,
-          'selection_start': 3441L,
-          'zoom': 0L},
-         1512906617.546],
+        1512906617.546],
         [loc('run.py'),
          {'attrib-starts': [('Main',
                              22),
@@ -1268,9 +1209,77 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
           'selection_end': 4505L,
           'selection_start': 4505L,
           'zoom': 0L},
-         1512908610.333]],
+         1512908610.333],
+        [loc('sources/mtgplay.py'),
+         {'attrib-starts': [('Source',
+                             40),
+                            ('Source.get_content',
+                             51)],
+          'first-line': 155L,
+          'folded-linenos': [],
+          'sel-line': 162L,
+          'sel-line-start': 8033L,
+          'selection_end': 8077L,
+          'selection_start': 8077L,
+          'zoom': 0L},
+         1512909177.038],
+        [loc('run.py'),
+         {'attrib-starts': [('Main',
+                             22),
+                            ('Main.list_action',
+                             106)],
+          'first-line': 105L,
+          'folded-linenos': [],
+          'sel-line': 110L,
+          'sel-line-start': 4505L,
+          'selection_end': 4505L,
+          'selection_start': 4505L,
+          'zoom': 0L},
+         1512920924.388],
+        [loc('Downloader.py'),
+         {'attrib-starts': [],
+          'first-line': 261L,
+          'folded-linenos': [],
+          'sel-line': 271L,
+          'sel-line-start': 10976L,
+          'selection_end': 11019L,
+          'selection_start': 11019L,
+          'zoom': 0L},
+         1512921355.479],
+        [loc('Downloader.py'),
+         {'attrib-starts': [],
+          'first-line': 276L,
+          'folded-linenos': [],
+          'sel-line': 283L,
+          'sel-line-start': 11995L,
+          'selection_end': 12030L,
+          'selection_start': 12022L,
+          'zoom': 0L},
+         1512921359.313],
+        [loc('Downloader.py'),
+         {'attrib-starts': [('download_video',
+                             241)],
+          'first-line': 233L,
+          'folded-linenos': [],
+          'sel-line': 241L,
+          'sel-line-start': 9270L,
+          'selection_end': 9288L,
+          'selection_start': 9274L,
+          'zoom': 0L},
+         1512921617.108],
+        [loc('Downloader.py'),
+         {'attrib-starts': [('DownloadWithProgressFragmented',
+                             76)],
+          'first-line': 154L,
+          'folded-linenos': [],
+          'sel-line': 191L,
+          'sel-line-start': 7690L,
+          'selection_end': 7699L,
+          'selection_start': 7699L,
+          'zoom': 0L},
+         1512924911.716]],
         20),
-        'current-loc': loc('sources/mtgplay.py'),
+        'current-loc': loc('Downloader.py'),
         'editor-state-list': [(loc('ContentSources.py'),
                                {'attrib-starts': [('ContentSources',
         16),
@@ -1401,6 +1410,16 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'sel-line-start': 3299L,
                                 'selection_end': 3299L,
                                 'selection_start': 3299L,
+                                'zoom': 0L}),
+                              (loc('Downloader.py'),
+                               {'attrib-starts': [('download_err',
+        233)],
+                                'first-line': 262L,
+                                'folded-linenos': [],
+                                'sel-line': 236L,
+                                'sel-line-start': 9181L,
+                                'selection_end': 9181L,
+                                'selection_start': 9181L,
                                 'zoom': 0L})],
         'has-focus': True,
         'locked': False},
@@ -1415,7 +1434,8 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
          loc('sources/filmas.py'),
          loc('kivy_test2.py'),
          loc('kivy_test.py'),
-         loc('sources/filmix.py')]),
+         loc('sources/filmix.py'),
+         loc('Downloader.py')]),
                                'open_files': [u'ContentSources.py',
         u'sources/filmas.py',
         u'sources/lmt.py',
@@ -1426,10 +1446,11 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         u'sources/filmix.py',
         u'sources/ltc.py',
         u'kivy_test.py',
+        u'sources/mtgplay.py',
         u'run.py',
-        u'sources/mtgplay.py']},
+        u'Downloader.py']},
         'saved_notebook_display': None,
-        'split_percents': {0: 0.5261845386533666},
+        'split_percents': {0: 0.48542458808618505},
         'splits': 2,
         'tab_location': 'top',
         'user_data': {}},
@@ -1442,8 +1463,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                          -1080,
                          1858,
                          1080)}]}
-guimgr.recent-documents = [loc('sources/mtgplay.py'),
+guimgr.recent-documents = [loc('Downloader.py'),
                            loc('run.py'),
+                           loc('sources/mtgplay.py'),
                            loc('kivy_test.py'),
                            loc('sources/ltc.py'),
                            loc('sources/filmix.py'),