Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-5709: Airtime Analyzer 

* A bunch of cleanup and fix for metadata extraction on files mutagen can't read
This commit is contained in:
Albert Santoni 2014-04-04 12:35:50 -04:00
parent 64a95c7c59
commit cf492045cc
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
airtime_mvc/application/modules/rest/controllers/MediaController.php
View File

@ -332,16 +332,11 @@ class Rest_MediaController extends Zend_Rest_Controller
{ {
$CC_CONFIG = Config::getConfig(); $CC_CONFIG = Config::getConfig();
$apiKey = $CC_CONFIG["apiKey"][0]; $apiKey = $CC_CONFIG["apiKey"][0];
//$upload_dir = ini_get("upload_tmp_dir") . DIRECTORY_SEPARATOR . "plupload";
//$tempFilePath = Application_Model_StoredFile::uploadFile($upload_dir);
$tempFilePath = $_FILES['file']['tmp_name']; $tempFilePath = $_FILES['file']['tmp_name'];
$tempFileName = basename($tempFilePath); $tempFileName = basename($tempFilePath);
//TODO: Remove copyFileToStor from StoredFile... //TODO: Remove uploadFileAction from ApiController.php **IMPORTANT** - It's used by the recorder daemon...
//TODO: Remove uploadFileAction from ApiController.php **IMPORTANT** - It's used by the recorder daemon?
$storDir = Application_Model_MusicDir::getStorDir(); $storDir = Application_Model_MusicDir::getStorDir();
$importedStorageDirectory = $storDir->getDirectory() . "/imported/" . $ownerId; $importedStorageDirectory = $storDir->getDirectory() . "/imported/" . $ownerId;

19
python_apps/airtime_analyzer/airtime_analyzer/metadata_analyzer.py
View File

@ -19,9 +19,20 @@ class MetadataAnalyzer(Analyzer):
if not isinstance(metadata, dict): if not isinstance(metadata, dict):
raise TypeError("metadata must be a dict. Was of type " + type(metadata).__name__) raise TypeError("metadata must be a dict. Was of type " + type(metadata).__name__)
#Airtime <= 2.5.x nonsense:
metadata["ftype"] = "audioclip"
#Other fields we'll want to set for Airtime:
metadata["cueout"] = metadata["length"]
metadata["hidden"] = False
#Extract metadata from an audio file using mutagen #Extract metadata from an audio file using mutagen
audio_file = mutagen.File(filename, easy=True) audio_file = mutagen.File(filename, easy=True)
#Bail if the file couldn't be parsed. The title should stay as the filename
#inside Airtime.
if not audio_file:
return metadata
#Grab other file information that isn't encoded in a tag, but instead usually #Grab other file information that isn't encoded in a tag, but instead usually
#in the file header. Mutagen breaks that out into a separate "info" object: #in the file header. Mutagen breaks that out into a separate "info" object:
info = audio_file.info info = audio_file.info
@ -53,7 +64,7 @@ class MetadataAnalyzer(Analyzer):
except (AttributeError, KeyError): except (AttributeError, KeyError):
#If mutagen can't figure out the number of channels, we'll just leave it out... #If mutagen can't figure out the number of channels, we'll just leave it out...
pass pass
#Try to extract the number of tracks on the album if we can (the "track total") #Try to extract the number of tracks on the album if we can (the "track total")
try: try:
track_number = audio_file["tracknumber"] track_number = audio_file["tracknumber"]
@ -107,12 +118,6 @@ class MetadataAnalyzer(Analyzer):
except KeyError: except KeyError:
continue continue
#Airtime <= 2.5.x nonsense:
metadata["ftype"] = "audioclip"
#Other fields we'll want to set for Airtime:
metadata["cueout"] = metadata["length"]
metadata["hidden"] = False
return metadata return metadata