From bca2c3eed387125296f14d7544ba9887065bf1d8 Mon Sep 17 00:00:00 2001
From: Mort Yao <soi@mort.ninja>
Date: Sat, 26 Mar 2016 16:49:03 +0100
Subject: [PATCH 1/5] [util.strings] use 4-space indentation

---
 src/you_get/util/strings.py | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/you_get/util/strings.py b/src/you_get/util/strings.py
index 7e74f35e..a81cc15c 100644
--- a/src/you_get/util/strings.py
+++ b/src/you_get/util/strings.py
@@ -1,25 +1,25 @@
 try:
-  # py 3.4
-  from html import unescape as unescape_html
+    # py 3.4
+    from html import unescape as unescape_html
 except ImportError:
-  import re
-  from html.entities import entitydefs
+    import re
+    from html.entities import entitydefs
 
-  def unescape_html(string):
-    '''HTML entity decode'''
-    string = re.sub(r'&#[^;]+;', _sharp2uni, string)
-    string = re.sub(r'&[^;]+;', lambda m: entitydefs[m.group(0)[1:-1]], string)
-    return string
+    def unescape_html(string):
+        '''HTML entity decode'''
+        string = re.sub(r'&#[^;]+;', _sharp2uni, string)
+        string = re.sub(r'&[^;]+;', lambda m: entitydefs[m.group(0)[1:-1]], string)
+        return string
 
-  def _sharp2uni(m):
-    '''&#...; ==> unicode'''
-    s = m.group(0)[2:].rstrip(';；')
-    if s.startswith('x'):
-      return chr(int('0'+s, 16))
-    else:
-      return chr(int(s))
+    def _sharp2uni(m):
+        '''&#...; ==> unicode'''
+        s = m.group(0)[2:].rstrip(';；')
+        if s.startswith('x'):
+            return chr(int('0'+s, 16))
+        else:
+            return chr(int(s))
 
 from .fs import legitimize
 
 def get_filename(htmlstring):
-  return legitimize(unescape_html(htmlstring))
+    return legitimize(unescape_html(htmlstring))

From 7af203e8e346ae3b8bedd45e92dc4aa25b19cb7d Mon Sep 17 00:00:00 2001
From: Mort Yao <soi@mort.ninja>
Date: Sat, 26 Mar 2016 16:49:28 +0100
Subject: [PATCH 2/5] [util.strings] add parameterize()

---
 src/you_get/util/strings.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/you_get/util/strings.py b/src/you_get/util/strings.py
index a81cc15c..26d55594 100644
--- a/src/you_get/util/strings.py
+++ b/src/you_get/util/strings.py
@@ -23,3 +23,6 @@ from .fs import legitimize
 
 def get_filename(htmlstring):
     return legitimize(unescape_html(htmlstring))
+
+def parameterize(string):
+    return "'%s'" % string.replace("'", r"'\''")

From 46a1f51a8f8c0bd308d69ea32e4e63082c656a9f Mon Sep 17 00:00:00 2001
From: Mort Yao <soi@mort.ninja>
Date: Sat, 26 Mar 2016 16:56:08 +0100
Subject: [PATCH 3/5] [ffmpeg] fix #1009

---
 src/you_get/processor/ffmpeg.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/you_get/processor/ffmpeg.py b/src/you_get/processor/ffmpeg.py
index 7262c462..e4ea1223 100644
--- a/src/you_get/processor/ffmpeg.py
+++ b/src/you_get/processor/ffmpeg.py
@@ -2,6 +2,7 @@
 
 import os.path
 import subprocess
+from ..util.strings import parameterize
 
 def get_usable_ffmpeg(cmd):
     try:
@@ -53,7 +54,7 @@ def ffmpeg_concat_mp4_to_mpg(files, output='output.mpg'):
         concat_list = open(output + '.txt', 'w', encoding="utf-8")
         for file in files:
             if os.path.isfile(file):
-                concat_list.write("file '%s'\n" % file)
+                concat_list.write("file %s\n" % parameterize(file))
         concat_list.close()
 
         params = [FFMPEG] + LOGLEVEL
@@ -118,7 +119,7 @@ def ffmpeg_concat_flv_to_mp4(files, output='output.mp4'):
             if os.path.isfile(file):
                 # for escaping rules, see:
                 # https://www.ffmpeg.org/ffmpeg-utils.html#Quoting-and-escaping
-                concat_list.write("file '%s'\n" % file.replace("'", r"'\''"))
+                concat_list.write("file %s\n" % parameterize(file))
         concat_list.close()
 
         params = [FFMPEG] + LOGLEVEL + ['-f', 'concat', '-y', '-i']
@@ -163,7 +164,7 @@ def ffmpeg_concat_mp4_to_mp4(files, output='output.mp4'):
         concat_list = open(output + '.txt', 'w', encoding="utf-8")
         for file in files:
             if os.path.isfile(file):
-                concat_list.write("file '%s'\n" % file)
+                concat_list.write("file %s\n" % parameterize(file))
         concat_list.close()
 
         params = [FFMPEG] + LOGLEVEL + ['-f', 'concat', '-y', '-i']

From 4c012aeba4fec035f14696b81eb65fce1fd703bb Mon Sep 17 00:00:00 2001
From: Mort Yao <soi@mort.ninja>
Date: Sat, 26 Mar 2016 16:56:54 +0100
Subject: [PATCH 4/5] [common] do not download captions with --player

---
 src/you_get/common.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/you_get/common.py b/src/you_get/common.py
index a417bcc7..9c732693 100755
--- a/src/you_get/common.py
+++ b/src/you_get/common.py
@@ -1160,6 +1160,7 @@ def script_main(script_name, download, download_playlist, **kwargs):
             output_dir = a
         elif o in ('-p', '--player'):
             player = a
+            caption = False
         elif o in ('-x', '--http-proxy'):
             proxy = a
         elif o in ('-y', '--extractor-proxy'):

From ea0b81ad1e56935e14429e3b064300b679c61ce1 Mon Sep 17 00:00:00 2001
From: Mort Yao <soi@mort.ninja>
Date: Sat, 26 Mar 2016 17:24:40 +0100
Subject: [PATCH 5/5] version 0.4.365

---
 src/you_get/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/you_get/version.py b/src/you_get/version.py
index a9872b96..d8db720e 100644
--- a/src/you_get/version.py
+++ b/src/you_get/version.py
@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 
 script_name = 'you-get'
-__version__ = '0.4.350'
+__version__ = '0.4.365'