Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SAAS-596: Store file size and hash in database 

Removed getFileSize from CloudFile.php since it can call the parent
function.
Moved setting filesize metadata from cloud_storage_uploader.
This commit is contained in:
drigato 2015-02-17 16:51:25 -05:00
parent fe7071b5e3
commit 5bd3371ec2
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
airtime_mvc/application/models/airtime/CloudFile.php
View File

@ -44,14 +44,6 @@ class CloudFile extends BaseCloudFile
return $this->proxyStorageBackend->getAbsoluteFilePath($this->getResourceId()); return $this->proxyStorageBackend->getAbsoluteFilePath($this->getResourceId());
} }
/**
* Returns the file size in bytes.
*/
public function getFileSize()
{
return $this->getDbFilesize();
}
public function getFilename() public function getFilename()
{ {
return $this->getDbFilepath(); return $this->getDbFilepath();

5
python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
View File

@ -62,8 +62,7 @@ class CloudStorageUploader:
metadata: ID3 tags and other metadata extracted from the audio file. metadata: ID3 tags and other metadata extracted from the audio file.
Returns: Returns:
The metadata dictionary it received with three new keys: The metadata dictionary it received with two new keys:
filesize: The file's filesize in bytes.
filename: The file's filename. filename: The file's filename.
resource_id: The unique object name used to identify the objects resource_id: The unique object name used to identify the objects
on Amazon S3 on Amazon S3
@ -95,8 +94,6 @@ class CloudStorageUploader:
key.key = resource_id key.key = resource_id
key.set_metadata('filename', file_base_name) key.set_metadata('filename', file_base_name)
key.set_contents_from_filename(audio_file_path) key.set_contents_from_filename(audio_file_path)
metadata["filesize"] = os.path.getsize(audio_file_path)
# Remove file from organize directory # Remove file from organize directory
try: try: