Merge branch 'master' of dev.sourcefabric.org:airtime

Conflicts:
	python_apps/api_clients/api_client.py

python_apps/show-recorder/recorder.cfg

@@ -20,3 +20,9 @@ show_schedule_url = 'recorded-shows/format/json/api_key/%%api_key%%'
 
 # URL to upload the recorded show's file to Airtime
 upload_file_url = 'upload-recorded/format/json/api_key/%%api_key%%'
+
+#number of retries to upload file if connection problem
+upload_retries = 3
+
+#time to wait between attempts to upload file if connection problem (in seconds)
+upload_wait = 60

python_apps/show-recorder/testrecordscript.py

@@ -61,7 +61,7 @@ class ShowRecorder(Thread):
         filename = self.filename.replace(" ", "-")
         filepath = "%s%s.%s" % (config["base_recorded_files"], filename, self.filetype)
 
-        command = "ecasound -i alsa -o %s -t:%s -ge:3,1,0,-1" % (filepath, length)
+        command = "ecasound -i alsa -o %s -t:%s -ge:0.1,0.1,0,-1" % (filepath, length)
         args = command.split(" ")
 
         print "starting record"
@@ -145,6 +145,10 @@ class Record():
     def get_shows(self):
 
         shows = self.api_client.get_shows_to_record()
+        if shows is not None:
+            shows = shows[u'shows']
+        else:
+            shows = []
 
         if len(shows):
             self.process_shows(shows)