From 3d7ac34acc8cc169805a1bc5029f2a5ec9ecd297 Mon Sep 17 00:00:00 2001 From: Mikael Frykholm Date: Mon, 31 Jul 2017 10:40:11 +0200 Subject: [PATCH 1/1] whitespace fixes --- svtplaydump.py | 203 ++++++++++++++++++++++++++----------------------- 1 file changed, 108 insertions(+), 95 deletions(-) diff --git a/svtplaydump.py b/svtplaydump.py index 8b4a3c2..3f2a64a 100755 --- a/svtplaydump.py +++ b/svtplaydump.py @@ -30,23 +30,24 @@ import struct import argparse import requests import sys, os -import socket import feedparser from datetime import datetime, timezone from pathlib import Path + class Video(dict): def __init__(self, *args, **kwargs): self.update(dict(*args, **kwargs)) # use the free update to set keys def __setattr__(self, name, value): - return self.__setitem__(name,value) - + return self.__setitem__(name, value) + def __getattr__(self, name): return self.__getitem__(name) - + def is_downloaded(self): - raise("NotImplemented") + raise ("NotImplemented") + def scrape_player_page(video): """ @@ -55,68 +56,71 @@ def scrape_player_page(video): if not video['url'].startswith('http'): video['url'] = "http://www.svtplay.se" + video['url'] soup = BeautifulSoup(requests.get(video['url']).text) - video_player = soup.body('a',{'data-json-href':True})[0] + video_player = soup.body('a', {'data-json-href': True})[0] if 'oppetarkiv.se' in video['url']: - flashvars = requests.get("http://www.oppetarkiv.se/%s"%video_player.attrs['data-json-href']+"?output=json").json() - else: + flashvars = requests.get( + "http://www.oppetarkiv.se/%s" % video_player.attrs['data-json-href'] + "?output=json").json() + else: if video_player.attrs['data-json-href'].startswith("/wd"): - flashvars = requests.get("http://www.svt.se/%s"%video_player.attrs['data-json-href']).json() - else: - flashvars = requests.get("http://www.svtplay.se/%s"%video_player.attrs['data-json-href']+"?output=json").json() - video['duration'] = video_player.attrs.get('data-length',0) + flashvars = requests.get("http://www.svt.se/%s" % video_player.attrs['data-json-href']).json() + else: + flashvars = requests.get( + "http://www.svtplay.se/%s" % video_player.attrs['data-json-href'] + "?output=json").json() + video['duration'] = video_player.attrs.get('data-length', 0) if not 'title' in video: - video['title'] = soup.find('meta',{'property':'og:title'}).attrs['content'].replace('|','_').replace('/','_') - if not 'genre' in video: + video['title'] = soup.find('meta', {'property': 'og:title'}).attrs['content'].replace('|', '_').replace('/', '_') + if 'genre' not in video: if soup.find(text='Kategori:'): video['genre'] = soup.find(text='Kategori:').parent.parent.a.text else: - video['genre'] = 'Ingen Genre' + video['genre'] = 'Ingen Genre' if 'dynamicStreams' in flashvars: - video['url'] = flashvars['dynamicStreams'][0].split('url:')[1].split('.mp4,')[0] +'.mp4' + video['url'] = flashvars['dynamicStreams'][0].split('url:')[1].split('.mp4,')[0] + '.mp4' filename = Path(video['title']).with_suffix(".mp4") - print(Popen(["rtmpdump","-o"+filename,"-r", url], stdout=PIPE).communicate()[0]) + print(Popen(["rtmpdump", "-o" + filename, "-r", video['url']], stdout=PIPE).communicate()[0]) if 'pathflv' in flashvars: rtmp = flashvars['pathflv'][0] filename = Path(video['title']).with_suffix(".flv") - print(Popen(["mplayer","-dumpstream","-dumpfile",filename, rtmp], stdout=PIPE).communicate()[0]) - if not 'timestamp' in video: - if soup.find_all(datetime=True): - xmldate_str = soup.find_all(datetime=True)[0].attrs['datetime'] - if xmldate_str: - video['timestamp'] = datetime(*feedparser._parse_date_w3dtf(xmldate_str)[:6]) #naive in utc - video['timestamp'] = video['timestamp'].replace(tzinfo=timezone.utc).astimezone(tz=None) #convert to local time + print(Popen(["mplayer", "-dumpstream", "-dumpfile", filename, rtmp], stdout=PIPE).communicate()[0]) + if not 'timestamp' in video and soup.find_all(datetime=True): + xmldate_str = soup.find_all(datetime=True)[0].attrs['datetime'] + if xmldate_str: + video['timestamp'] = datetime(*feedparser._parse_date_w3dtf(xmldate_str)[:6]) # naive in utc + video['timestamp'] = video['timestamp'].replace(tzinfo=timezone.utc).astimezone(tz=None) # convert to local time if 'video' in flashvars: for reference in flashvars['video']['videoReferences']: if 'm3u8' in reference['url']: - video['url']=reference['url'] + video['url'] = reference['url'] video['filename'] = Path(video['title']).with_suffix('.ts') if 'statistics' in flashvars: video['category'] = flashvars['statistics']['category'] if not download_from_playlist(video): return False - if not 'url' in video: + if 'url' not in video: print("Could not find any streams") return False return video + def download_from_playlist(video): params = requests.utils.urlparse(video['url']).query print(params) - if 'cc1=' in params: #'cc1=name=Svenska~default=yes~forced=no~uri=http://media.svt.se/download/mcc/wp3/undertexter-wsrt/1134047/1134047-025A/C(sv)/index.m3u8~lang=sv' - video['subs'] = [dict([k.split('=') for k in params.split('cc1=')[1].split('~')])] #make a dict from the paramstring + if 'cc1=' in params: # 'cc1=name=Svenska~default=yes~forced=no~uri=http://media.svt.se/download/mcc/wp3/undertexter-wsrt/1134047/1134047-025A/C(sv)/index.m3u8~lang=sv' + video['subs'] = [ + dict([k.split('=') for k in params.split('cc1=')[1].split('~')])] # make a dict from the paramstring try: req = requests.get(video['url']).text except: - print("Error reading, skipping file") + print("Error reading, skipping file") print(sys.exc_info()[1]) return False if 'subs' in video: try: segments = [item for item in requests.get(video['subs'][0]['uri']).text.split('\n') if 'vtt' in item] except: - print("Error reading, skipping subtitle") + print("Error reading, skipping subtitle") print(sys.exc_info()[1]) - segments = [] #ugly FIXME + segments = [] # ugly FIXME video['subs'][0]['download'] = [] for segment in segments: if not segment.startswith('http'): @@ -124,51 +128,52 @@ def download_from_playlist(video): try: video['subs'][0]['download'].append(requests.get(segment).text) except: - print("Error reading, skipping subtitle") + print("Error reading, skipping subtitle") print(sys.exc_info()[1]) break playlist = parse_playlist(req) if not playlist: return videourl = sorted(playlist, key=lambda k: int(k['BANDWIDTH']))[-1]['url'] - if not videourl.startswith('http'): #if relative path - videourl = "{}/{}".format(os.path.dirname(video['url']), videourl) + if not videourl.startswith('http'): # if relative path + videourl = "{}/{}".format(os.path.dirname(video['url']), videourl) segments, metadata = parse_segment_playlist(videourl) if "EXT-X-KEY" in metadata: try: key = requests.get(metadata["EXT-X-KEY"]['URI'].strip('"')).text except: - print("Error reading, skipping file") + print("Error reading, skipping file") print(sys.exc_info()[1]) return False - decrypt=True + decrypt = True else: - decrypt=False + decrypt = False with video['filename'].open("wb") as ofile: - segment=0 + segment = 0 size = 0 for url in segments: try: ufile = requests.get(url, stream=True).raw except: - print("Error reading, skipping file") + print("Error reading, skipping file") print(sys.exc_info()[1]) return False - print("\r{0:.2f} MB".format(size/1024/1024), end="") + print("\r{0:.2f} MB".format(size / 1024 / 1024), end="") sys.stdout.flush() if decrypt: - iv=struct.pack("IIII",segment,0,0,0) + iv = struct.pack("IIII", segment, 0, 0, 0) try: - decryptor = AES.new(key, AES.MODE_CBC, iv) #ValueError: AES key must be either 16, 24, or 32 bytes long - except(ValueError) as e: + decryptor = AES.new(key, AES.MODE_CBC, + iv) # ValueError: AES key must be either 16, 24, or 32 bytes long + except ValueError as e: print("Error using decryption key. Skipping") print(e) - return False - while(True): + return False + while True: try: buf = ufile.read(4096) except: - print("Error reading, skipping file") #FIXME mark file as failed + print("Error reading, skipping file") print(sys.exc_info()[1]) return False if not buf: @@ -181,13 +186,14 @@ def download_from_playlist(video): if 'thumb-url' in video: try: - video['thumb'] = requests.get(video['thumb-url'],stream=True).raw + video['thumb'] = requests.get(video['thumb-url'], stream=True).raw except: - print("Error reading thumbnail") #FIXME mark file as failed + print("Error reading thumbnail") # FIXME mark file as failed print(sys.exc_info()[1]) return True + def parse_playlist(playlist): if not playlist.startswith("#EXTM3U"): print(playlist) @@ -195,47 +201,51 @@ def parse_playlist(playlist): playlist = playlist.splitlines() while not 'EXT-X-STREAM-INF' in playlist[0]: playlist = playlist[1:] - items=[] - for (metadata_string,url) in zip(playlist[0::2], playlist[1::2]): + items = [] + for (metadata_string, url) in zip(playlist[0::2], playlist[1::2]): md = Video() if not 'EXT-X-STREAM-INF' in metadata_string.split(':')[0]: continue for item in metadata_string.split(':')[1].split(','): if '=' in item: - md.update([item.split('='),]) - md['url']=url + md.update([item.split('='), ]) + md['url'] = url items.append(md) - return items + return items + def parse_segment_playlist(playlisturl): playlist = requests.get(playlisturl).text assert playlist.startswith("#EXTM3U") PATTERN = re.compile(r'''((?:[^,"']|"[^"]*"|'[^']*')+)''') segments = [] - next_is_url=False + next_is_url = False metadata = {} for row in playlist.splitlines(): if next_is_url: - if not row.startswith('http'): #if relative path - row = "{}/{}".format(os.path.dirname(playlisturl), row) + if not row.startswith('http'): # if relative path + row = "{}/{}".format(os.path.dirname(playlisturl), row) segments.append(row) - next_is_url=False + next_is_url = False continue if 'EXTINF' in row: - next_is_url=True + next_is_url = True if "EXT-X-KEY" in row: - row = row.split(':',1)[1] #skip first part - parts = PATTERN.split(row)[1:-1] #do magic re split and keep quotes - metadata["EXT-X-KEY"] = dict([part.split('=',1) for part in parts if '=' in part]) #throw away the commas and make dict of the pairs - return(segments, metadata) + row = row.split(':', 1)[1] # skip first part + parts = PATTERN.split(row)[1:-1] # do magic re split and keep quotes + metadata["EXT-X-KEY"] = dict([part.split('=', 1) for part in parts if + '=' in part]) # throw away the commas and make dict of the pairs + return segments, metadata + def parse_videolist(): page_num = 1 - soup = BeautifulSoup(requests.get("http://www.svtplay.se/ajax/videospager").text)#this call does not work for getting the pages, we use it for the page totals only - page_tot = int(soup.find('a',{'data-currentpage':True}).attrs['data-lastpage']) + soup = BeautifulSoup(requests.get( + "http://www.svtplay.se/ajax/videospager").text) # this call does not work for getting the pages, we use it for the page totals only + page_tot = int(soup.find('a', {'data-currentpage': True}).attrs['data-lastpage']) videos_per_page = 8 video_num = 0 - while(page_num <= page_tot): + while page_num <= page_tot: base_url = "http://www.svtplay.se/ajax/videos?sida={}".format(page_num) soup = BeautifulSoup(requests.get(base_url).text) for article in soup.findAll('article'): @@ -244,32 +254,33 @@ def parse_videolist(): video['title'] = meta['data-title'] video['description'] = meta['data-description'] video['url'] = dict(article.find('a').attrs)['href'] - video['thumb-url'] = dict(article.find('img',{}).attrs)['src'] + video['thumb-url'] = dict(article.find('img', {}).attrs)['src'] video['num'] = video_num video['total'] = page_tot * videos_per_page video_num += 1 yield video page_num += 1 + def remux(video, xml=None): if 'genre' in video: if not os.path.exists(video['genre']): os.mkdir(video['genre']) video['path'] = Path(video['genre'] / video['filename']).with_suffix('.mkv') else: - video['path'] = video['filename'].with_suffix('.mkv') - command = ["mkvmerge","-o",str(video['path']), '--title',video['title']] + video['path'] = video['filename'].with_suffix('.mkv') + command = ["mkvmerge", "-o", str(video['path']), '--title', video['title']] if xml: with video['filename'].with_suffix('.xml').open('w') as f: f.write(xml) - command.extend(['--global-tags',str(video['filename'].with_suffix('.xml'))]) + command.extend(['--global-tags', str(video['filename'].with_suffix('.xml'))]) if 'thumb' in video: - with open('thumbnail.jpg','wb') as f: #FIXME use title instead for many downloaders + with open('thumbnail.jpg', 'wb') as f: # FIXME use title instead for many downloaders f.write(video['thumb'].read()) command.extend(['--attachment-description', "Thumbnail", - '--attachment-mime-type', 'image/jpeg', - '--attach-file', 'thumbnail.jpg']) + '--attachment-mime-type', 'image/jpeg', + '--attach-file', 'thumbnail.jpg']) # if 'subs' in video: # for sub in video['subs']: # if 'download' in sub: @@ -279,18 +290,18 @@ def remux(video, xml=None): command.append(str(video['filename'])) print(Popen(command, stdout=PIPE).communicate()[0]) - for fname in (video['filename'], video['filename'].with_suffix('.xml'),Path('thumbnail.jpg')): + for fname in (video['filename'], video['filename'].with_suffix('.xml'), Path('thumbnail.jpg')): try: fname.unlink() except: pass if 'timestamp' in video: try: - os.utime(str(video['path']), times=(video['timestamp'].timestamp(),video['timestamp'].timestamp())) + os.utime(str(video['path']), times=(video['timestamp'].timestamp(), video['timestamp'].timestamp())) except FileNotFoundError as e: print(e) - + def mkv_metadata(video): root = BeautifulSoup(features='xml') root.append(Doctype('Tags SYSTEM "matroskatags.dtd"')) @@ -298,7 +309,7 @@ def mkv_metadata(video): tag = root.new_tag("Tag") tags.append(tag) root.append(tags) - keep = ('title','description', 'url','genre') + keep = ('title', 'description', 'url', 'genre') targets = root.new_tag("Targets") ttv = root.new_tag("TargetTypeValue") ttv.string = str(50) @@ -309,65 +320,67 @@ def mkv_metadata(video): continue simple = root.new_tag('Simple') name = root.new_tag('Name') - name.string=key.upper() + name.string = key.upper() simple.append(name) sstring = root.new_tag('String') - sstring.string=video[key] + sstring.string = video[key] simple.append(sstring) tag.append(simple) return str(root) + if __name__ == "__main__": parser = argparse.ArgumentParser() group = parser.add_mutually_exclusive_group(required=True) group.add_argument("-r", "--rss", help="Download all files in rss") group.add_argument("-u", "--url", help="Download video in url") group.add_argument("-m", "--mirror", help="Mirror all files", action="store_true") - parser.add_argument("-n", "--no_act", help="Just print what would be done, don't do any downloading.", action="store_true") + parser.add_argument("-n", "--no_act", help="Just print what would be done, don't do any downloading.", + action="store_true") parser.add_argument("--no_remux", help="Don't remux into mkv", action="store_true") - + args = parser.parse_args() - if args.rss: + if args.rss: d = feedparser.parse(args.rss) for e in d.entries: - print(("Downloading: %s"%e.title)) + print(("Downloading: %s" % e.title)) if args.no_act: continue - video = scrape_player_page({'title':e.title,'url':e.link}) + video = scrape_player_page({'title': e.title, 'url': e.link}) if args.no_remux: continue - self.remux(video) - #print(e.description) + remux(video) + # print(e.description) if args.mirror: if not os.path.exists('.seen'): os.mkdir('.seen') for video in parse_videolist(): - video['title'] = video['title'].replace('/','_') - print(video['title']+'.mkv') + video['title'] = video['title'].replace('/', '_') + print(video['title'] + '.mkv') print("{} of {}".format(video['num'], video['total'])) - - if os.path.exists(os.path.join('.seen',video['title'])): - print("Skipping") + + if os.path.exists(os.path.join('.seen', video['title'])): + print("Skipping") continue print("Downloading...") if args.no_act: continue - open(os.path.join('.seen',video['title']),'w').close() #touch + open(os.path.join('.seen', video['title']), 'w').close() # touch ret = scrape_player_page(video) if not ret: if not os.path.exists('.failed'): os.mkdir('.failed') - open(os.path.join('.failed',video['title']),'w').close() #touch + open(os.path.join('.failed', video['title']), 'w').close() # touch continue video = ret if args.no_remux: continue xml = mkv_metadata(video) remux(video, xml) - + else: if not args.no_act: - video = scrape_player_page({'url':args.url}) + video = scrape_player_page({'url': args.url}) if not args.no_remux: remux(video) - print(("Downloaded {}".format(args.url))) + print(("Downloaded {}".format(args.url))) -- 2.39.2