Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
13326 commits 3 branches 0 tags 405 MiB
Commit graph

248 commits

Author SHA1 Message Date
Albert Santoni
0c537194ec Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor 2015-02-20 17:36:15 -05:00
Albert Santoni
909cbae5f4 Added new parameter to CcFiles::createFromLocalFile() for flexibility 2015-02-20 17:34:58 -05:00
Duncan Sommerville
ce36c1be18 Removed unnecessary call to BaseCcFiles->delete 2015-02-20 16:58:09 -05:00
Albert Santoni
903de66349 Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor 
Conflicts:
	airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
	airtime_mvc/application/configs/conf.php
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/models/airtime/CcFiles.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/application/services/MediaService.php
 2015-02-20 16:52:00 -05:00
Albert Santoni
84f0f135ef More refactoring: Allow files to be imported from disk directly 2015-02-20 16:36:36 -05:00
Albert Santoni
2e2c3d6276 Merge of cc-5709-airtime-analyzer-saas-refactor into saas 2015-02-20 14:27:16 -05:00
Albert Santoni
2a89e4d5a0 Massive refactor of the analyzer branch and sync it back up with the 
cloud storage branch (for the last time)

* Backported all the bugfixes from cc-5709-airtime-analyzer-cloud-storage
* Backported missing FileStorageBackend.php
* Fixed CC-6001: Track titles and artist names with slashes break audio preview
* Refactored all the MediaController code, pulling out the logic into MediaService
* Fixed an API key leak to guests in the Media API
* Made this branch work without cloud_storage.conf (defaults to file storage)
* Made ApiController's getMediaAction use the MediaService code
 2015-02-20 14:01:06 -05:00
Albert Santoni
6d00da89db Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/models/airtime/CcFiles.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
 2015-02-20 11:14:11 -05:00
Albert Santoni
0177e40083 Pull the logic for Media REST API out of the controller 2015-02-19 15:10:01 -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
230cdcccb4 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	CREDITS
 2015-01-22 11:29:38 -05:00
drigato
38882abd1a SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download 2015-01-16 15:15:37 -05:00
drigato
527d2851af SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download 2015-01-16 15:15:14 -05:00
drigato
19626ed4f5 SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download 2015-01-16 13:26:55 -05:00
drigato
775008b274 SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download 2015-01-16 12:13:04 -05:00
drigato
a4461dc79a Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2015-01-13 15:50:20 -05:00
drigato
2185fc9ca4 SAAS-536: Check for future scheduled files uses cloud_file id instead of cc_files id 2015-01-13 15:49:57 -05:00
Mark Lewis
174cf79d84 clean up shows endpoint, remove dependency on Show model 2015-01-09 13:02:25 -05:00
drigato
09c30bde1b Regenerated Propel models because some fields and methods were missing. 2014-12-16 10:53:39 -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
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
7c0a25be7f SAAS-505: Extract Amazon_S3 class and have it inherit from a general 'cloud backend' class 2014-12-01 21:05:46 -05:00
drigato
6cb993cc80 SAAS-504: Store provider in db 2014-11-27 15:44:53 -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
c132cac43d Code cleanup 2014-11-12 14:42:34 -05:00
drigato
b304e2fa34 Bug fix 2014-11-11 13:56:17 -05:00
drigato
4893d087e2 Bug fix 2014-11-10 12:53:07 -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
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
e23649173d Added comments to CcFiles and CloudFile classes. 2014-10-30 12:12:47 -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
drigato
f775bedb49 Stopped returning filesize in delete functions. 
Created an Amazon S3 wrapper class around Zend_Service_Amazon_S3 to add more functionality.
 2014-10-21 16:05:50 -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
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
9952c2b58f Auto generated schema file updates 2014-09-19 13:03:09 -04:00
Duncan Sommerville
8494f813ee Updated sql schema to include image_path in Cc_Show table 2014-09-16 18:13:46 -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
10cb5484fe Removed unused function. 
Removed commented out code.
Renamed fillNewLinkedInstances to fillLinkedInstances.
Streamline show instance content if a show goes from unlinked to linked.
 2014-08-25 18:33:15 -04:00
drigato
57c1e76dc7 Added criteria parameter to CcShow->getFutureInstanceIds so we can retrieve results from database instead of cache 2014-08-25 18:31:58 -04:00
drigato
81357bc51f CC-5904: New linked show instances may get an old copy of the schedule 2014-08-25 18:31:20 -04:00
drigato
6249deb1ac Removed unused function. 
Removed commented out code.
Renamed fillNewLinkedInstances to fillLinkedInstances.
Streamline show instance content if a show goes from unlinked to linked.
 2014-08-21 16:40:01 -04:00
drigato
a5704eac6e Added criteria parameter to CcShow->getFutureInstanceIds so we can retrieve results from database instead of cache 2014-08-20 16:35:59 -04:00
drigato
b9ecd00d33 CC-5904: New linked show instances may get an old copy of the schedule 2014-08-18 18:10:45 -04:00
Albert Santoni
60f4d112e7 Optimized linked shows schedule filling 
* Fairly big improvement in memory usage and execution time for 24 hour linked
  shows (memory usage no longer grows with show length)
 2014-08-15 18:18:57 -04:00
Albert Santoni
f072d60ff1 Optimized linked shows schedule filling 
* Fairly big improvement in memory usage and execution time for 24 hour linked
  shows (memory usage no longer grows with show length)
 2014-08-15 18:17:23 -04:00
drigato
fe8e004d87 CC-5898: Future repeating shows may not get generated and/or filled with content 
Create and fill show instances when pypo requests the schedule
Changed getCcShowInstancess function to return all instances
Changed some function calls to retrieve only show instances scheduled in the future
 2014-08-15 11:07:26 -04:00