Commit Graph

394 Commits

Author SHA1 Message Date
drigato 501b22c48d Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2014-11-18 10:32:28 -05:00
drigato 3c73abc786 SAAS-491: Edit meta data not working
Fixed: Propel 1.7 does not cast string types to integers
2014-11-18 10:32: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 b871b32175 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2014-10-30 12:17:34 -04:00
drigato 54d1bcf81e Merge branch '2.5.x' into cc-5709-airtime-analyzer 2014-10-30 12:15:41 -04:00
drigato 10f3c0a290 Merge branch '2.5.x' into saas 2014-10-28 10:29:42 -04:00
drigato 1d3180cc80 CC-5932: Update is_scheduled query is too slow
Forgot to remove some debugging statements
2014-10-28 10:29:25 -04:00
drigato 64a68c972d Merge branch '2.5.x' into saas 2014-10-28 10:26:14 -04:00
drigato eae1b4e17c CC-5932: Update is_scheduled query is too slow 2014-10-28 10:25:40 -04:00
drigato 7018f45c0a Check filesize is greater than zero before deleteing a file from library 2014-10-27 12:39:02 -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
Duncan Sommerville a84e0761ca Updated file deletion to remove cc_files rows properly when deleting from the Library 2014-10-08 18:01:06 -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 46228341b2 Audio preview fix 2014-08-12 11:39:29 -04:00
drigato 35c450be3f Audio preview fix 2014-08-12 11:33:10 -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 f1ea100411 CC-5896: Store cloud files in separate table, inherited from cc_files 2014-07-24 16:56:15 -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
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 c2411b6f41 CC-5884: Modify Pypo -> Download files from cloud storage 2014-07-10 17:56:41 -04:00
drigato f40cdbc8cd Merge branch 'saas' into cc-5709-airtime-analyzer-buy-now-saas 2014-06-23 10:59:07 -04:00
Albert Santoni 0eab0c609b Permissions fixes for Super Admin users 2014-06-20 17:43:20 -04:00
Albert Santoni 1db308330b Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-22 18:47:21 -04:00
drigato 8432799b9a CC-5853: Tracks marked as 'hidden' won't be marked as unavailable in Now Playing page 2014-05-22 14:47:14 -04:00
drigato fb12ee7e54 CC-5855: Output to zendlog when files are deleted from library
Added host name to log message
2014-05-20 14:21:41 -04:00
drigato f684ce4ab9 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-20 14:16:24 -04:00
drigato 4cdd855a21 CC-5855: Output to zendlog when files are deleted from library 2014-05-20 14:15:51 -04:00
drigato b4a9882e9c Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-28 10:27:07 -04:00
drigato d081ff10b2 CC-5807: Disk Space will be updated when file is not actually deleted 2014-04-28 10:25:36 -04:00
drigato 411af6838b Remove logging statement 2014-04-17 17:02:14 -04:00
drigato 64ebd9e720 Logging statement 2014-04-17 16:15:04 -04:00
drigato 8979e4e5a9 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-17 16:09:03 -04:00
drigato df9482f2ff CC-5795: Airtime Analyzer: "Delete file" in Library doesnt remove it from path
Media monitor was still being used to delete the file from stor
2014-04-17 16:08:02 -04:00
drigato d05eae629a Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-16 12:16:08 -04:00
drigato f5a2e59b6d Removed disk space check from StoredFile. This is now done in the Media controller 2014-04-16 12:15:34 -04:00
drigato 10cf16f53a Logging statments 2014-04-16 12:04:18 -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 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 db2b52a1bf CC-5709: Airtime Analyzer
* Some cleanup and refactoring for file deletion in the Media REST API
* Fix the refresh timer on the Add Media page when there's pending
  imports.
2014-03-24 17:14:04 -04:00
Albert Santoni 50a42f12bb CC-5709: Airtime Analyzer
* File import via the Add Media page now works!
* Reworked StoredFile::copyFileToStor() because it's still needed.
* Reworked the way file paths are reported in airtime_analyzer
  and in the RESTful media API
2014-03-17 10:19:39 -04:00
Naomi e71f306c7d CC-5594 : Remove all date_default_timezone_get()
setting display time using user timezone.
last played was never converted properly for display previously.
2013-12-04 15:24:27 -05:00
Naomi 10d8351f93 CC-5594 : Remove all date_default_timezone_get()
setting display timezone to be user's timezone for library utime and mtime.
2013-12-04 15:16:07 -05:00
Naomi fa5c1018bf CRLF 2013-10-16 16:01:30 -04:00
Naomi 60cbd15381 CC-5428 : Ordering by length not working 2013-10-16 15:56:32 -04:00
Naomi 4d01e3b11f CC-5347 : isScheduled doesn't work for webstreams 2013-10-02 11:24:48 -04:00