Duncan Sommerville
8e6e72a501
More work on getting services working with new installer
2015-01-07 10:31:00 -05:00
Duncan Sommerville
c66e6aa849
More work on getting services working with new installer
2015-01-07 10:01:32 -05:00
drigato
08738cf391
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
2015-01-06 15:46:20 -05:00
drigato
8d914bcd13
SAAS-529: Replace Apache Libcloud with Python-Boto SDK
2015-01-06 15:44:34 -05:00
Albert Santoni
fc912923ce
Force the use of FDK-AAC and significantly boost AAC sound quality
2015-01-06 12:58:11 -05:00
Duncan Sommerville
f4c5cf1353
Added virtualenv back into install process
2015-01-05 16:41:03 -05:00
Duncan Sommerville
bbc095f534
Added virtualenv back into install process
2015-01-05 15:38:01 -05:00
Duncan Sommerville
5f137d99a3
Added virtualenv back into install process
2015-01-05 14:42:53 -05:00
drigato
9737dda225
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2015-01-05 12:23:06 -05:00
drigato
cf57af0c4b
Small analyzer fix
2015-01-05 12:20:13 -05:00
Duncan Sommerville
fc68dfa256
Fixed service execution calls
2015-01-05 11:16:58 -05:00
Duncan Sommerville
ee96380a41
Test to start upstart jobs as web user
2015-01-05 10:16:44 -05:00
Duncan Sommerville
f35fb4968c
Test to start upstart jobs as web user
2015-01-05 09:47:06 -05:00
Duncan Sommerville
344e1aa194
Test to start upstart jobs as web user
2015-01-05 09:30:08 -05:00
Duncan Sommerville
54748b6275
More work on media-monitor and pypo install process
2014-12-19 17:16:50 -05:00
Albert Santoni
13827d96c9
Added missing config_File.py
2014-12-19 16:20:20 -05:00
drigato
88b39e16bb
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-12-19 16:20:04 -05:00
drigato
c711adc48d
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
python_apps/airtime_analyzer/airtime_analyzer/message_listener.py
2014-12-19 16:06:23 -05:00
Albert Santoni
9a8b34feae
Unit test tweak for CloudStorage
2014-12-19 14:03:28 -05:00
Duncan Sommerville
75c2a4a18b
More work on media-monitor and pypo install process
2014-12-19 13:49:33 -05:00
Albert Santoni
1718868835
Stub CloudStorageAnalyzer tests
2014-12-19 12:59:20 -05:00
Albert Santoni
3f5b4faf1c
Cloud storage cleanup and fixed the unit tests
2014-12-19 12:58:55 -05:00
Duncan Sommerville
6d38f2ccfc
Small fix to media-monitor setup.py
2014-12-19 12:34:50 -05:00
Duncan Sommerville
ae6352a057
Initial work on switching media-monitor to use setuptools
2014-12-19 12:26:41 -05:00
Duncan Sommerville
6bc3a1cfba
More work on switching pypo to use setuptools, added lxc-bootstrap script for ease of testing across distros
2014-12-19 09:47:54 -05:00
drigato
28a06136aa
Better error logging when pypo downloads files
2014-12-17 18:30:06 -05:00
Duncan Sommerville
4749ef111c
More work on switching pypo to use setuptools
2014-12-17 17:05:55 -05:00
drigato
19e6f1a535
SAAS-526: Change prefix from station name to station id
...
Done.
2014-12-17 16:48:20 -05:00
Duncan Sommerville
29917ebf63
More work on switching pypo to use setuptools
2014-12-17 16:42:29 -05:00
Duncan Sommerville
97805ad271
Removed many unnecessary files and started changing pypo to use setuptools
2014-12-17 16:22:40 -05:00
drigato
ec1c8669c8
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-12-17 14:14:03 -05:00
Duncan Sommerville
eefe8910cf
More work on monitless installer
2014-12-16 21:27:37 -05:00
Duncan Sommerville
51a95fb989
More work on monitless installer
2014-12-16 20:12:20 -05:00
Duncan Sommerville
8a2c155289
More work on monitless installer
2014-12-16 19:42:07 -05:00
Duncan Sommerville
ad4b61e89f
More work on monitless installer
2014-12-16 19:05:17 -05:00
drigato
1de326283e
SAAS-527: Allow files to be uploaded to either the cloud or on local file storage
...
Not quite done.
2014-12-16 18:47:42 -05:00
Duncan Sommerville
4043ebfd25
More work on monitless installer
2014-12-16 16:26:58 -05:00
Duncan Sommerville
8a353f970c
More work on monitless installer
2014-12-16 15:45:35 -05:00
Duncan Sommerville
4dfd49d12c
Initial work on monitless installation
2014-12-16 12:24:41 -05:00
Albert Santoni
70a2190494
Close file descriptors in airtime_analyzer before forking subprocesses
2014-12-15 17:18:02 -05:00
drigato
aabe3799b1
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-12-15 12:49:41 -05:00
drigato
6de8bbe967
SAAS-514: PYPO -> Tracks may not become ready in time for playout
2014-12-15 12:27:51 -05:00
Albert Santoni
d5fc90e9d3
Merge branch '2.5.x' into saas
2014-12-15 10:50:25 -05:00
Albert Santoni
8766519c71
Another tweak to Opus sound quality. Liquidsoap picks undocumented poor
...
defaults for almost every encoder.
2014-12-15 10:49:21 -05:00
Albert Santoni
3b88b0ce22
Boost the Opus sound quality
2014-12-15 10:42:45 -05:00
drigato
7b80915c16
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-12-12 09:44:54 -05:00
drigato
e7a742dbf4
Fixed merge error
2014-12-12 09:38:24 -05:00
drigato
29d3d877ab
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
python_apps/airtime_analyzer/setup.py
2014-12-12 09:36:27 -05:00
Albert Santoni
dbfb2fc69b
CC-5739: Added Liquidsoap playability test to airtime_analyzer
2014-12-11 15:45:45 -05:00
Albert Santoni
3b1c776879
Removed all ReplayGain and Silan stuff from pypo, plus a bugfix
...
* Ripped out all the ReplayGain and Silan analysis from pypo, since
it's now implemented in airtime_analyzer. This fixes a bunch of
race conditions.
* Also renamed the replaygain field to replay_gain in airtime_analyzer
to match Airtime.
2014-12-11 14:26:05 -05:00
Albert Santoni
4dd2768755
ReplayGain analysis in airtime_analyzer using python-rgain
...
* Implemented Replaygain analysis for Ogg Vorbis, MP3, MP4, and FLAC
using python-rgain
* Added unit tests for ReplayGainAnalyzer
* Squashed stderr output in ReplayGainAnalyzer and CuePointAnalyzer
* Clean up
2014-12-11 14:12:41 -05:00
Albert Santoni
38bd45b8dc
Silan cue-in/out analysis now moved to airtime_analyzer
...
* Added a new CuePointAnalyzer using silan (will remove silan stuff from pypo later)
* Makes silan analysis slightly more reliable for certain short files.
* Fixes CC-5961: Audio duration cutoff for WAVE files
* Added unit tests for the new analyzer and improved code coverage slightly
* Added unit tests for WAVE metadata extraction and an invalid WMA file
2014-12-10 18:44:35 -05:00
drigato
57868d2351
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-12-10 12:47:22 -05:00
drigato
d73b331376
SAAS-515: Prefix object names with station name
2014-12-10 12:40:08 -05:00
drigato
89925e52ed
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
python_apps/pypo/pypofile.py
2014-12-08 15:34:30 -05:00
drigato
ec189fc27a
SAAS-509: PYPO can't download files via the REST API
2014-12-08 15:33:02 -05:00
drigato
2c760f4ba6
Changed how PYPO's download URL is created
2014-12-08 14:47:23 -05:00
drigato
687548ec68
Adding some logging statements
2014-12-08 14:24:19 -05:00
drigato
024150f023
SAAS-503: PYPO -> Use the REST API to download files
...
Fixed disabling SSL verication
2014-12-03 14:50:58 -05:00
drigato
2ae45bd005
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-12-03 14:42:10 -05:00
drigato
53624d8d28
SAAS-503: PYPO -> Use the REST API to download filesSAAS-503
...
Added python library - requests - to pybundle
2014-12-03 14:41:16 -05:00
drigato
cf9eabbc74
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/build/sql/schema.sql
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-12-03 13:35:32 -05:00
drigato
16dc286420
SAAS-503: PYPO -> Use the REST API to download files
2014-12-03 13:22:52 -05:00
drigato
e1f1807f5a
SAAS-503: PYPO -> Use the REST API to download files
...
Removed Amazon S3 specific code
2014-12-02 18:46:17 -05:00
drigato
432245b18e
SAAS-502: Analyzer -> Set the station id and domain in the cloud object's metadata
...
Set the domain name in the cloud object's metadata
2014-11-27 16:54:22 -05:00
drigato
92feacd46f
SAAS-501: Re-jig cloud_storage.conf
2014-11-27 15:50:40 -05:00
drigato
477ac337e5
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-11-26 11:54:07 -05:00
drigato
884a4c493d
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-11-26 11:42:40 -05:00
Albert Santoni
cbb8ac7dc6
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2014-11-18 17:45:00 -05:00
Albert Santoni
162995bb49
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-11-18 17:14:01 -05:00
drigato
2cfe08b33a
Updated FTP upload hook script with new vhost.map file location
2014-11-18 14:58:27 -05:00
drigato
4d8b32556b
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-11-18 09:24:38 -05:00
Albert Santoni
32bdbe1ad6
Improved some comments
2014-11-14 11:12:10 -05:00
Albert Santoni
71f2cc11d2
Fix for incorrect watchdog disabling
2014-11-12 17:04:21 -05:00
Albert Santoni
864352c6a7
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/status_reporter.py
2014-11-12 17:04:00 -05:00
Albert Santoni
8eaeaf71f9
airtime_analyzer status_reporter shutdown fix
2014-11-12 17:01:59 -05:00
Albert Santoni
aff6104839
Disable airtime_analyzer watchdog
2014-11-12 16:12:33 -05:00
drigato
97b74a0997
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/models/Schedule.php
2014-11-12 15:08:35 -05:00
drigato
f1fa4929ae
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
python_apps/airtime_analyzer/setup.py
2014-11-12 14:51:18 -05:00
drigato
c132cac43d
Code cleanup
2014-11-12 14:42:34 -05:00
Albert Santoni
24cae3b3d6
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-11-11 18:41:26 -05:00
Albert Santoni
b324031ee6
Disable those new requirements because pip requires gcc to install them
2014-11-11 18:41:09 -05:00
drigato
90ff323d1d
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-11 14:00:37 -05:00
drigato
dbc55632e1
Changed print statements so they go to the pypo log
2014-11-11 13:58:55 -05:00
drigato
49f3881da0
rmq_config_path fix
2014-11-11 13:56:02 -05:00
drigato
eb0f12c709
Change back rabbitmq config file param name
2014-11-11 13:55:46 -05:00
Albert Santoni
024923ba6a
Disable SSL verification for SaaS as a temporary workaround
2014-11-11 12:18:20 -05:00
Albert Santoni
5f27e3099a
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-11-11 11:19:31 -05:00
Albert Santoni
63b357f0ee
Updated requirements for airtime_analyzer to make python-requests
...
support SNI properly
2014-11-11 11:18:55 -05:00
drigato
41acfd3840
rmq_config_path fix
2014-11-10 12:35:41 -05:00
drigato
413c7fd604
Change back rabbitmq config file param name
2014-11-10 12:25:40 -05:00
drigato
da42e39178
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-07 12:49:27 -05:00
drigato
ecc0225ff5
Added apache-libcloud dependency to airtime_analyzer
2014-11-07 12:49:10 -05:00
drigato
4b10e024da
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-07 12:35:23 -05:00
drigato
1dc72d5ebe
Changed Amazon S3 download URL format so it works with S3_EU_WEST region.
...
Updated amazon config file path in the downloader class
2014-11-07 11:51:11 -05:00
drigato
e24b4f43fd
Made AirtimeAnalyzerServer.read_config_file static so CloudStorageUploader can use it.
...
Reverted MessageListener.msg_received_callback and MessageListener.spawn_analyzer_process back to static methods.
Moved cloud storage settings out of MessageListener and into CloudStorageUploader
2014-11-05 16:25:11 -05:00
drigato
6adb33e89b
Made AirtimeAnalyzerServer.read_config_file static so CloudStorageUploader can use it.
...
Reverted MessageListener.msg_received_callback and MessageListener.spawn_analyzer_process back to static methods.
Moved cloud storage settings out of MessageListener and into CloudStorageUploader
2014-11-05 16:24:03 -05:00
drigato
0a45de7fba
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
.gitignore
airtime_mvc/application/configs/airtime-conf.php
airtime_mvc/application/configs/classmap-airtime-conf.php
airtime_mvc/application/models/RabbitMq.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php
airtime_mvc/application/models/airtime/map/CcShowTableMap.php
airtime_mvc/application/models/airtime/om/BaseCcShow.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php
airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php
airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php
airtime_mvc/application/modules/rest/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/build/sql/schema.sql
airtime_mvc/public/index.php
2014-11-03 12:29:58 -05:00
drigato
7e1d14fcf2
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-11-03 10:31:49 -05:00
drigato
52b0db5ccd
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2014-11-03 10:29:53 -05:00
Duncan Sommerville
ef9ab1acf0
Merge branch '2.5.x' into saas
2014-10-30 17:42:55 -04:00
Duncan Sommerville
8f5af6556d
CC-5935 - Added fix for insidious pypofetch bug causing dangling RabbitMQ channel
2014-10-30 17:41:00 -04:00
drigato
01ad2ab832
Commented cloud storage classes
2014-10-29 17:42:42 -04:00
drigato
978fc43a82
Started commenting CloudStorageUploader class
2014-10-29 10:47:32 -04:00
drigato
7edd993fa3
Reverted pypo's copy file method to how it was without cloud files
...
and instead directly call the cloud file's downloader method.
2014-10-24 15:50:52 -04:00
drigato
70ff67374b
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/filemover_analyzer.py
2014-10-22 17:16:46 -04:00
drigato
9726fb80d2
Removed amazon s3 signature from pypo cache file name.
...
Stopped pyppo from downloading amazon s3 files if it already exists in the pypo cache dir.
2014-10-22 14:17:44 -04:00
Albert Santoni
363d022b0c
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-10-22 11:39:52 -04:00
Albert Santoni
53dc92b204
StatusReporter exception handler to prevent thread from dying under any circumstances
2014-10-22 11:39:22 -04:00
Albert Santoni
54523e264c
Fix rare exception during shutdown in airtime_analyzer
2014-10-22 11:38:22 -04:00
Albert Santoni
c4af1b6b19
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-10-21 19:24:03 -04:00
Albert Santoni
82f251f061
Fix invalid python in StatusReporter
2014-10-21 19:23:48 -04:00
Albert Santoni
a1ef9d60c0
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-10-21 15:36:51 -04:00
Albert Santoni
28be5c6bd3
CC-5929: Certain long filenames can result in the extension getting cut off
2014-10-21 15:34:10 -04:00
drigato
544d20ebc2
Replaced spaces with dashes in resource_id generation
...
Fixed track preview and download signed urls
Removed cloud_storage_deleter.py file
Changed cloud_storage settings in airtime.conf
2014-10-17 17:16:53 -04:00
drigato
a10e287368
Fixed a fresh install bug that wasn't using composer installs.
...
Fixed a cloud file download bug where it was downloading the wrong track.
Working on amazon s3 signed urls for private objects.
Added cloud storage configuration to install script.
2014-10-14 16:54:58 -04:00
Robert Elder
9fb35c448e
Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas.
2014-10-10 19:57:22 +00:00
Albert Santoni
081ca0a6a4
Reworked upstart config for airtime_analyzer
2014-10-10 11:28:44 -04:00
drigato
2423ea6787
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-10-08 11:46:30 -04:00
Duncan Sommerville
4e545dfe9f
Commented out monit config lines to fix install error
2014-09-16 18:20:11 -04:00
drigato
52f3ed816e
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
2014-08-28 12:01:42 -04:00
drigato
9fe0830dfd
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/LoginController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
2014-08-28 11:59:41 -04:00
drigato
ead4a3c565
Corrected false comment about how pypo fetches the schedule
2014-08-14 12:48:31 -04:00
drigato
e5881f2530
Corrected false comment about how pypo fetches the schedule
2014-08-14 12:29:52 -04:00
drigato
ca62086e16
Removed cloud file deletion from Airtime Analyzer. Deletion is done from PHP now.
2014-08-12 12:59:50 -04:00
drigato
879e776c8d
CC-5888: Handle file deletion if the file is stored in the cloud
2014-08-12 12:32:49 -04:00
drigato
6545828dc7
Removed exiting pypo if error occurs during cloud storage downloads
2014-08-11 12:25:30 -04:00
drigato
dd37ffbdd7
CC-5888: Handle file deletion if the file is stored in the cloud
...
Execute a python script that deletes a file from the cloud
2014-07-31 23:11:49 -04:00
drigato
8c2754972e
CC-5896: Store cloud files in separate table, inherited from cc_files
...
Refactored storedfile->delete()
Added a deletePhysicalFile function to CcFile and CloudFile
Cleaned up schedule events that get passed to Pypo
2014-07-29 15:07:51 -04:00
drigato
ecb072b84c
CC-5896: Store cloud files in separate table, inherited from cc_files
...
Fixed broken metadata display on Library page
Fixed broken download/preview option from Library page
2014-07-28 15:17:46 -04:00
drigato
f1ea100411
CC-5896: Store cloud files in separate table, inherited from cc_files
2014-07-24 16:56:15 -04:00
Albert Santoni
46542d2b2b
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage
2014-07-16 18:09:38 -04:00
Albert Santoni
c09457ce7c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-07-16 15:03:39 -04:00
drigato
3f676be66c
Use a different libcloud function for uploading files
2014-07-16 14:43:55 -04:00
drigato
7ca6b91cdf
CC-5888: Handle file deletion if the file is stored in the cloud
2014-07-16 12:03:22 -04:00
drigato
aaee522ec6
CC-5888: Handle file deletion if the file is stored in the cloud
2014-07-15 17:20:04 -04:00
Albert Santoni
490a9c0d06
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-07-15 16:46:20 -04:00
Albert Santoni
7438ecd2b4
Use track metadata from Airtime in playout engine
...
* Resolves CC-5893: Metadata not updated on Airtime Pro
* Report track metadata in the schedule API, and make pypo pass that
along to Liquidsoap via annotations.
* Move HTTP response sanitization for file metadata out of the REST module and into CcFiles
* Slightly improved the terrible exception handling in pypo
2014-07-15 16:41:55 -04:00
drigato
8e714bcb64
CC-5888: Handle file deletion if the file is stored in the cloud
2014-07-15 07:26:39 -04:00
drigato
039a51121b
CC-5885: Factor out cloud storage code into separate class
2014-07-11 16:16:30 -04:00
drigato
6f119b006f
CC-5884: Modify Pypo -> Download files from cloud storage
2014-07-10 17:58:00 -04:00
drigato
e6bbf8e84c
CC-5884: Modify Pypo -> Download files from cloud storage
2014-07-10 17:57:38 -04:00
drigato
c2411b6f41
CC-5884: Modify Pypo -> Download files from cloud storage
2014-07-10 17:56:41 -04:00
drigato
d2e8325258
CC-5891: Install apache-libcloud under virtualenv
2014-07-10 17:31:27 -04:00
Albert Santoni
bbade8401c
FTP upload hook bugfix for files with commas in their names (CURL
...
restriction)
2014-07-10 16:43:13 -04:00
Albert Santoni
08f4610aec
Fix CURL error handling in FTP upload hook
2014-07-10 12:12:16 -04:00
Albert Santoni
fc2f68cb51
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-07-07 15:54:02 -04:00
Albert Santoni
e84f765696
Better FileMover permissions unit test (passes as root)
2014-07-07 15:53:25 -04:00
drigato
1393bad014
Modified config file variables to describe not only rabbitmq settings
...
Removed filemover_analyzer functionality and replaced with an uploader function into Amazon s3
2014-07-04 16:38:58 -04:00
Albert Santoni
72ef576f03
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-23 15:28:50 -04:00
Albert Santoni
24d842c4a6
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/controllers/LoginController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
2014-06-23 15:26:53 -04:00
Albert Santoni
a7a7df4236
CC-5668: Weekly recordings get overwritten
2014-06-09 15:04:35 -04:00
Albert Santoni
1468ff0f7c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-04 13:47:07 -04:00
Albert Santoni
5e7fdb9606
Don't retry Analyzer HTTP requests if the web app is broken
2014-06-04 13:46:25 -04:00
Albert Santoni
65ea0e6d6f
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-03 12:44:35 -04:00
Albert Santoni
a969f8fc44
CC-5856: Analyzer metadata exception
...
* Fixed parsing of metadata when there's empty lists returned (mutagen's
API is awful)
* Return HTTP 422 if there's any exception in validating the metadata
2014-06-03 12:43:01 -04:00
Albert Santoni
0beaf5dcaf
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-03 11:42:26 -04:00
Albert Santoni
4548123ad9
CC-5861: Long file paths will cause analyzer error
...
* Fixed it
2014-06-03 11:41:45 -04:00
Albert Santoni
8ae1be265b
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-30 13:04:08 -04:00
Albert Santoni
1373d4984f
CC-5862: Invalid UTF-8 chars cause DB error
...
* Strip and validate UTF-8 strings in the Media API
* Also properly parse track numbers containing "-"
2014-05-30 13:02:19 -04:00
Albert Santoni
01fc9e6ffc
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-26 19:11:47 -04:00
Albert Santoni
d21cb596cd
CC-5860: Analyzer HTTP requests can hang indefinitely
...
* Log a backtrace when sent the USR2 signal (kill -SIGUSR2 <pid>)
* Rigged up up something to strace and restart when we see a request hanging
2014-05-26 18:59:28 -04:00
drigato
c9ddcc28e0
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-08 13:02:22 -04:00
drigato
0040965222
CC-5840: Add Media -> Endless retries if there is a validation error
...
Fixed by not adding message to retry queue if request returns a
validation specific error code (422)
2014-05-08 13:01:49 -04:00
drigato
c291439483
Adding back analyzer deadlock workaround.
...
Removing command to delete empty sub folders inside organize.
2014-05-07 15:01:31 -04:00
drigato
cf0aa3556f
Adding back airtime analyzer deadlock workaround
2014-05-07 14:07:49 -04:00
drigato
8a342f7ef5
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-07 13:12:40 -04:00
drigato
81dd1deba3
Removing something for testing
2014-05-07 13:12:18 -04:00
Albert Santoni
e4e97e9c32
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-06 15:03:14 -04:00
Albert Santoni
56c3d8070b
Alternate bugfix for logging deadlock in airtime_analyzer
2014-05-06 15:01:25 -04:00
Albert Santoni
bc5c5a3fb5
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-05 18:27:14 -04:00
Albert Santoni
ed494ac587
Some defensive code against multiprocess related deadlocks
...
* Reinitialize logging in child processes so we don't inherit locks.
Might be causing a deadlock we're seeing on Pro right now.
2014-05-05 18:25:47 -04:00
Albert Santoni
7073c31531
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-05 14:56:59 -04:00
Albert Santoni
d063700254
CC-5834: Airtime Analyzer: Bitrate is missing
...
* Fixed
2014-05-05 14:56:32 -04:00
Albert Santoni
13b6591dc1
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-05 14:39:55 -04:00
Albert Santoni
22343ed99c
Fixed bitrate import in airtime_analyzer
2014-05-05 14:39:36 -04:00
Albert Santoni
5160063f70
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-30 18:46:50 -04:00
Albert Santoni
c11e39f933
Fixed python-magic dependency
2014-04-30 18:46:37 -04:00
Albert Santoni
0183e2282f
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-30 18:44:17 -04:00
Albert Santoni
abcdf5ea6a
CC-5824: Airtime Analyzer: Flac file was uploaded but AA says it's
...
failed
* Fixed
2014-04-30 18:42:13 -04:00
Albert Santoni
ace03edd2e
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-04-30 18:32:42 -04:00
Albert Santoni
26a39ed2db
CC-5823: Airtime Analyzer: Wav file uploading fails with zero length and
...
empty mime
* Fixed
2014-04-30 18:32:17 -04:00
Albert Santoni
c2f6032c8b
Fixed the upstart config
2014-04-30 17:56:02 -04:00
drigato
0c0c65f69b
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-04-28 14:46:03 -04:00
drigato
f9f9e2458e
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-04-28 14:45:05 -04:00
drigato
fae5b15a9f
CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
...
$_FILES does not store the original file path so we were losing the folder name.
Fixed by explicitly passing the full filepath in via the ftp-upload-hook.sh script
2014-04-28 14:44:52 -04:00
Albert Santoni
2b341117fc
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-28 11:56:09 -04:00
Albert Santoni
375ec54778
CC-5820: Airtime Analyzer: Length and MIME parsing skipped if file has
...
no audio metadata tags.
2014-04-28 11:54:59 -04:00
Albert Santoni
446eca057c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po
airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
airtime_mvc/locale/template/airtime.po
airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
2014-04-25 00:43:22 -04:00
Albert Santoni
e503c952d2
CC-5816: Publisher column
...
* Kanye West support. Surely
2014-04-24 17:05:38 -04:00
Albert Santoni
bc72a6626e
CC-5709: Airtime Analyzer
...
* Fixed some unit tests that broken when I dropped python-magic in
favour of mutagen for MIME type detection
2014-04-23 18:20:50 -04:00
Albert Santoni
0a906ba6ec
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-04-23 17:42:52 -04:00
Albert Santoni
9fdfc0a957
CC-5709: Airtime Analyzer
...
* Catch exceptions related to unpickling the HTTP request queue
2014-04-23 17:42:09 -04:00
Naomi
fe20cc7f63
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
2014-04-23 15:58:39 -04:00
Albert Santoni
2f8461b2a6
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-23 14:58:36 -04:00
Albert Santoni
f2ce77fecb
Remove python-magic
2014-04-23 14:20:48 -04:00
Albert Santoni
d01f5a4ffe
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-22 15:04:17 -04:00
Albert Santoni
d77f107df5
CC-5808: Fixed breakage at shutdown
2014-04-22 15:03:46 -04:00
Albert Santoni
c9411d4301
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-21 17:50:53 -04:00
Albert Santoni
6a86a75cee
CC-5709: Airtime Analyzer
...
* Fixed CC-5799: Incorrect Mime on import
2014-04-21 17:50:10 -04:00
drigato
cd6c4f7ede
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-16 17:24:56 -04:00
Albert Santoni
cdce4ca104
CC-5709: Airtime Analyzer
...
* Fixed the unit tests
* Improved length testing because it seems to fluctuate a bit with
your mutagen version (great, eh?)
2014-04-16 16:42:37 -04:00
Albert Santoni
9a3c88f009
CC-5709: Airtime Analyzer
...
* Explicitly set the locale in upstart conf to avoid UTF-8/unicode
errors from python. Fixes CC-5794.
2014-04-16 15:33:02 -04:00
Albert Santoni
de189f91ec
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-16 13:05:41 -04:00
Albert Santoni
b0670f5f47
CC-5709: Airtime Analyzer
...
* Log tracebacks from child process
2014-04-16 13:05:02 -04:00
Albert Santoni
0431044ee2
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-16 11:11:47 -04:00
Albert Santoni
4d1843ca1f
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-04-16 11:11:24 -04:00
Albert Santoni
f491211167
CC-5709: Airtime Analyzer
...
* Retry HTTP requests (kinda crappy, should find a better design pattern to
solve this) - CC-5775
* Persist failed HTTP requests at shutdown
2014-04-16 11:10:06 -04:00
drigato
8ae172b0bb
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-16 10:55:25 -04:00
drigato
7aba416c3b
Small fix to ftp hook script.
...
Removed space that was getting added to the api key
2014-04-16 10:54:55 -04:00
Albert Santoni
8fb95316f2
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
2014-04-09 15:01:11 -04:00
Albert Santoni
e4af3a5a0e
CC-5709: Airtime Analyzer
...
* Better SIGTERM handling for airtime_analyzer
* Nuke the .identifier files saved by Airtime
2014-04-08 17:28:50 -04:00
Albert Santoni
5948dc41da
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-08 14:29:34 -04:00
Albert Santoni
84ee3d26cb
CC-5709: Airtime Analyzer
...
* Fixed metadata import, whoops
2014-04-08 14:16:07 -04:00
drigato
bbc81be1d3
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-08 12:09:32 -04:00
Albert Santoni
b8b913ff68
CC-5709: Airtime Analyzer
...
* Fixed daemonization stuff for upstart
* Adding missing unit test files
2014-04-07 16:19:44 -04:00
Albert Santoni
e044187aed
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
python_apps/airtime_analyzer/setup.py
2014-04-04 19:48:22 -04:00
Albert Santoni
b02dc45a53
CC-5709: Airtime Analyzer
...
* Fixed airtime_analyzer setup script
2014-04-04 19:46:59 -04:00
Albert Santoni
20b056c9f0
CC-5709: Airtime Analyzer
...
* Added upstart script for starting on bootup
2014-04-04 19:09:46 -04:00
Albert Santoni
b7db432cf6
CC-5709: Airtime Analyzer
...
* Added upstart script for starting on bootup
2014-04-04 19:08:57 -04:00
Albert Santoni
cf492045cc
CC-5709: Airtime Analyzer
...
* A bunch of cleanup and fix for metadata extraction on files mutagen can't read
2014-04-04 12:35:50 -04:00
Albert Santoni
95b369c54d
CC-5709: Airtime Analyzer
...
* Remove awful StoredFile::uploadFile() function
* Massive airtime_analyzer commenting and cleanup
* Cleaned up the upload code
* Temporarily disabled the liquidsoap playability test.
2014-04-03 16:13:26 -04:00
Albert Santoni
0398072d45
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-03 11:35:37 -04:00
Albert Santoni
86b94b970f
CC-5709: Airtime Analyzer
...
* Fix for incorrect length sometimes happening (VBR MP3?)
2014-04-03 11:34:57 -04:00
Albert Santoni
9c0314eaa0
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-02 16:52:01 -04:00
Albert Santoni
2a172afe3e
CC-5709: Even more slightly better exception handling
2014-04-02 16:51:38 -04:00
Albert Santoni
aabb8ec01f
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-02 16:48:04 -04:00
Albert Santoni
f6369c02ee
CC-5709: Airtime Analyzer
...
* Catch bad callback_url
2014-04-02 16:47:24 -04:00
Albert Santoni
a6e80e2789
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-01 12:29:20 -04:00
Albert Santoni
12c16bc120
CC-5709: Airtime Analyzer
...
* Make the airtime_analyzer config path a runtime param
2014-04-01 12:28:40 -04:00
drigato
82958a10ae
CC-5708: proftpd hook for new File API
...
small fix for testing script
2014-03-28 12:26:40 -04:00
drigato
49996a9986
CC-5708: proftpd hook for new File API
...
encased var in {}
2014-03-28 11:15:28 -04:00
drigato
2fdc4291e3
CC-5708: proftpd hook for new File API
...
testing ftp hook script
2014-03-27 16:48:57 -04:00
drigato
cc4e43a8b5
CC-5708: proftpd hook for new File API
...
variable escaping?
2014-03-27 16:48:27 -04:00
Albert Santoni
1c5e2d6205
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/public/index.php
* Reverted some SaaS-only thing Martin did a year ago. Looks benign but
only one way to find out...
2014-03-27 16:38:03 -04:00
drigato
2bc37b9fea
CC-5708: proftpd hook for new File API
...
added handling for if the web server is down
2014-03-27 15:46:42 -04:00
drigato
eb72f25151
CC-5708: proftpd hook for new File API
...
uncomment curl command
2014-03-27 11:11:10 -04:00
drigato
700b28ae38
CC-5708: proftpd hook for new File API
...
removed testing lines
2014-03-27 11:09:18 -04:00
drigato
b37938dbd8
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-03-27 11:05:36 -04:00
drigato
ead1ec4795
CC-5708: proftpd hook for new File API
2014-03-27 11:05:23 -04:00
Albert Santoni
7e0c9bc684
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-03-26 15:07:40 -04:00
Albert Santoni
58a38ffd3a
CC-5709: Airtime Analyzer
...
* Added unit test coverage report stuff
* Added more unit tests
* 98% test coverage :-)
* Fixed a few bugs and removed some dead code
2014-03-26 15:06:48 -04:00
drigato
681fe4630b
CC-5708: proftpd hook for new File API
...
url and API key are hard coded right now.
Next task is to somehow decipher these with whatever ftp parameters we can pass in to the scipt.
2014-03-25 18:09:47 -04:00
Albert Santoni
03267fe83b
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-03-25 14:35:07 -04:00
Albert Santoni
f8c221a610
CC-5709: Airtime Analyzer
...
* Fixed and updated the unit tests
2014-03-25 14:34:50 -04:00
drigato
3bffb02bc0
CC-5708: proftpd hook for new File API
2014-03-24 18:22:34 -04:00
Albert Santoni
6952902b22
CC-5709: Airtime Analyzer
...
* Unbreak stuff
2014-03-24 16:05:53 -04:00
Albert Santoni
eb37b39406
CC-5709: Airtime Analyzer
...
* Added missing FileMoverAnalyzer file that I forgot to commit
2014-03-24 13:03:20 -04:00
Albert Santoni
61c2c90b7e
CC-5709: Airtime Analyzer
...
* Remove the "hidden" field from the REST blacklist, the analyzer needs to set it.
* Added import_status column messages in the recent uploads table
* Auto-refresh the recent uploads table while imports are pending
* Moved the file moving stuff to its own analyzer in airtime_analyzer
* Basic error reporting to the REST API in airtime_analyzer, needs
hardeneing though
* Fixed a bug with the number of recent uploads
* Prevent airtime_analyzer from running if media_monitor is running
2014-03-22 02:12:03 -04:00
Albert Santoni
8f7ecafcf6
CC-5709: Airtime Analyzer
...
* A bunch of changes that somehow didn't make it into my last commit...
* confused
2014-03-21 14:03:17 -04:00