fix file_name parsing when no metadata

diff --git a/deefuzz.py b/deefuzz.py
index 9cec8411c3e183830f07a1003c6a2bd77c2a6260..943a75c1208ae080052943d28c49797274843344 100755 (executable)
--- a/deefuzz.py
+++ b/deefuzz.py
@@ -256,7 +256,7 @@ class Station(Thread):
             title = media.metadata['title']
             artist = media.metadata['artist']
             if not (title or artist):
-                song = str(media.file_name)
+                song = str(media.file_title)
             else:
                 song = artist + ' : ' + title
 

diff --git a/tools/mp3.py b/tools/mp3.py
index c1beb5d0adcef3a80250cf7293bac93ab9b3ae43..9e16e9da56ad9e0540c5ce44334c0c6d18c0244e 100644 (file)
--- a/tools/mp3.py
+++ b/tools/mp3.py
@@ -64,7 +64,10 @@ class Mp3:
         self.metadata = self.get_file_metadata()
         self.description = self.get_description()
         self.mime_type = self.get_mime_type()
-        self.file_name, self.file_title, self.file_ext = get_file_info(self.media)
+        self.media_info = get_file_info(self.media)
+        self.file_name = self.media_info[0]
+        self.file_title = self.media_info[1]
+        self.file_ext = self.media_info[2]
         self.extension = self.get_file_extension()
         self.size = os.path.getsize(media)
         #self.args = self.get_args()

diff --git a/tools/tools.py b/tools/tools.py
index 6349d4b688df55e458c7db6c6c4cfde1a62953fc..6abbccb25723bdbdd1d2093e0cf4c3e32a20b5fb 100644 (file)
--- a/tools/tools.py
+++ b/tools/tools.py
@@ -30,7 +30,7 @@ def clean_word(word) :
 
 def get_file_info(media):
     file_name = media.split(os.sep)[-1]
-    file_title = file_name.split('.')[:-2]
+    file_title = file_name.split('.')[:-1]
     try:
         file_title = file_title[0]
     except: