packages: subconv/subconv.py, subconv/subconv.spec - rel 4; fps bugfix

[arekm]

Author: arekm                        Date: Sun Feb 21 10:12:43 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; fps bugfix

---- Files affected:
packages/subconv:
   subconv.py (1.8 -> 1.9) , subconv.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/subconv/subconv.py
diff -u packages/subconv/subconv.py:1.8 packages/subconv/subconv.py:1.9
--- packages/subconv/subconv.py:1.8	Sun Feb 21 11:01:41 2010
+++ packages/subconv/subconv.py	Sun Feb 21 11:12:37 2010
@@ -37,6 +37,8 @@
     def mediainfo_fps(file):
         f = subprocess.Popen(['mediainfo', '--Inform=Video;%FrameRate%', file], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         (out, err) = f.communicate()
+        if out:
+            out = out.strip()
         if not out:
             return False
         return float(out)
@@ -44,6 +46,8 @@
     def file_fps(file):
         f = subprocess.Popen(['file', file], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         (out, err) = f.communicate()
+        if out:
+            out = out.strip()
         if not out:
             return False
         re_fps = re.compile(r'^.*, (\d+\.{0,1}\d{0,}) fps,.*')

================================================================
Index: packages/subconv/subconv.spec
diff -u packages/subconv/subconv.spec:1.6 packages/subconv/subconv.spec:1.7
--- packages/subconv/subconv.spec:1.6	Sun Feb 21 11:02:17 2010
+++ packages/subconv/subconv.spec	Sun Feb 21 11:12:37 2010
@@ -2,7 +2,7 @@
 Summary:	Subtitle formats converter
 Name:		subconv
 Version:	0.3
-Release:	3
+Release:	4
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}.py
@@ -35,6 +35,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2010/02/21 10:12:37  arekm
+- rel 4; fps bugfix
+
 Revision 1.6  2010/02/21 10:02:17  arekm
 - rel 3; mediainfo based fps detection
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/subconv/subconv.py?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/subconv/subconv.spec?r1=1.6&r2=1.7&f=u