Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,212 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

343 Commits

Author SHA1 Message Date
drigato 23fe12651f SAAS-838: Undefined variable previousMediaName 2015-08-05 09:48:31 -04:00
drigato 07f02260db Fix undefined index: nextMediaName 2015-07-17 09:57:24 -04:00
Duncan Sommerville 04290e28dc Fix error getting current schedule information if connected to master source 2015-06-29 14:25:00 -04:00
Duncan Sommerville 5fe70754bd Replace all timestamp strings with constant 2015-06-26 14:42:52 -04:00
Duncan Sommerville 616cf143d5 SAAS-877 - Fix live-info-v2 behaviour 2015-06-24 14:28:04 -04:00
Duncan Sommerville ef957fe0aa SAAS-877 - Fix errors 2015-06-24 13:07:13 -04:00
Duncan Sommerville fd8194e7d8 Fix error getting media 2015-06-24 12:40:51 -04:00
Duncan Sommerville ffc3ef1bc9 SAAS-877 - Update live-info-v2 api 2015-06-24 12:31:32 -04:00
Duncan Sommerville 7645f67515 SAAS-877 - Update live-info-v2 api 2015-06-24 12:18:52 -04:00
drigato b5e72d673f Next track in dashboard was wrong sometimes 
Was not filtering by playout_status
 2015-06-02 09:48:43 -04:00
drigato 182b12e0e3 SAAS-794: Schedule/get-current-playlist can take too long to respond 
Fix for incorrect previous/next metadata when tracks are shuffled around
in current playing show.
 2015-05-28 09:47:58 -04:00
drigato c85457ec0b SAAS-794: Schedule/get-current-playlist can take too long to respond 
Fix for undefined variable
 2015-05-22 10:53:29 -04:00
drigato 099537a1b7 SAAS-794: Schedule/get-current-playlist can take too long to respond 
Renamed function
Removed old function
 2015-05-22 09:47:55 -04:00
drigato 8b02002f5e Merge branch 'saas-dev' into saas-temp-testing 2015-05-22 08:56:43 -04:00
drigato c9a6260cc0 SAAS-794: Schedule/get-current-playlist can take too long to respond 
Removed commented code
 2015-05-22 08:53:29 -04:00
drigato 5330859f00 SAAS-794: Schedule/get-current-playlist can take too long to respond 
small fix
 2015-05-22 08:51:32 -04:00
drigato b80c102e99 SAAS-794: Schedule/get-current-playlist can take too long to respond 
Fixes for webstreams
 2015-05-22 08:09:59 -04:00
drigato 537fd2f148 SAAS-794 Schedule/get-current-playlist can take too long to respond 
Replaced GetPrevCurrentNext function with new one that is much simpler
and less taxing on the database and web server.
 2015-05-20 16:10:31 -04:00
drigato 4451c49c06 SAAS-772: Send metadata to Tunein 
This is pretty much working except with master source metadata
 2015-05-19 14:39:05 -04:00
Albert Santoni c72cdbc19d More preventative coding for the player and fixed the live-info-v2 API 2015-04-29 12:17:44 -04:00
Albert Santoni 2e2c3d6276 Merge of cc-5709-airtime-analyzer-saas-refactor into saas 2015-02-20 14:27:16 -05:00
drigato e17b330186 Remove just previously added logging statements 2015-01-12 16:26:27 -05:00
drigato c7c683966d Logging 2015-01-12 16:21:53 -05:00
drigato 7bdf34fcd1 Logging 2015-01-12 15:58:50 -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 435c49da98 Changed PYPO's download URL scheme from https to http 2014-12-08 13:57:28 -05:00
drigato 80af25fdf4 Undoing last commit 2014-12-03 18:07:24 -05:00
drigato 963207e26f Trying the PYPO download URL without ssl 2014-12-03 18:01:08 -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 a1062e951f SAAS-503: PYPO -> Use the REST API to download files 
Change download URL to use https
 2014-12-03 14:03:21 -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 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 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
Duncan Sommerville 275ca5eed6 Resolved differences merging 2.5.x into saas 2014-10-27 16:25:42 -04:00
Duncan Sommerville d4e8eed51d Marked old functions for API calls as deprecated 2014-10-27 15:52:58 -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
Duncan Sommerville 598b18b65a Added live-info-v2 and station metadata api calls 2014-10-24 15:11:27 -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 2423ea6787 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2014-10-08 11:46:30 -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
Albert Santoni d438587ddc Merge branch '2.5.x' into saas 
Conflicts:
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/airtime/CcShow.php
	airtime_mvc/application/services/SchedulerService.php
	airtime_mvc/application/services/ShowService.php
 2014-08-25 18:09:51 -04:00
drigato 33f397f577 remove memory usage log statements 2014-08-15 16:25:37 -04:00
drigato 2bc8f6d403 Logging memory usage 2014-08-15 15:36:13 -04:00
drigato 22218079af CC-5898: Future repeating shows may not get generated and/or filled with content 
Refactored show creation into separate function
 2014-08-15 15:35:58 -04:00