From 762b8e1e46c562afbd2e1c5418c53eeef85c082d Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Wed, 8 Aug 2012 11:48:50 -0400
Subject: [PATCH 1/2] CC-4173: ReplayGain calculation fails on Ubuntu Lucid
amd64
-added logging to see what exception could be
-incorrectly using temp_file_path instead of original file_path to find extension
---
.../airtimefilemonitor/replaygain.py | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/python_apps/media-monitor/airtimefilemonitor/replaygain.py b/python_apps/media-monitor/airtimefilemonitor/replaygain.py
index bcb9cf6a7..e10b7a3f2 100644
--- a/python_apps/media-monitor/airtimefilemonitor/replaygain.py
+++ b/python_apps/media-monitor/airtimefilemonitor/replaygain.py
@@ -4,11 +4,16 @@ import os
import sys
import shutil
import tempfile
+import logging
+
+
+logger = logging.getLogger()
def get_process_output(command):
"""
Run subprocess and return stdout
"""
+ logger.debug(command)
p = Popen(command, shell=True, stdout=PIPE)
return p.communicate()[0].strip()
@@ -22,7 +27,7 @@ def run_process(command):
def get_mime_type(file_path):
"""
Attempts to get the mime type but will return prematurely if the process
- takes longer than 5 seconds. Note that this function should only be called
+ takes longer than 5 seconds. Note that this function should only be called
for files which do not have a mp3/ogg/flac extension.
"""
@@ -48,27 +53,27 @@ def calculate_replay_gain(file_path):
"""
This function accepts files of type mp3/ogg/flac and returns a calculated ReplayGain value in dB.
If the value cannot be calculated for some reason, then we default to 0 (Unity Gain).
-
+
http://wiki.hydrogenaudio.org/index.php?title=ReplayGain_1.0_specification
"""
try:
"""
Making a duplicate is required because the ReplayGain extraction utilities we use
- make unwanted modifications to the file.
+ make unwanted modifications to the file.
"""
search = None
temp_file_path = duplicate_file(file_path)
- if re.search(r'mp3$', temp_file_path, re.IGNORECASE) or get_mime_type(temp_file_path) == "audio/mpeg":
+ if re.search(r'mp3$', file_path, re.IGNORECASE) or get_mime_type(temp_file_path) == "audio/mpeg":
if run_process("which mp3gain > /dev/null") == 0:
out = get_process_output('mp3gain -q "%s" 2> /dev/null' % temp_file_path)
search = re.search(r'Recommended "Track" dB change: (.*)', out)
else:
print "mp3gain not found"
#Log warning
- elif re.search(r'ogg$', temp_file_path, re.IGNORECASE) or get_mime_type(temp_file_path) == "application/ogg":
+ elif re.search(r'og(g|a)$', file_path, re.IGNORECASE) or get_mime_type(temp_file_path) == "application/ogg":
if run_process("which vorbisgain > /dev/null && which ogginfo > /dev/null") == 0:
run_process('vorbisgain -q -f "%s" 2>/dev/null >/dev/null' % temp_file_path)
out = get_process_output('ogginfo "%s"' % temp_file_path)
@@ -76,7 +81,7 @@ def calculate_replay_gain(file_path):
else:
print "vorbisgain/ogginfo not found"
#Log warning
- elif re.search(r'flac$', temp_file_path, re.IGNORECASE) or get_mime_type(temp_file_path) == "audio/x-flac":
+ elif re.search(r'flac$', file_path, re.IGNORECASE) or get_mime_type(temp_file_path) == "audio/x-flac":
if run_process("which metaflac > /dev/null") == 0:
out = get_process_output('metaflac --show-tag=REPLAYGAIN_TRACK_GAIN "%s"' % temp_file_path)
search = re.search(r'REPLAYGAIN_TRACK_GAIN=(.*) dB', out)
From 9eebdd7d500715e30f5e672f0aa35002573b4347 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Wed, 8 Aug 2012 11:52:17 -0400
Subject: [PATCH 2/2] remove useless entries in .gitignore
---
.gitignore | 2 --
1 file changed, 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index a14bfa6df..bc3c72ed9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
.*
*.pyc
-/files
-build/build.properties