Started refactoring to remove shadowed parameter warnings

Fix for bitrate calcuation (now divide by 1024 instead of chop string) - addresses #55

Signed-off-by: achbed <github@achbed.org>

diff --git a/deefuzzer/tools/logger.py b/deefuzzer/tools/logger.py
index e6b7107f70c5ab01942bfca3af1111885286951a..a07e3021b18942a107d69d7043b6d2b8005f9153 100644 (file)
--- a/deefuzzer/tools/logger.py
+++ b/deefuzzer/tools/logger.py
@@ -8,9 +8,9 @@ from threading import Thread
 class Logger:
     """A logging object"""
 
-    def __init__(self, file):
+    def __init__(self, filepath):
         self.logger = logging.getLogger('myapp')
-        self.hdlr = logging.FileHandler(file)
+        self.hdlr = logging.FileHandler(filepath)
         self.formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
         self.hdlr.setFormatter(self.formatter)
         self.logger.addHandler(self.hdlr)
@@ -26,9 +26,9 @@ class Logger:
 class QueueLogger(Thread):
     """A queue-based logging object"""
 
-    def __init__(self, file, q):
+    def __init__(self, filepath, q):
         Thread.__init__(self)
-        self.logger = Logger(file)
+        self.logger = Logger(filepath)
         self.q = q
 
     def run(self):

diff --git a/deefuzzer/tools/mp3.py b/deefuzzer/tools/mp3.py
index f0e52c19ce635157aca8d16395bcea48dda6b6db..4581300db3fd5a7472fe1b9336e703e313cac64a 100644 (file)
--- a/deefuzzer/tools/mp3.py
+++ b/deefuzzer/tools/mp3.py
@@ -58,7 +58,7 @@ class Mp3:
         self.item_id = ''
         self.source = self.media
         self.options = {}
-        self.bitrate_default = '192'
+        self.bitrate_default = 192
         self.cache_dir = os.sep + 'tmp'
         self.keys2id3 = {
             'title': 'TIT2',
@@ -72,7 +72,11 @@ class Mp3:
         }
         self.mp3 = MP3(self.media, ID3=EasyID3)
         self.info = self.mp3.info
-        self.bitrate = int(str(self.info.bitrate)[:-3])
+        self.bitrate = self.bitrate_default
+        try:
+            self.bitrate = int(self.info.bitrate / 1024)
+        except:
+            pass
         self.length = datetime.timedelta(0, self.info.length)
         try:
             self.metadata = self.get_file_metadata()