Merge branch '2.3.x' into 2.3.x-saas

python_apps/api_clients/api_client.cfg

@@ -115,7 +115,7 @@ get_bootstrap_info = 'get-bootstrap-info/format/json/api_key/%%api_key%%'
 
 get_files_without_replay_gain = 'get-files-without-replay-gain/api_key/%%api_key%%/dir_id/%%dir_id%%'
 
-update_replay_gain_value = 'update-replay-gain-value/api_key/%%api_key%%'
+update_replay_gain_value = 'update-replay-gain-value/format/json/api_key/%%api_key%%'
 
 notify_webstream_data = 'notify-webstream-data/api_key/%%api_key%%/media_id/%%media_id%%/format/json'
 

python_apps/media-monitor2/media/metadata/process.py

@@ -174,7 +174,8 @@ def normalize_mutagen(path):
     try:
         command = ['silan', '-f', 'JSON', md['path']]
         proc = subprocess.Popen(command, stdout=subprocess.PIPE)
-        out = proc.stdout.read()
+        out = proc.communicate()[0].strip('\r\n')
+
         info = json.loads(out)
         md['cuein'] = info['sound'][0][0]
         md['cueout'] = info['sound'][-1][1]

python_apps/pypo/media/update/replaygainupdater.py

@@ -58,7 +58,9 @@ class ReplayGainUpdater(Thread):
 
                     try:
                         self.api_client.update_replay_gain_values(processed_data)
-                    except Exception as e: self.unexpected_exception(e)
+                    except Exception as e:
+                        self.logger.error(e)
+                        self.logger.debug(traceback.format_exc())
 
                     if len(files) == 0: break
                 self.logger.info("Processed: %d songs" % total)