projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'naglis/sockshare'
[youtube-dl]
/
youtube_dl
/
utils.py
diff --git
a/youtube_dl/utils.py
b/youtube_dl/utils.py
index 919603c623ed8cd809745c1314442adabf4567c8..bf4d1112f9f62cf6a58a26df3d83bb4326470b1c 100644
(file)
--- a/
youtube_dl/utils.py
+++ b/
youtube_dl/utils.py
@@
-1193,13
+1193,6
@@
def format_bytes(bytes):
return u'%.2f%s' % (converted, suffix)
return u'%.2f%s' % (converted, suffix)
-def str_to_int(int_str):
- if int_str is None:
- return None
- int_str = re.sub(r'[,\.]', u'', int_str)
- return int(int_str)
-
-
def get_term_width():
columns = os.environ.get('COLUMNS', None)
if columns:
def get_term_width():
columns = os.environ.get('COLUMNS', None)
if columns:
@@
-1267,15
+1260,22
@@
class HEADRequest(compat_urllib_request.Request):
return "HEAD"
return "HEAD"
-def int_or_none(v, scale=1, default=None, get_attr=None):
+def int_or_none(v, scale=1, default=None, get_attr=None
, invscale=1
):
if get_attr:
if v is not None:
v = getattr(v, get_attr, None)
if get_attr:
if v is not None:
v = getattr(v, get_attr, None)
- return default if v is None else (int(v) // scale)
+ return default if v is None else (int(v) * invscale // scale)
+
+
+def str_to_int(int_str):
+ if int_str is None:
+ return None
+ int_str = re.sub(r'[,\.]', u'', int_str)
+ return int(int_str)
-def float_or_none(v, scale=1, default=None):
- return default if v is None else (float(v) / scale)
+def float_or_none(v, scale=1,
invscale=1,
default=None):
+ return default if v is None else (float(v)
* invscale
/ scale)
def parse_duration(s):
def parse_duration(s):