fix OSC server loop, fix OGG metadata writing for newest mutagen, fix date metadata

diff --git a/tools/ogg.py b/tools/ogg.py
index 1f40f1eb07668b43d3221ab19166b2d12c2404eb..d7305b0ce8c80153523074e837a778d1232cc76b 100644 (file)
--- a/tools/ogg.py
+++ b/tools/ogg.py
@@ -120,8 +120,7 @@ class Ogg:
             raise IOError('ExporterError: decoder is not compatible.')
 
     def write_tags(self):
-        self.ogg.add_tags()
-        self.ogg.save()
+        #self.ogg.add_tags()
         for tag in self.metadata.keys():
             self.ogg[tag] = str(self.metadata[tag])
         self.ogg.save()

diff --git a/tools/osc.py b/tools/osc.py
index 3aa4ff19e5d9668174a04ac04b91304f9668a659..5e471a947f3502382b324763f4e915fb6c565ff0 100644 (file)
--- a/tools/osc.py
+++ b/tools/osc.py
@@ -53,9 +53,6 @@ class OSCController(Thread):
     def add_method(self, path, type, method):
         self.server.add_method(path, type, method)
 
-    def server(self):
-        return self.server
-
     def run(self):
         while True:
             self.server.recv(100)

diff --git a/tools/station.py b/tools/station.py
index 6bdd21a8a6d67b56ab0e801ed9770b0ec8e50bc7..e1a761a2c54baadc6c6cddfb82f7a8a544d78ea5 100644 (file)
--- a/tools/station.py
+++ b/tools/station.py
@@ -238,6 +238,7 @@ class Station(Thread):
             self.recorder.open(self.rec_file)
         elif value == 0:
             self.recorder.close()
+            date = datetime.datetime.now().strftime("%Y")
             if self.channel.format == 'mp3':
                 media = Mp3(self.record_dir + os.sep + self.rec_file)
             if self.channel.format == 'ogg':
@@ -245,7 +246,8 @@ class Station(Thread):
             media.metadata = {'artist': self.artist.encode('utf-8'),
                                 'title': self.title.encode('utf-8'),
                                 'album': self.short_name.encode('utf-8'),
-                                'genre': self.channel.genre.encode('utf-8')}
+                                'genre': self.channel.genre.encode('utf-8'),
+                                'date' : date.encode('utf-8'),}
             media.write_tags()
         self.record_mode = value
         message = "Received OSC message '%s' with arguments '%d'" % (path, value)