projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rzhxeo-cinemassacre'
[youtube-dl]
/
youtube_dl
/
downloader
/
f4m.py
diff --git
a/youtube_dl/downloader/f4m.py
b/youtube_dl/downloader/f4m.py
index 9a6c03556a64ae5b052354e8973d7bc01546b392..e6be6ae6c878c9ede7cd2cf3b6be663e22bb8be1 100644
(file)
--- a/
youtube_dl/downloader/f4m.py
+++ b/
youtube_dl/downloader/f4m.py
@@
-4,14
+4,14
@@
import base64
import io
import itertools
import os
import io
import itertools
import os
-from struct import unpack, pack
import time
import xml.etree.ElementTree as etree
from .common import FileDownloader
from .http import HttpFD
from ..utils import (
import time
import xml.etree.ElementTree as etree
from .common import FileDownloader
from .http import HttpFD
from ..utils import (
- compat_urllib_request,
+ struct_pack,
+ struct_unpack,
compat_urlparse,
format_bytes,
encodeFilename,
compat_urlparse,
format_bytes,
encodeFilename,
@@
-27,13
+27,13
@@
class FlvReader(io.BytesIO):
# Utility functions for reading numbers and strings
def read_unsigned_long_long(self):
# Utility functions for reading numbers and strings
def read_unsigned_long_long(self):
- return unpack('!Q', self.read(8))[0]
+ return
struct_
unpack('!Q', self.read(8))[0]
def read_unsigned_int(self):
def read_unsigned_int(self):
- return unpack('!I', self.read(4))[0]
+ return
struct_
unpack('!I', self.read(4))[0]
def read_unsigned_char(self):
def read_unsigned_char(self):
- return unpack('!B', self.read(1))[0]
+ return
struct_
unpack('!B', self.read(1))[0]
def read_string(self):
res = b''
def read_string(self):
res = b''
@@
-116,8
+116,8
@@
class FlvReader(io.BytesIO):
self.read_unsigned_char()
# flags
self.read(3)
self.read_unsigned_char()
# flags
self.read(3)
- # BootstrapinfoVersion
- bootstrap_info_version = self.read_unsigned_int()
+
+ self.read_unsigned_int() # BootstrapinfoVersion
# Profile,Live,Update,Reserved
self.read(1)
# time scale
# Profile,Live,Update,Reserved
self.read(1)
# time scale
@@
-126,15
+126,15
@@
class FlvReader(io.BytesIO):
self.read_unsigned_long_long()
# SmpteTimeCodeOffset
self.read_unsigned_long_long()
self.read_unsigned_long_long()
# SmpteTimeCodeOffset
self.read_unsigned_long_long()
- # MovieIdentifier
- movie_identifier = self.read_string()
+
+ self.read_string() # MovieIdentifier
server_count = self.read_unsigned_char()
# ServerEntryTable
for i in range(server_count):
self.read_string()
quality_count = self.read_unsigned_char()
# QualityEntryTable
server_count = self.read_unsigned_char()
# ServerEntryTable
for i in range(server_count):
self.read_string()
quality_count = self.read_unsigned_char()
# QualityEntryTable
- for i in range(
server
_count):
+ for i in range(
quality
_count):
self.read_string()
# DrmData
self.read_string()
self.read_string()
# DrmData
self.read_string()
@@
-196,7
+196,7
@@
def write_flv_header(stream, metadata):
# Script data
stream.write(b'\x12')
# Size of the metadata with 3 bytes
# Script data
stream.write(b'\x12')
# Size of the metadata with 3 bytes
- stream.write(pack('!L', len(metadata))[1:])
+ stream.write(
struct_
pack('!L', len(metadata))[1:])
stream.write(b'\x00\x00\x00\x00\x00\x00\x00')
stream.write(metadata)
# Magic numbers extracted from the output files produced by AdobeHDS.php
stream.write(b'\x00\x00\x00\x00\x00\x00\x00')
stream.write(metadata)
# Magic numbers extracted from the output files produced by AdobeHDS.php
@@
-223,7
+223,13
@@
class F4mFD(FileDownloader):
self.to_screen('[download] Downloading f4m manifest')
manifest = self.ydl.urlopen(man_url).read()
self.report_destination(filename)
self.to_screen('[download] Downloading f4m manifest')
manifest = self.ydl.urlopen(man_url).read()
self.report_destination(filename)
- http_dl = HttpQuietDownloader(self.ydl, {'continuedl': True, 'quiet': True, 'noprogress': True})
+ http_dl = HttpQuietDownloader(self.ydl,
+ {
+ 'continuedl': True,
+ 'quiet': True,
+ 'noprogress': True,
+ 'test': self.params.get('test', False),
+ })
doc = etree.fromstring(manifest)
formats = [(int(f.attrib.get('bitrate', -1)), f) for f in doc.findall(_add_ns('media'))]
doc = etree.fromstring(manifest)
formats = [(int(f.attrib.get('bitrate', -1)), f) for f in doc.findall(_add_ns('media'))]
@@
-234,6
+240,9
@@
class F4mFD(FileDownloader):
metadata = base64.b64decode(media.find(_add_ns('metadata')).text)
boot_info = read_bootstrap_info(bootstrap)
fragments_list = build_fragments_list(boot_info)
metadata = base64.b64decode(media.find(_add_ns('metadata')).text)
boot_info = read_bootstrap_info(bootstrap)
fragments_list = build_fragments_list(boot_info)
+ if self.params.get('test', False):
+ # We only download the first fragment
+ fragments_list = fragments_list[:1]
total_frags = len(fragments_list)
tmpfilename = self.temp_name(filename)
total_frags = len(fragments_list)
tmpfilename = self.temp_name(filename)
@@
-288,6
+297,7
@@
class F4mFD(FileDownloader):
break
frags_filenames.append(frag_filename)
break
frags_filenames.append(frag_filename)
+ dest_stream.close()
self.report_finish(format_bytes(state['downloaded_bytes']), time.time() - start)
self.try_rename(tmpfilename, filename)
self.report_finish(format_bytes(state['downloaded_bytes']), time.time() - start)
self.try_rename(tmpfilename, filename)