Commit graph

381 commits

Author SHA1 Message Date
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
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
Mark Lewis
17a577fbbb use is_numeric instead of is_int as values are strings 2015-01-09 13:02:25 -05:00
Mark Lewis
1b03bd7fbd use new var instaead of calling getShowListContent again 2015-01-09 13:02:25 -05:00
Mark Lewis
fc8e65944e added error checked for required params 2015-01-09 13:02:25 -05:00
Mark Lewis
1cc1f8a378 return error for missing instance_id on show-tracks action 2015-01-09 13:02:25 -05:00
Mark Lewis
174cf79d84 clean up shows endpoint, remove dependency on Show model 2015-01-09 13:02:25 -05:00
Mark Lewis
a27ca2f583 cleanup new HTTP apiendpoints, added HTTPHelper and getStartEndFromRequest and updated all controllers that called their own versions of this function 2015-01-09 13:02:25 -05:00
Mark Lewis
03dae5be2b fix spacing in ApiController 2015-01-09 13:01:43 -05:00
Mark Lewis
44b4faf6d9 added shows, show-schedules, show-preview, show-history-feed, item-history-feed endpoints to the HTTP api to be used via NewscoopAirtimePlugin 2015-01-09 13:01:42 -05:00
drigato
e59cd11370 Close the session when a track is previewed or downloaded.
Close the file pointer when we are down with it.
2014-11-27 13:48:34 -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
drigato
f08535cc10 Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/application/Bootstrap.php
2014-11-26 10:35:48 -05:00
drigato
8e8fe2d288 SAAS-489: Cannot preview tracks stored on disk 2014-11-20 17:11:23 -05:00
drigato
c132cac43d Code cleanup 2014-11-12 14:42:34 -05:00
Duncan Sommerville
795e239ff3 Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls. 2014-11-06 18:39:48 -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
Duncan Sommerville
598b18b65a Added live-info-v2 and station metadata api calls 2014-10-24 15:11:27 -04:00
drigato
b7d1852fc0 CC-5896: Store cloud files in separate table, inherited from cc_files 2014-07-28 16:11:05 -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
drigato
e7dfc08128 CC-5892: Handle when a file is downloaded from the Airtime library 2014-07-10 17:59:27 -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
86dafaf61c SAAS-404: Separate the Airtime API version from the Airtime version
* Airtime PHP side can be version bumped without pypo freaking out now
2014-02-14 16:22:15 -05:00
drigato
3b9608a8df CC-5693: API call to notify-item-start-playing fails because an invalid schedule id is sent
Temporary fix for this bug. Throw an exception if no schedule item is found.
2014-02-10 16:19:26 -05:00
Albert Santoni
a96c2551ef CC-5627 : Check all Application_Common_DateHelper calculations that use
timezone.

* Fixed GetPlayOrderRange to be consistently return everything in UTC.
* ApiController liveInfoAction now returns everything consistently in
  the station timezone. This fixes negative remaining time that could
  occur in the embeddable JS Airtime widgets if you were logged in to
  Airtime while you viewed your website. (The widgets display in
  the browser's local time.)
* ScheduleController getCurrentPlaylistAction() returns everything
  consistently in the user timezone now.
2013-12-12 13:28:51 -05:00
Naomi
b13d12eaac CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-11 15:20:19 -05:00
Naomi
3d1f0b0d0e CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-10 17:41:59 -05:00
Naomi
3a2f9a24b5 CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
working on getting widgets to work properly returning station local time.
2013-12-10 16:45:05 -05:00
Naomi
20b32bab80 CC-5594 : Remove all date_default_timezone_get()
simplifying code, removing unnecessary calculations.
2013-12-04 16:05:18 -05:00
denise
c687b6ad24 Merge branch 'master' of https://github.com/jamieconnor/Airtime
Conflicts:
	airtime_mvc/application/services/ShowService.php
2013-10-08 11:16:25 -04:00
Naomi
1fa13eed13 CRLF 2013-09-30 13:59:08 -04:00
Naomi
7d739a0f66 CC-5316 : Playout History: Doesn't support webstream
adding the webstream metadata to the history table.
2013-09-30 13:56:27 -04:00
Jamie Connor
1c6d7725ca Modified weekInfo from ApiController to display current week and next, changed widget to display extra days. 2013-09-18 17:35:32 +12:00
Jamie Connor
6da9b6bf42 Removed repeated code 2013-09-07 14:52:45 +12:00
Naomi
4fd37a4fa0 Merge branch '2.4.x' into ryerson-history 2013-08-30 16:07:41 -04:00
Jamie Connor
b1e71e5adf added optional parameter number_of_days for getting schedule information 2013-08-26 11:26:09 +12:00
denise
50d5685199 CC-5270: looping on InvalidContentType 2013-08-14 17:43:14 -04:00
drigato
4cbbd1145b CC-5285: API Request: Get ON AIR light status 2013-07-24 15:30:49 -04:00
drigato
d9859ff006 CC-5285: API Request: Get ON AIR light status 2013-07-24 15:17:10 -04:00
denise
c2f2a541c7 CC-5285: API Request: Get ON AIR light status 2013-07-23 17:39:38 -04:00
Naomi
328c1f3cac IM-733 Create Development timetable for Airtime Development
IM-777
Database structure for new History Feature
2013-07-03 15:19:05 -04:00
Martin Konecny
046039ece1 CC-5207:
media-monitor restart will reset the cuein/cueout value

-fixed
2013-06-05 16:14:14 -04:00
Martin Konecny
2250d89cbd CC-5013:
Re-Added watched folder wont update

-fixed
2013-05-10 13:19:56 -04:00
Martin Konecny
f5fa033207 better flow in dispatchMetadata function 2013-05-09 17:37:23 -04:00
Martin Konecny
d902d38429 revert jsonEncode change not supported by older zend versions 2013-05-02 17:50:36 -04:00
Martin Konecny
ca22a25827 fix silly mistake with echoing json twice 2013-05-02 16:57:07 -04:00
Martin Konecny
acfc72f422 use sendJson, instead of manually disabling layouts + encoding data 2013-04-26 18:06:07 -04:00