From 9e40e5b9dfb3761820f78051cd0c7a63716a16e7 Mon Sep 17 00:00:00 2001
From: Bezleputh <carton_ben@yahoo.fr>
Date: Tue, 6 May 2014 21:33:45 +0200
Subject: [PATCH] [videoob] Use wget instead of avconv

---
 weboob/applications/videoob/videoob.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/weboob/applications/videoob/videoob.py b/weboob/applications/videoob/videoob.py
index 50127c1b..30453c43 100644
--- a/weboob/applications/videoob/videoob.py
+++ b/weboob/applications/videoob/videoob.py
@@ -97,17 +97,10 @@ class Videoob(ReplApplication):
             if not check_exec('mimms'):
                 return 1
             args = ('mimms', '-r', video.url, dest)
-        elif video.url.endswith('m3u8'):
-            if not check_exec('avconv'):
-                return 1
-
-            r = requests.get(video.url, stream=True)
-            buf = r.iter_lines()
-            r.close()
-            for item in buf:
-                pass
-
-            args = ('avconv', '-i', item, '-codec', 'copy', dest)
+        elif u'm3u8' == video.ext:
+            _dest, _ = os.path.splitext(dest)
+            dest = u'%s.%s' % (_dest, 'mp4')
+            args = ('wget',) + tuple(line for line in self.read_url(video.url) if not line.startswith('#')) + ('-O', dest)
         else:
             if check_exec('wget'):
                 args = ('wget', '-c', video.url, '-O', dest)
@@ -118,6 +111,12 @@ class Videoob(ReplApplication):
 
         os.spawnlp(os.P_WAIT, args[0], *args)
 
+    def read_url(self, url):
+        r = requests.get(url, stream=True)
+        buf = r.iter_lines()
+        r.close()
+        return buf
+
     def complete_download(self, text, line, *ignored):
         args = line.split(' ')
         if len(args) == 2: