Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x

airtime_mvc/application/controllers/PreferenceController.php

@@ -139,18 +139,14 @@ class PreferenceController extends Zend_Controller_Action
     {
         $CC_CONFIG = Config::getConfig();
 
-        if(Application_Model_Preference::GetPlanLevel() == 'disabled'){
-            
         $baseUrl = Application_Common_OsPath::getBaseDir();
 
         $this->view->headScript()->appendFile($baseUrl.'js/serverbrowse/serverbrowser.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'js/airtime/preferences/musicdirs.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
 
         $watched_dirs_pref = new Application_Form_WatchedDirPreferences();
-
         $this->view->form = $watched_dirs_pref;
     }
-    }
 
     public function streamSettingAction()
     {

airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml

@@ -39,7 +39,7 @@
         <?php if (count($watched_dirs) > 0): ?>
             <?php foreach($watched_dirs as $watched_dir): ?>
                 <dd class="block-display selected-item">
-                    <?php echo ($watched_dir->getExistsFlag())?"":"<span class='ui-icon-alert'><img src='/css/images/warning-icon.png'></span>"?><span id="folderPath" style="display:block; width:350px"><?php echo $watched_dir->getDirectory();?></span></span>
+                    <?php echo ($watched_dir->getExistsFlag())?"":"<span class='ui-icon-alert'><img src='/css/images/warning-icon.png'></span>"?><span id="folderPath" style="display:block; width:350px"><?php echo htmlspecialchars($watched_dir->getDirectory());?></span></span>
                     <span title="<?php echo _("Rescan watched directory (This is useful if it is network mount and may be out of sync with Airtime)")?>" class="ui-icon ui-icon-refresh"></span>
                     <span title="<?php echo _("Remove watched directory")?>" class="ui-icon ui-icon-close"></span>
                     

python_apps/api_clients/api_client.py

@@ -146,7 +146,6 @@ class AirtimeApiClient(object):
             sys.exit(1)
 
     def __get_airtime_version(self):
-        # TODO : maybe fix this function to drop an exception?
         try: return self.services.version_url()[u'version']
         except Exception: return -1
 
@@ -154,18 +153,18 @@ class AirtimeApiClient(object):
         logger = self.logger
         version = self.__get_airtime_version()
         # logger.info('Airtime version found: ' + str(version))
-        if (version == -1):
+        if version == -1:
             if (verbose):
                 logger.info('Unable to get Airtime version number.\n')
             return False
-        elif (version[0:3] != AIRTIME_VERSION[0:3]):
+        elif version[0:3] != AIRTIME_VERSION[0:3]:
-            if (verbose):
+            if verbose:
                 logger.info('Airtime version found: ' + str(version))
                 logger.info('pypo is at version ' + AIRTIME_VERSION +
                     ' and is not compatible with this version of Airtime.\n')
             return False
         else:
-            if (verbose):
+            if verbose:
                 logger.info('Airtime version: ' + str(version))
                 logger.info('pypo is at version ' + AIRTIME_VERSION + ' and is compatible with this version of Airtime.')
             return True
@@ -193,14 +192,6 @@ class AirtimeApiClient(object):
             self.logger.error(str(e))
             return None
 
-    # TODO : get this routine out of here it doesn't belong at all here
-    def get_liquidsoap_data(self, pkey, schedule):
-        playlist = schedule[pkey]
-        data = dict()
-        try: data["schedule_id"] = playlist['id']
-        except Exception: data["schedule_id"] = 0
-        return data
-
     def get_shows_to_record(self):
         try:
             return self.services.show_schedule_url()
@@ -259,12 +250,12 @@ class AirtimeApiClient(object):
         url = url.replace("%%api_key%%", self.config["api_key"])
         return url
 
+    """
+    Caller of this method needs to catch any exceptions such as
+    ValueError thrown by json.loads or URLError by urllib2.urlopen
+    """
     def setup_media_monitor(self):
-        try:
         return self.services.media_setup_url()
-        except Exception, e:
-            #TODO
-            self.logger.info(str(e))
 
     def send_media_monitor_requests(self, action_list, dry=False):
         """
@@ -323,37 +314,40 @@ class AirtimeApiClient(object):
             self.logger.error("Could not find index 'files' in dictionary: %s",
                     str(response))
             return []
-
+    """
+    Caller of this method needs to catch any exceptions such as
+    ValueError thrown by json.loads or URLError by urllib2.urlopen
+    """
     def list_all_watched_dirs(self):
-        try:
         return self.services.list_all_watched_dirs()
-        except Exception, e:
-            #TODO
-            self.logger.error(str(e))
 
+    """
+    Caller of this method needs to catch any exceptions such as
+    ValueError thrown by json.loads or URLError by urllib2.urlopen
+    """
     def add_watched_dir(self, path):
-        try:
         return self.services.add_watched_dir(path=base64.b64encode(path))
-        except Exception, e:
-            #TODO
-            self.logger.error(str(e))
 
+    """
+    Caller of this method needs to catch any exceptions such as
+    ValueError thrown by json.loads or URLError by urllib2.urlopen
+    """
     def remove_watched_dir(self, path):
-        try:
         return self.services.remove_watched_dir(path=base64.b64encode(path))
-        except Exception, e:
-            #TODO
-            self.logger.error(str(e))
 
+    """
+    Caller of this method needs to catch any exceptions such as
+    ValueError thrown by json.loads or URLError by urllib2.urlopen
+    """
     def set_storage_dir(self, path):
         return self.services.set_storage_dir(path=base64.b64encode(path))
 
+    """
+    Caller of this method needs to catch any exceptions such as
+    ValueError thrown by json.loads or URLError by urllib2.urlopen
+    """
     def get_stream_setting(self):
-        logger = self.logger
+        return self.services.get_stream_setting()
-        try: return self.services.get_stream_setting()
-        except Exception, e:
-            logger.error("Exception: %s", e)
-            return None
 
     def register_component(self, component):
         """ Purpose of this method is to contact the server with a "Hey its
@@ -361,11 +355,7 @@ class AirtimeApiClient(object):
         (component = media-monitor, pypo etc.) ip address, and later use it
         to query monit via monit's http service, or download log files via a
         http server. """
-        try:
         return self.services.register_component(component=component)
-        except Exception, e:
-            #TODO
-            self.logger.error(str(e))
 
     def notify_liquidsoap_status(self, msg, stream_id, time):
         logger = self.logger
@@ -388,11 +378,7 @@ class AirtimeApiClient(object):
 
     def get_bootstrap_info(self):
         """ Retrieve infomations needed on bootstrap time """
-        try:
         return self.services.get_bootstrap_info()
-        except Exception, e:
-            #TODO
-            self.logger.error(str(e))
 
     def get_files_without_replay_gain_value(self, dir_id):
         """
@@ -404,8 +390,8 @@ class AirtimeApiClient(object):
         try:
             return self.services.get_files_without_replay_gain(dir_id=dir_id)
         except Exception, e:
-            #TODO
             self.logger.error(str(e))
+            return []
 
     def get_files_without_silan_value(self):
         """
@@ -416,20 +402,16 @@ class AirtimeApiClient(object):
         try:
             return self.services.get_files_without_silan_value()
         except Exception, e:
-            #TODO
             self.logger.error(str(e))
+            return []
 
     def update_replay_gain_values(self, pairs):
         """
         'pairs' is a list of pairs in (x, y), where x is the file's database
         row id and y is the file's replay_gain value in dB
         """
-        try:
         self.logger.debug(self.services.update_replay_gain_value(
             _post_data={'data': json.dumps(pairs)}))
-        except Exception, e:
-            #TODO
-            self.logger.error(str(e))
 
 
     def update_cue_values_by_silan(self, pairs):
@@ -437,11 +419,7 @@ class AirtimeApiClient(object):
         'pairs' is a list of pairs in (x, y), where x is the file's database
         row id and y is the file's cue values in dB
         """
-        try:
+        return self.services.update_cue_values_by_silan(_post_data={'data': json.dumps(pairs)})
-            print self.services.update_cue_values_by_silan(_post_data={'data': json.dumps(pairs)})
-        except Exception, e:
-            #TODO
-            self.logger.error(str(e))
 
 
     def notify_webstream_data(self, data, media_id):
@@ -449,30 +427,18 @@ class AirtimeApiClient(object):
         Update the server with the latest metadata we've received from the
         external webstream
         """
-        try:
         self.logger.info( self.services.notify_webstream_data.req(
             _post_data={'data':data}, media_id=str(media_id)).retry(5))
-        except Exception, e:
-            #TODO
-            self.logger.error(str(e))
 
     def get_stream_parameters(self):
-        try:
         response = self.services.get_stream_parameters()
         self.logger.debug(response)
         return response
-        except Exception, e:
-            #TODO
-            self.logger.error(str(e))
 
     def push_stream_stats(self, data):
         # TODO : users of this method should do their own error handling
-        try:
         response = self.services.push_stream_stats(_post_data={'data': json.dumps(data)})
         return response
-        except Exception, e:
-            #TODO
-            self.logger.error(str(e))
 
     def update_stream_setting_table(self, data):
         try:

python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py

@@ -69,7 +69,7 @@ class AirtimeMediaMonitorBootstrap():
             return json["dirs"]
         except KeyError as e:
             self.logger.error("Could not find index 'dirs' in dictionary: %s", str(json))
-            self.logger.error(e)
+            self.logger.error(str(e))
             return {}
 
     """

python_apps/media-monitor2/media/monitor/syncdb.py

@@ -19,6 +19,7 @@ class AirtimeDB(Loggable):
 
         saas = user().root_path
 
+        try:
             # dirs_setup is a dict with keys:
             # u'watched_dirs' and u'stor' which point to lists of corresponding
             # dirs
@@ -44,6 +45,9 @@ class AirtimeDB(Loggable):
             # store...
             self.watched_directories = set([ os.path.normpath(p) for p in
                 dirs_setup[u'watched_dirs'] ])
+        except Exception, e:
+            self.logger.info(str(e))
+
 
     def to_id(self, directory):
         """ directory path -> id """

python_apps/media-monitor2/media/saas/launcher.py

@@ -85,7 +85,15 @@ class MM2(InstanceThread, Loggable):
         ToucherThread(path=user().touch_file_path(),
                 interval=int(config['touch_interval']))
 
+        success = False
+        while not success:
+            try:
                 apiclient.register_component('media-monitor')
+                success = True
+            except Exception, e:
+                self.logger.error(str(e))
+                import time
+                time.sleep(10)
 
         manager.loop()
 

python_apps/pypo/liquidsoap_scripts/generate_liquidsoap_cfg.py

@@ -26,13 +26,10 @@ def generate_liquidsoap_config(ss):
 
 logging.basicConfig(format='%(message)s')
 ac = AirtimeApiClient(logging.getLogger())
-ss = ac.get_stream_setting()
-
-if ss is not None:
 try:
+    ss = ac.get_stream_setting()
     generate_liquidsoap_config(ss)
 except Exception, e:
-        logging.error(e)
+    logging.error(str(e))
-else:
     print "Unable to connect to the Airtime server."
     sys.exit(1)

python_apps/pypo/listenerstat.py

@@ -103,7 +103,10 @@ class ListenerStat(Thread):
                     self.update_listener_stat_error(v["mount"], 'OK')
                 except Exception, e:
                     self.logger.error('Exception: %s', e)
+                    try:
                         self.update_listener_stat_error(v["mount"], str(e))
+                    except Exception, e:
+                        self.logger.error('Exception: %s', e)
 
         return stats
 

python_apps/pypo/media/update/replaygainupdater.py

@@ -67,15 +67,15 @@ class ReplayGainUpdater(Thread):
                 self.logger.error(e)
                 self.logger.debug(traceback.format_exc())
     def run(self):
-        try:
         while True:
-                self.logger.info("Runnning replaygain updater")
+            try:
+                self.logger.info("Running replaygain updater")
                 self.main()
                 # Sleep for 5 minutes in case new files have been added
-                time.sleep(60 * 5)
             except Exception, e:
                 self.logger.error('ReplayGainUpdater Exception: %s', traceback.format_exc())
                 self.logger.error(e)
+            time.sleep(60 * 5)
 
 if __name__ == "__main__":
     rgu = ReplayGainUpdater()

python_apps/pypo/pypocli.py

@@ -179,7 +179,14 @@ if __name__ == '__main__':
 
     ReplayGainUpdater.start_reply_gain(api_client)
 
-    api_client.register_component("pypo")
+    success = False
+    while not success:
+        try:
+            api_client.register_component('pypo')
+            success = True
+        except Exception, e:
+            logger.error(str(e))
+            time.sleep(10)
 
     pypoFetch_q = Queue()
     recorder_q = Queue()

python_apps/pypo/pypofetch.py

@@ -206,10 +206,12 @@ class PypoFetch(Thread):
     """
     def set_bootstrap_variables(self):
         self.logger.debug('Getting information needed on bootstrap from Airtime')
+        try:
             info = self.api_client.get_bootstrap_info()
-        if info is None:
+        except Exception, e:
             self.logger.error('Unable to get bootstrap info.. Exiting pypo...')
-        else:
+            self.logger.error(str(e))
+
         self.logger.debug('info:%s', info)
         commands = []
         for k, v in info['switch_status'].iteritems():

python_apps/pypo/recorder.py

@@ -189,9 +189,17 @@ class Recorder(Thread):
         self.server_timezone = ''
         self.queue           = q
         self.loops           = 0
-        self.api_client.register_component("show-recorder")
         self.logger.info("RecorderFetch: init complete")
 
+        success = False
+        while not success:
+            try:
+                self.api_client.register_component('show-recorder')
+                success = True
+            except Exception, e:
+                self.logger.error(str(e))
+                time.sleep(10)
+
     def handle_message(self):
         if not self.queue.empty():
             message = self.queue.get()

utils/airtime-import/airtime-import.py

@@ -75,10 +75,11 @@ def format_dir_string(path):
     return path
 
 def helper_get_stor_dir():
+    try:
         res = api_client.list_all_watched_dirs()
-    if(res is None):
+    except Exception, e:
         return res
-    else:
+
     if(res['dirs']['1'][-1] != '/'):
         out = res['dirs']['1']+'/'
         return out
@@ -162,8 +163,9 @@ def WatchAddAction(option, opt, value, parser):
     path = apc.encode_to(path, 'utf-8')
     if(os.path.isdir(path)):
         #os.chmod(path, 0765)
+        try:
             res = api_client.add_watched_dir(path)
-        if(res is None):
+        except Exception, e:
             exit("Unable to connect to the server.")
         # sucess
         if(res['msg']['code'] == 0):
@@ -179,8 +181,9 @@ def WatchListAction(option, opt, value, parser):
     errorIfMultipleOption(parser.rargs)
     if(len(parser.rargs) > 0):
         raise OptionValueError("This option doesn't take any arguments.")
+    try:
         res = api_client.list_all_watched_dirs()
-    if(res is None):
+    except Exception, e:
         exit("Unable to connect to the Airtime server.")
     dirs = res["dirs"].items()
     # there will be always 1 which is storage folder
@@ -204,8 +207,9 @@ def WatchRemoveAction(option, opt, value, parser):
         path = currentDir+path
     path = apc.encode_to(path, 'utf-8')
     if(os.path.isdir(path)):
+        try:
             res = api_client.remove_watched_dir(path)
-        if(res is None):
+        except Exception, e:
             exit("Unable to connect to the Airtime server.")
         # sucess
         if(res['msg']['code'] == 0):
@@ -249,10 +253,11 @@ def StorageSetAction(option, opt, value, parser):
         path = currentDir+path
     path = apc.encode_to(path, 'utf-8')
     if(os.path.isdir(path)):
+        try:
             res = api_client.set_storage_dir(path)
-        if(res is None):
+        except Exception, e:
             exit("Unable to connect to the Airtime server.")
-        # sucess
+        # success
         if(res['msg']['code'] == 0):
             print "Successfully set storage folder to %s" % path
         else:

utils/airtime-silan/airtime-silan.py

@@ -68,7 +68,7 @@ try:
         subtotal += total
         total = 0
         try:
-            api_client.update_cue_values_by_silan(processed_data)
+            print api_client.update_cue_values_by_silan(processed_data)
         except Exception ,e:
             print e
             print traceback.format_exc()