(no commit message)

diff --git a/teleoddcast.cfg b/teleoddcast.cfg
index 10217762b2a87b6a66bdd8d4ac3a868af42f773c..aeb7541017107e803bc295d87588b1c2a7830197 100644 (file)
--- a/teleoddcast.cfg
+++ b/teleoddcast.cfg
@@ -1,7 +1,7 @@
 Server=localhost
 Port=8000
 ServerPassword=source2parisson
-ServerMountpoint=/My_best_funky_station_-_AE_-_Adm_Correction.ogg
+ServerMountpoint=/My_best_funky_station_-_AE_-_Penal_Cours.ogg
 ServerPublic=0
 AutomaticReconnectSecs=10
 Encode=OggVorbis
@@ -13,8 +13,8 @@ ServerType=Icecast2
 ExternalFile=/home/pre-barreau/augustins/audio/
 #YP Settings
 ServerStreamURL=http://www.pre-barreau.com
-ServerName=My_best_funky_station_-_AE_-_Adm_Correction_-_1
-ServerDescription=My_best_funky_station_-_AE_-_Adm_Correction_-_1_-_zeaf_-_zef
+ServerName=My_best_funky_station_-_AE_-_Penal_Cours_-_1
+ServerDescription=My_best_funky_station_-_AE_-_Penal_Cours_-_1_-_zad_-_azdf
 ServerGenre=Teaching
 #Advanced Settings
 LogLevel=1

diff --git a/teleoddcast.py b/teleoddcast.py
index ed570dbc1353109e8e63f3275be3f7ea7f419057..d1fdfde0c8fb06924f4a6f5132eb786bcf411a77 100755 (executable)
--- a/teleoddcast.py
+++ b/teleoddcast.py
@@ -137,9 +137,7 @@ class TeleOddCast(Course):
         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 + \
-                  clean_string('_-_'.join(self.server_name))
-                  
+        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)