Add refresh button, clean modules

diff --git a/etc/telecaster_mp3.xml b/etc/telecaster_mp3.xml
index b2b171644f9bcd9a20b6f3db4c232b3cbec486c1..635a190130d8baf0293604e818135bcae35ac031 100644 (file)
--- a/etc/telecaster_mp3.xml
+++ b/etc/telecaster_mp3.xml
@@ -19,8 +19,8 @@
     </server>
     <media>
         <record>true</record>
-        <dir>/home/prebarreau/media</dir>
-        <raw_dir>/home/prebarreau/backup</raw_dir>
+        <dir>/tmp/media</dir>
+        <raw_dir>/tmp/backup</raw_dir>
         <format>mp3</format>
         <bitrate>96</bitrate>
         <ogg_quality>3</ogg_quality>

diff --git a/tools/tools.py b/tools/tools.py
index 63340adf7f00f740ffea1c3b92cd46bee317fb7a..89fcfa17349176d05f1bb6fcbf8ed9f65a783504 100644 (file)
--- a/tools/tools.py
+++ b/tools/tools.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# -*- coding: utf-8 -*-
 # *-* coding: utf-8 *-*
 """
    teleoddcast
@@ -27,7 +28,6 @@ import datetime
 import string
 import time
 from xmltodict import *
-from mutagen.oggvorbis import OggVorbis
 import socket
 import fcntl
 import struct

diff --git a/webview.py b/webview.py
index b1763aac7fc40cb78a22ddeae2f0f24a2c77de3e..27615450d4dce283d746b8c4c12103ea1bffbd4c 100644 (file)
--- a/webview.py
+++ b/webview.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# -*- coding: utf-8 -*-
 # *-* coding: utf-8 *-*
 """
    telecaster
@@ -231,9 +232,10 @@ class WebView(FieldStorage):
         print "<div class=\"tools\">"
         print "<div class=\"buttons\">"
         #print "<INPUT TYPE = hidden NAME = \"action\" VALUE = \"start\">"
-        print "<button type=\"submit\" name=\"action\" value=\"start\" class=\"negative\"><img src=\"img/stop.png\" alt=\"\">Enregistrer</button>"
+        print "<button type=\"submit\" name=\"action\" value=\"start\" class=\"negative\"><img src=\"img/stop.png\" alt=\"\">Record</button>"
+        print "<button type=\"submit\" class=\"positive\"><img src=\"img/arrow_refresh.png\" alt=\"\">Refresh</button>"
         print "<a href=\""+self.url+"/media/\"><img src=\"img/folder_go.png\" alt=\"\">Archives</a>"
-        print "<a href=\""+self.url+"/backup/\"><img src=\"img/bin.png\" alt=\"\">Corbeille</a>"
+        print "<a href=\""+self.url+"/backup/\"><img src=\"img/bin.png\" alt=\"\">Trash</a>"
         #print "<INPUT TYPE = submit VALUE = \"Enregistrer\">"
         print "</div>"
         print "</div>"
@@ -282,6 +284,7 @@ class WebView(FieldStorage):
             print "<button type=\"submit\" class=\"positive\"><img src=\"img/transmit_add.png\" alt=\"\">Diffusing...</button>"
         else:
             print "<button type=\"submit\" class=\"negative\"><img src=\"img/transmit_error.png\" alt=\"\">NOT Diffusing !</button>"
+        print "<button type=\"submit\"><img src=\"img/arrow_refresh.png\" alt=\"\">Refresh</button>"
         print "<a href=\""+self.url+":"+self.port+"/"+clean_string(self.title)+"_-_"+clean_string(department)+"_-_"+clean_string(conference)+"."+self.format+".m3u\"><img src=\"img/control_play_blue.png\" alt=\"\">Play</a>"
         print "<button type=\"submit\" name=\"action\" value=\"stop\" class=\"negative\"><img src=\"img/cancel.png\" alt=\"\">Stop</button>"
         print "</div>"