From aa4e6cbf842b09f9b72be5efa0e45ae98a7af248 Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Fri, 5 Aug 2011 22:50:02 +0200
Subject: Comprehension list for all !

---
 lib/audio.py | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'lib')

diff --git a/lib/audio.py b/lib/audio.py
index f1f53ff..613a0cb 100644
--- a/lib/audio.py
+++ b/lib/audio.py
@@ -42,7 +42,6 @@ class OggStripper(parser.GenericParser):
             Check if the "metadata" block is present in the file
         '''
         mfile = OggVorbis(self.filename)
-        print mfile.tags
         if mfile.tags == []:
             return True
         else:
@@ -54,8 +53,7 @@ class OggStripper(parser.GenericParser):
         '''
         metadata = {}
         mfile = OggVorbis(self.filename)
-        for key, value in mfile.tags:
-            metadata[key] = value
+        [metadata[key] = value for key, value in mfile.tags]
         return metadata
 
 class Apev2Stripper(parser.GenericParser):
@@ -90,10 +88,8 @@ class Apev2Stripper(parser.GenericParser):
         '''
         metadata = {}
         mfile = APEv2File(self.filename)
-        if mfile.tags is None:
-            return metadata
-        for key, value in mfile.tags:
-            metadata[key] = value
+        if mfile.tags is not None:
+            [metadata[key] = value for key, value in mfile.tags]
         return metadata
 
 
@@ -130,10 +126,8 @@ class FlacStripper(parser.GenericParser):
         '''
         metadata = {}
         mfile = FLAC(self.filename)
-        if mfile.tags is None:
-            return metadata
-        for key, value in mfile.tags:
-            metadata[key] = value
-        if mfile.pictures != []:
-            metadata['picture :'] = 'yes'
+        if mfile.tags is not None:
+            [metadata[key] = value for key, value in mfile.tags]
+            if mfile.pictures != []:
+                metadata['picture :'] = 'yes'
         return metadata
-- 
cgit v1.3