Now supports both old and new AVConv versions

Added unitary test to ensure that the version check of AVConv works fine

src/devedeng/avbase.py

@@ -0,0 +1,62 @@
+#!/usr/bin/env python3
+
+# Copyright 2014 (C) Raster Software Vigo (Sergio Costas)
+#
+# This file is part of DeVeDe-NG
+#
+# DeVeDe-NG is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# DeVeDe-NG is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>
+
+import devedeng.executor
+import subprocess
+
+class avbase(devedeng.executor.executor):
+
+    def check_version(self,cmd):
+
+        try:
+            handle = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE)
+            (stdout, stderr) = handle.communicate()
+            if 0 != handle.wait():
+                return False
+        except:
+            return False
+        self.check_version_txt(stdout)
+
+
+    def check_version_txt(self,vtext):
+
+        self.major_version = 0
+        self.minor_version = 0
+       
+        for line in vtext:
+            if (line.startswith("avconv version")):
+                pos1 = line.find('.',15)
+                pos2 = line.find('-',15)
+                if (pos2 == -1):
+                    return False
+                try:
+                    if (pos1 == -1):
+                        major = int(line[15:pos2].strip())
+                        minor = 0
+                    else:
+                        major = int(line[15:pos1].strip())
+                        minor = int(line[pos1+1:pos2].strip())
+                except:
+                    return False
+                self.major_version = major
+                self.minor_version = minor
+                return True
+        return False
+
+        

src/devedeng/avconv.py

@@ -20,10 +20,10 @@
 import subprocess
 import os
 import devedeng.configuration_data
-import devedeng.executor
+import devedeng.avbase
 import devedeng.mux_dvd_menu
 
-class avconv(devedeng.executor.executor):
+class avconv(devedeng.avbase.avbase):
 
     supports_analize = False
     supports_play = False
@@ -34,6 +34,7 @@ class avconv(devedeng.executor.executor):
     display_name = "AVCONV"
     disc_types = []
 
+
     @staticmethod
     def check_is_installed():
         try:
@@ -99,10 +100,13 @@ class avconv(devedeng.executor.executor):
         except:
             return False
 
+
     def __init__(self):
 
         devedeng.executor.executor.__init__(self)
         self.config = devedeng.configuration_data.configuration.get_config()
+        self.check_version(["avconv","-version"])
+
 
     def convert_file(self,file_project,output_file,video_length,pass2 = False):
 
@@ -203,7 +207,10 @@ class avconv(devedeng.executor.executor):
             if (file_project.width_final != file_project.width_midle) or (file_project.height_final != file_project.height_midle):
                 if (cmd_line!=""):
                     cmd_line+=",fifo,"
-                cmd_line+="scale=w="+str(file_project.width_final)+":h="+str(file_project.height_final)
+                if self.major_version < 11:
+                    cmd_line+="scale="+str(file_project.width_final)+":"+str(file_project.height_final)
+                else:
+                    cmd_line+="scale=w="+str(file_project.width_final)+":h="+str(file_project.height_final)
 
             if cmd_line!="":
                 self.command_var.append("-vf")

src/devedeng/avprobe.py

@@ -23,7 +23,7 @@ import devedeng.executor
 import os
 import json
 
-class avprobe(devedeng.executor.executor):
+class avprobe(devedeng.avbase.avbase):
 
     supports_analize = True
     supports_play = False