cleanup

diff --git a/deefuzz-deamon-local.sh b/deefuzz-deamon-local.sh
deleted file mode 100755 (executable)
index eb19e18..0000000
--- a/deefuzz-deamon-local.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-conf_file=$1
-log_file=/tmp/deefuzz.log
-
-set -e
-ulimit -c unlimited
-while true; do
-  ./deefuzz.py $1
-  sleep 3
-done

diff --git a/deefuzz-deamon.sh b/deefuzz-deamon.sh
deleted file mode 100644 (file)
index d662953..0000000
--- a/deefuzz-deamon.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-conf_file=$1
-log_file=/tmp/deefuzz.log
-
-set -e
-ulimit -c unlimited
-while true; do
-  deefuzz.py $1 > /dev/null
-  sleep 3
-done

diff --git a/deefuzz.py b/deefuzz.py
index 3c7841fa1442ea8d655dbce124f9f9a2afc6a05f..17c8eae7f2859cb7e901e73c1cb35cff347b8795 100755 (executable)
--- a/deefuzz.py
+++ b/deefuzz.py
@@ -116,7 +116,7 @@ class DeeFuzz(Thread):
             self.m3u = self.conf['deefuzz']['m3u']
         else:
             self.m3u = '.' + os.sep + 'deefuzz.m3u'
-            
+
     def get_conf_dict(self):
         confile = open(self.conf_file,'r')
         conf_xml = confile.read()
@@ -342,7 +342,7 @@ class Station(Thread):
             return self.playlist[self.index_list[self.id]]
 
     def log_queue(self, it):
-        print 'Station ' + self.short_name + ' eated one queue step: '+str(it)
+        self.logger.write('Station ' + self.short_name + ' eated one queue step: '+str(it))
 
     def media_to_objs(self, media_list):
         media_objs = []
@@ -427,14 +427,12 @@ class Station(Thread):
                     it = q.get(1)
                     try:
                         self.channel.send(__chunk)
-                        #self.logger.write('Station delay (ms) ' + self.short_name + ' : '  + str(self.channel.delay()))
+                        # self.logger.write('Station delay (ms) ' + self.short_name + ' : '  + str(self.channel.delay()))
                         # Sleeping only if delay is positive
                         if self.channel.delay() > 0:
                             self.channel.sync()
                     except:
                         self.logger.write('ERROR : Station ' + self.short_name + ' : could not send the buffer... ')
-                        #self.channel.close()
-                        #self.channel.open()
                     q.task_done()
                 stream.close()
 

diff --git a/tools/ogg.py b/tools/ogg.py
index cf8f5daadada94859215f04f4e21c9855aaae865..64b26e7cc8a2bfafdbd106f4770fa725b398aef6 100644 (file)
--- a/tools/ogg.py
+++ b/tools/ogg.py
@@ -61,9 +61,12 @@ class Ogg:
         self.metadata = self.get_file_metadata()
         self.description = self.get_description()
         self.mime_type = self.get_mime_type()
+        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.file_name = media.split(os.sep)[-1].decode()
         #self.args = self.get_args()
         
     def get_format(self):
@@ -101,7 +104,7 @@ class Ogg:
             except:
                 metadata[key] = ''
         return metadata
-        
+
     def decode(self):
         try:
             os.system('oggdec -o "'+self.cache_dir+os.sep+self.item_id+
@@ -139,34 +142,3 @@ class Ogg:
                 args.append('-c %s="%s"' % (arg, value))
 
         return args
-
-    def process(self, item_id, source, metadata, options=None):
-        self.item_id = item_id
-        self.source = source
-        self.metadata = metadata
-        self.args = self.get_args(options)
-        self.ext = self.get_file_extension()
-        self.args = ' '.join(self.args)
-        self.command = 'sox "%s" -s -q -r 44100 -t wav -c2 - | oggenc %s -' % (self.source, self.args)
-
-        # Pre-proccessing
-        self.dest = self.pre_process(self.item_id,
-                                        self.source,
-                                        self.metadata,
-                                        self.ext,
-                                        self.cache_dir,
-                                        self.options)
-
-        # Processing (streaming + cache writing)
-        stream = self.core_process(self.command, self.buffer_size, self.dest)
-        for chunk in stream:
-            yield chunk
-    
-        # Post-proccessing
-        #self.post_process(self.item_id,
-                        #self.source,
-                        #self.metadata,
-                        #self.ext,
-                        #self.cache_dir,
-                        #self.options)
-