Commit Graph

2394 Commits

Author SHA1 Message Date
Albert Santoni 9baed1b328 Make the unit tests pass again 2015-02-02 13:14:14 -05:00
Albert Santoni 536094ea50 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2015-02-02 13:05:32 -05:00
drigato 5040eb498d SAAS-560: Deploy separate cloud storage config files for each development environment 2015-02-02 12:54:56 -05:00
Albert Santoni 9e963ed023 Merge branch 'cc-5709-airtime-analyzer' into saas 2015-02-02 12:27:01 -05:00
Albert Santoni ee6862e731 Fixed quotation issue with playability analyzer 2015-02-02 12:26:22 -05:00
Albert Santoni 3f6983aa3e Renabling CuePointAnalyzer 2015-02-02 12:18:33 -05:00
drigato 93da48351c Deleted old, unused cloud_storage_downloader.py file from pypo 2015-01-29 14:29:59 -05:00
Duncan Sommerville b673017bfd Fix to setuptools deployment of pyponotify and liquidsoap 2015-01-28 15:09:13 -05:00
Duncan Sommerville bc604b992e CC-5986 - Fixed unit tests, removed unnecessary code from service execution files 2015-01-28 13:19:50 -05:00
Duncan Sommerville 875a9dfd8b CC-5990, CC-5991 - Python cleanup, removed need for /usr/lib/airtime 2015-01-27 18:43:36 -05:00
drigato 3f97ed3d55 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2015-01-27 16:46:06 -05:00
drigato ea868607b4 Enabling cuepoint analyzer because the silan bug has been fixed 2015-01-27 16:44:21 -05:00
drigato 102c78474d Enabling cuepoint analyzer because the silan bug has been fixed 2015-01-27 13:21:44 -05:00
drigato 43c6475f1b Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2015-01-26 09:18:32 -05:00
drigato 6adaf7a91a Disabling cue point analyzer 2015-01-26 09:17:53 -05:00
drigato a686eabb96 Disabling cue point analyzer 2015-01-23 17:33:57 -05:00
drigato ca9750f415 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/configs/ACL.php
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/build/sql/schema.sql
2015-01-23 11:32:45 -05:00
drigato 134ade877c Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
Conflicts:
	airtime_mvc/build/sql/schema.sql
2015-01-22 15:48:34 -05:00
Albert Santoni 6ebe8ec6c8 Pin python-daemon to 1.6 because 2.0.3 breaks setuptools 2015-01-22 12:42:05 -05:00
drigato bade613e80 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
Conflicts:
	airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-01-22 11:19:25 -05:00
drigato 38a2924849 SAAS-555: Analyzer calculates wrong cue out 2015-01-22 11:08:34 -05:00
Albert Santoni c03dd38c00 Merge branch '2.5.x' into 2.5.x-installer
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/models/Show.php
2015-01-16 17:27:52 -05:00
Duncan Sommerville 4552089c19 Fixes to install & uninstall procedure 2015-01-15 17:33:47 -05:00
drigato 7930ae97ae Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2015-01-15 17:23:15 -05:00
drigato 29c5cf5de0 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2015-01-15 17:21:26 -05:00
drigato 52a66632c6 SAAS-539: Analyzer can return values in scientific notation which are not compatible with Airtime
Fix unit tests
2015-01-15 17:17:29 -05:00
Duncan Sommerville 791466b023 Fixes for code review https://github.com/sourcefabric/Airtime/pull/84 2015-01-15 16:33:33 -05:00
drigato f8ce7110ee Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2015-01-15 13:46:26 -05:00
drigato 89e760fd98 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2015-01-15 13:45:40 -05:00
drigato 7d0f1655d2 SAAS-539: Analyzer can return values in scientific notation which are not compatible with Airtime 2015-01-15 13:44:48 -05:00
Duncan Sommerville 19a1817159 Fix a bad reversion in the airtime-playout binary 2015-01-15 10:12:52 -05:00
Duncan Sommerville 5e22f929c7 Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Duncan Sommerville df2576e5a0 Updated installer to better accommodate running over existing installs 2015-01-14 16:11:49 -05:00
drigato d99147bad4 Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas 2015-01-13 14:23:51 -05:00
Duncan Sommerville 674b8c69e4 Add very basic uninstall script, move install script to root directory 2015-01-12 16:13:39 -05:00
drigato 02e4c18931 SAAS-531: Finalize S3 folder hierarchy 2015-01-12 14:50:42 -05:00
Duncan Sommerville 0fcac545e6 For now, just prompt users to start background services at the end of the install process 2015-01-12 10:53:31 -05:00
Duncan Sommerville bf1355a203 Yet another attempt to run upstart jobs as unprivileged user 2015-01-12 09:48:08 -05:00
Duncan Sommerville e568013db6 More work on running services as web user 2015-01-08 13:21:08 -05:00
Duncan Sommerville ab35827439 Different approach for running airtime services as unprivileged user 2015-01-08 12:56:09 -05:00
Duncan Sommerville a790527e67 More work on running upstart services as non-privileged user 2015-01-08 10:06:37 -05:00
Duncan Sommerville a9a59337b8 More work on running upstart services as non-privileged user 2015-01-07 16:31:30 -05:00
Duncan Sommerville e6d8a6f25e Move upstart .conf files to directory accessible by non-privileged users 2015-01-07 16:04:48 -05:00
Duncan Sommerville 0fef350e9d Fixed issue with liquidsoap service starting as daemon, fixed logging issue in pypocli 2015-01-07 14:25:24 -05:00
drigato ad16683858 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2015-01-07 14:17:02 -05:00
drigato 9d6cf8620f Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2015-01-07 14:16:09 -05:00
drigato e5c806f658 Merge branch '2.5.x' into cc-5709-airtime-analyzer 2015-01-07 14:13:36 -05:00
Duncan Sommerville 05c2ecdb89 Changed logger init to use paths relative to current file 2015-01-07 11:46:06 -05:00
Albert Santoni 3225fcc6bc Fix syntax errors in fdkaac.liq 2015-01-07 11:35:43 -05:00
Duncan Sommerville 5e8c4b112f More work on getting services working with new installer 2015-01-07 10:54:17 -05:00
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