From a81276259caf2d8296724422189128d174a6a145 Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Wed, 28 Nov 2007 14:30:29 +0000
Subject: [PATCH] Fix stop_rip

---
 teleoddcast.css => css/teleoddcast.css |  0
 etc/teleoddcast.xml                    |  2 +-
 teleoddcast.py                         | 24 +++++++++++-------------
 3 files changed, 12 insertions(+), 14 deletions(-)
 rename teleoddcast.css => css/teleoddcast.css (100%)

diff --git a/teleoddcast.css b/css/teleoddcast.css
similarity index 100%
rename from teleoddcast.css
rename to css/teleoddcast.css
diff --git a/etc/teleoddcast.xml b/etc/teleoddcast.xml
index 82663a1..5f563c9 100644
--- a/etc/teleoddcast.xml
+++ b/etc/teleoddcast.xml
@@ -12,7 +12,7 @@
             <port>8000</port>
             <sourcepassword>source2parisson</sourcepassword>
             <public>1</public>
-            <root_dir>/var/www/teleoddcast/</root_dir>
+            <root_dir>/var/www/cgi-bin/teleoddcast/</root_dir>
             <odd_conf_file>teleoddcast.cfg</odd_conf_file>
             <lock_file>teleoddcast.lock</lock_file>
         </server>
diff --git a/teleoddcast.py b/teleoddcast.py
index 1ee07f5..06fc316 100755
--- a/teleoddcast.py
+++ b/teleoddcast.py
@@ -71,6 +71,8 @@ class Station(Course):
                                  clean_string(self.course)+'.ogg'
         self.lock_file = self.root_dir + os.sep + self.conf['server']['lock_file']
         self.filename = self.ServerDescription + '.ogg'
+        self.output_dir = self.media_dir + os.sep + self.department + os.sep
+        self.file_dir = self.output_dir + self.ServerName
         self.uid = os.getuid()
         self.odd_pid = get_pid('^oddcastv3 -n [^LIVE]', self.uid)
         self.rip_pid = get_pid('streamripper ' + self.url + self.mount_point, self.uid)
@@ -116,32 +118,28 @@ class Station(Course):
         lock.write(lock_text)
         lock.close()
 
-
     def del_lock(self):
         os.remove(self.lock_file)
 
     def start_rip(self):
-        output_dir = self.media_dir + os.sep + self.department + os.sep
-        #print mount_point
-        if not os.path.exists(output_dir):
-            os.mkdir(output_dir)
+        if not os.path.exists(self.output_dir):
+            os.makedirs(self.output_dir)
         command = 'streamripper ' + self.url + self.mount_point + \
-                  ' -d '+output_dir+' -D "%S" -s -t --quiet > /dev/null &'
+                  ' -d '+self.output_dir+' -D "%S" -s -t --quiet > /dev/null &'
         os.system(command)
 
     def stop_oddcast(self):
         os.system('kill -9 ' + self.odd_pid[0])
         
     def stop_rip(self):
-        print self.rip_pid[0]
+        #print self.rip_pid[0]
         os.system('kill -9 ' + self.rip_pid[0])
         time.sleep(1)
         date = datetime.datetime.now().strftime("%Y")
-        dirname = self.media_dir + os.sep + self.department + os.sep + self.ServerName
-        if os.path.exists(dirname) and os.path.exists(dirname+os.sep+'incomplete'):
-            shutil.move(dirname+os.sep+'incomplete'+os.sep+' - .ogg',dirname+os.sep)
-            shutil.rmtree(dirname+os.sep+'incomplete'+os.sep)
-            os.rename(dirname+os.sep+' - .ogg',dirname+os.sep+self.filename)
+        if os.path.exists(self.file_dir) and os.path.exists(self.file_dir + os.sep + 'incomplete'):
+            shutil.move(self.file_dir+os.sep+'incomplete'+os.sep+' - .ogg', self.file_dir+os.sep)
+            shutil.rmtree(self.file_dir+os.sep+'incomplete'+os.sep)
+            os.rename(self.file_dir+os.sep+' - .ogg', self.file_dir+os.sep+self.filename)
 
     def write_tags(self):
         date = datetime.datetime.now().strftime("%Y")
@@ -166,7 +164,7 @@ class Station(Course):
         self.start_rip()
 
     def stop(self):
-        self.stop_rip
+        self.stop_rip()
         self.write_tags()
         self.stop_oddcast()
         self.del_lock()
-- 
2.39.5