Commit Graph

671 Commits

Author SHA1 Message Date
Martin Konecny 1d1405f7fd CC-2675: Edit ongoing show
-initial commit
2012-03-14 15:37:04 -04:00
James c5c9fd7ba8 CC-3430: Live Stream: Admin should be able to kick out the source connection
- Clicking a button on UI triggers sending msg to pypo, which will lead running
'kick' command in liquidsoap.
2012-03-14 14:43:11 -04:00
James 2ee4b227fc CC-3439: Live Stream: Only admin should be able to turn on/of switch and
able to see kick out button

- done
2012-03-14 14:43:11 -04:00
James 3c6aff093e CC-3437: Live Stream: Liquidsoap(Pypo) should preserve the last switch status
when it restarts.

- Pypo contacts airtime on bootup and ask what the last switch status was
2012-03-14 14:43:10 -04:00
James 4eefc05366 CC-3427: Live Stream: Ability to switch off Scheduled Play
- done
2012-03-14 14:43:10 -04:00
James 68fa46f017 CC-3415: Live Stream: Disconnect all input.harbor connections before
terminating the process

- call prepare termiate on monit-restart()
2012-03-14 14:43:10 -04:00
James cde6db812f CC-3415: Live Stream: Disconnect all input.harbor connections before
terminating the process

- Modified init.d script. init.d script calls liquidsoap_prepare_terminate.py
2012-03-14 14:43:10 -04:00
James f193047a1c CC-3367: Display in Now Playing whether Live DJ stream and Live Master stream
are connected and give user the ability to block those streams

- added stream source switch interface
- backend code
2012-03-14 14:43:10 -04:00
James d4a387e113 - adding switch to liquidsoap 2012-03-14 14:41:00 -04:00
James dfe87723f0 - bug fix in stream setting
- testing lisquidsoap
2012-03-14 14:41:00 -04:00
James 128a497059 CC-3224: "On-the-fly" stream rebroadcasting
- frond-end implementation for master dj and live dj
- db implementation
- liquidsoap is broken on this commit
2012-03-14 14:41:00 -04:00
James 96c4462adc - delete unnecessary part from config files 2012-03-14 14:41:00 -04:00
James 1ebe3d1812 CC-3224: "On-the-fly" stream rebroadcasting
- Live source is created when only both port and mount point are specified
2012-03-14 14:41:00 -04:00
James 30901aa0d6 CC-3224: "On-the-fly" stream rebroadcasting
- A section where user can setup port and mount point for harbor input in
stream setting page(front-end and back-end)
- updated the part where it rewrites the liquidsoap.cfg file
2012-03-14 14:41:00 -04:00
James 48bb19d758 CC-3224: "On-the-fly" stream rebroadcasting
- web interface
- auth script for liquidsoap
- DB changes
2012-03-14 14:41:00 -04:00
James ca04a7a686 CC-3224: "On-the-fly" stream rebroadcasting
- Form in preference section
2012-03-14 14:41:00 -04:00
Martin Konecny 1dc9f51c47 CC-3411: pypo-notify should write to its own log
-done
2012-03-13 16:53:10 -04:00
Martin Konecny 6f270bfb3d Merge branch '2.0.x' into devel
Conflicts:
	VERSION
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
	install_minimal/include/airtime-constants.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypocli.py
	python_apps/pypo/pypofetch.py
2012-03-12 17:52:17 -04:00
Naomi Aro b58e948825 CC-733 : adding extra error messages 2012-03-09 11:28:43 +01:00
Martin Konecny 9715de11f5 CC-3372: Improved pypo cache delete
-Done
2012-03-05 19:02:46 -05:00
Martin Konecny 249b743dd1 CC-3384: Pypo On-Air is off and streaming is not playing on every other songs in a show.
-temporary solution to make sure we don't push same song multiple times.
2012-03-05 16:09:17 -05:00
Martin Konecny a4f528021f CC-3384: Pypo On-Air is off and streaming is not playing on every other songs in a show.
-fixed, but there is another small problem
2012-03-05 16:01:58 -05:00
Martin Konecny c353009d39 CC-3377: Airtime 2.0.2 install fails for ubuntu 11.10
-user binary_path var
2012-03-02 18:41:03 -05:00
Martin Konecny 82812e15a5 CC-3377: Airtime 2.0.2 install fails for ubuntu 11.10
-should be fixed
2012-03-02 11:45:27 -05:00
Martin Konecny d03d01bce9 CC-3366: Pypo: Use local files instead of downloading them
-done
2012-03-01 18:00:46 -05:00
Martin Konecny 92f19139b9 CC-3336: Refactor schedule API used by pypo
-done
2012-02-29 21:27:42 -05:00
Martin Konecny a6413f2d1a CC-3336: Refactor schedule API used by pypo 2012-02-28 22:33:19 -05:00
Martin Konecny 497715df44 Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo
Conflicts:
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py
2012-02-28 19:22:13 -05:00
Martin Konecny b572b26b68 CC-3336: Refactor schedule API used by pypo
-make sure that empty arrays are objects and not arrays
-clean up some comments
2012-02-28 15:32:18 -05:00
Martin Konecny 1d02c56874 CC-3336: Refactor schedule API used by pypo
-refactored pypo-push
2012-02-28 15:04:24 -05:00
Martin Konecny 11f31effca CC-3336: Refactor schedule API used by pypo 2012-02-28 15:04:24 -05:00
Martin Konecny 99c24ed038 CC-3336: Refactor schedule API used by pypo
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-28 14:52:44 -05:00
James d8f7cce56e CC-3346: Recorder will not record shows if calendar is not touched 2
hours before the recorder starts

- apiclient should log to correct log file.
2012-02-28 14:45:33 -05:00
James d4cdac505a CC-3346: Recorder: Merge recorder with pypo
- fixed log message
2012-02-28 14:45:18 -05:00
James 5aabe89069 CC-3346: Recorder: Merge recorder with pypo
- separated rabitMQ listener part out from pypoFetch and created
pypomessagehandler.py

Conflicts:

	python_apps/pypo/pypofetch.py
2012-02-28 14:44:39 -05:00
james 91ef7f7669 CC-3346: Recorder: Merge recorder with pypo
- function parse_show was renamed to process_recorder_schedule
- using thread on self.process_schedule call
2012-02-28 14:42:43 -05:00
Martin Konecny 413d669bbf Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo
Conflicts:
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py

-weird conflict. I must have committed while I had my changes git-stash'ed
2012-02-28 13:58:10 -05:00
Martin Konecny 39fac2f88a CC-3336: Refactor schedule API used by pypo
-refactored pypo-push
2012-02-28 11:06:31 -05:00
James ba828a28bc CC-3346: Recorder will not record shows if calendar is not touched 2
hours before the recorder starts

- apiclient should log to correct log file.
2012-02-28 10:00:43 -05:00
James 33b6c2a390 CC-3346: Recorder: Merge recorder with pypo
- fixed log message
2012-02-27 18:09:07 -05:00
James f030cf4f67 CC-3346: Recorder: Merge recorder with pypo
- separated rabitMQ listener part out from pypoFetch and created
pypomessagehandler.py
2012-02-27 16:18:10 -05:00
Martin Konecny e8f329aef1 CC-3336: Refactor schedule API used by pypo 2012-02-27 13:52:35 -05:00
james 38c16df138 CC-3346: Recorder: Merge recorder with pypo
- function parse_show was renamed to process_recorder_schedule
- using thread on self.process_schedule call
2012-02-25 09:44:33 -05:00
James 4e72c1150d CC-3346: Recorder: Merge recorder with pypo
- Upgrade for 2.0.2
2012-02-24 16:24:12 -05:00
James 446233fbd4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-24 14:15:06 -05:00
James f92c425890 CC-3345: Enter unusable state when liquidsoap value has an '='
character in it.

- fixed
2012-02-24 14:14:42 -05:00
James 2f689ed583 CC-3346: Recorder: Merge recorder with pypo
- Pypo fech works as msg listner for recroder now.
- recorder is part of pypo and all it does is waiting for msg from pypo
fetch and spwan a show recorder thread.
- added new parameter logger to api client. This way apiclient will log
into specific log file instead of grabbing current log file.
- show recoder is removed from all check system/status page
2012-02-24 14:11:35 -05:00
James 06c825479b CC-3345: Enter unusable state when liquidsoap value has an '='
character in it.

- fixed
2012-02-24 14:10:27 -05:00
James 695535ae64 CC-3346: Recorder: Merge recorder with pypo
- Pypo fech works as msg listner for recroder now.
- recorder is part of pypo and all it does is waiting for msg from pypo
fetch and spwan a show recorder thread.
- added new parameter logger to api client. This way apiclient will log
into specific log file instead of grabbing current log file.
- show recoder is removed from all check system/status page
2012-02-24 13:12:50 -05:00
Paul Baranowski ca535ea763 Removed OBP refs and code. 2012-02-23 16:08:16 -05:00
Martin Konecny c433b08158 CC-3336: Refactor schedule API used by pypo
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-23 15:20:25 -05:00
Martin Konecny da012af6ed CC-3336: Refactor schedule API used by pypo
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-22 20:41:24 -05:00
Martin Konecny 54f81ca5de CC-3342: Pypo: if a user doesn't update anything on calendar for 24 hrs, it could cause a problem.
-make it so that we cannot use all CPU if spinning in while loop
-remove Message Acknowledge exception
2012-02-22 19:23:48 -05:00
Martin Konecny d5a8f63d36 CC-3342: Pypo: if a user doesn't update anything on calendar for 24 hrs, it could cause a problem.
-fixed
2012-02-22 17:56:17 -05:00
Martin Konecny 443b55302c -update version strings from 2.0.1 -> 2.1.0 2012-02-14 15:52:52 -05:00
Martin Konecny 54cbc86a0a Merge branch '2.0.x' into devel
Conflicts:
	VERSION
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Nowplaying.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/application/models/airtime/CcShowInstances.php
2012-02-14 14:47:07 -05:00
Martin Konecny 5862324da9 CC-3326: Make /etc/monit/conf.d is empty of any old Airtime files before upgrading!
-fixed
2012-02-14 09:37:20 -05:00
Martin Konecny 0424a7f1d1 -We don't want any of our python services running at install time. Disable them early on. 2012-02-12 11:44:23 -05:00
Martin Konecny 885572b36d CC-3321: Multiple messages are sent to Pypo via RabbitMq at one time, causing multiple telnet connections to Liquidsoap.
-Fixed
2012-02-11 23:53:43 -05:00
Martin Konecny eadf68cb61 CC-3318: When changing stream settings (Liquidsoap + Pypo restart), sometimes Airtime does not resume playback
-fixed
2012-02-10 18:43:40 -05:00
Martin Konecny 33b594c39a CC-3318: When changing stream settings (Liquidsoap + Pypo restart), sometimes Airtime does not resume playback
-syntax error
2012-02-10 14:58:48 -05:00
Martin Konecny ccb942838a CC-3318: When changing stream settings (Liquidsoap + Pypo restart), sometimes Airtime does not resume playback
-initial commit
2012-02-10 14:53:22 -05:00
James 9ae0bed01a CC-3299: Media monitor should not change the owner of watched files
- Media Monitor will try to set files to world readable upon adding
2012-02-08 17:43:32 -05:00
James 86150a5fba CC-3299: Media monitor should not change the owner of watched files
- Media Monitor will try to set files to world readable upon adding
2012-02-08 17:42:42 -05:00
James 860a5e4f7e - version string change for 2.0.1 2012-02-08 16:23:01 -05:00
James af305fce47 CC-3299: Media monitor should not change the owner of watched files
- it sets dir permission 02777 and file permission to 0666 if the path
is under "stor" dir, else it tries add world readable bit.
2012-02-08 15:16:11 -05:00
James 5b47402ed0 CC-3299: Media monitor should not change the owner of watched files
- it sets dir permission 02777 and file permission to 0666 if the path
is under "stor" dir, else it tries add world readable bit.
2012-02-08 15:14:58 -05:00
james b08e7787d3 CC-3299: Media monitor should not change the owner of watched files
- bug fix
- better logging
2012-02-07 13:37:42 -05:00
james 22a53dd250 CC-3282: Issue with file causing media-monitor to crash (Spotted on Resonance FM)
- removed part of the code where it tries to handle cp1252 which ended up
causing more issues

Conflicts:

	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
2012-02-07 13:37:27 -05:00
james 951f90adc0 CC-3299: Media monitor should not change the owner of watched files
- bug fix
- better logging
2012-02-07 13:35:55 -05:00
james e5a8d65576 CC-3282: Issue with file causing media-monitor to crash (Spotted on Resonance FM)
- removed part of the code where it tries to handle cp1252 which ended up
causing more issues
2012-02-07 13:35:46 -05:00
Martin Konecny da2ab1caa9 Merge branch 'cc-3297-php-db-and-zendframework-external' into 2.0.x 2012-02-06 20:29:12 -05:00
Martin Konecny 58b4576ae1 CC-3297: Depend on zendframework and php-pear as external packages
-DB dependency should now be externalized
2012-02-06 14:18:03 -05:00
James 94aaf5b70e CC-3299: Media monitor changes the owner of watched files?
- bug fixed
2012-02-06 12:33:24 -05:00
James 3689d229d1 Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-06 12:32:40 -05:00
James 4b7272a173 CC-3299: Media monitor changes the owner of watched files?
- bug fixed
2012-02-06 12:32:21 -05:00
Martin Konecny 62d1d56fd2 Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-06 12:28:49 -05:00
Martin Konecny e8afd086bd -fix annoying issue where media-monitor refuses to start if tmp directory
/var/tmp/airtime does not exist. Just create it.
2012-02-06 12:28:39 -05:00
James 4043f011b5 Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-06 12:28:31 -05:00
James 084214b6c8 CC-3299: Media monitor changes the owner of watched files?
- media monitor now tries to set the permission to www-data if the file/dir
cannot be read by www-data
2012-02-06 12:28:16 -05:00
James a79dd4fe04 CC-3299: Media monitor changes the owner of watched files?
- media monitor now tries to set the permission to www-data if the file/dir
cannot be read by www-data
2012-02-06 12:26:20 -05:00
Martin Konecny 214c6e85cc -remove unneeded check of "if file_info is not None:"
-remove undefined variable fomr phone_home_stat.php
2012-02-02 16:14:13 -05:00
James 6812f69962 CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
- fixed a bug.
- extra fix: handle cancel recording event gracefully
- better log
2012-02-01 10:59:03 -05:00
James 1df1388602 CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
- bug fix
2012-02-01 10:59:03 -05:00
James 25ab4d39b2 CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
- The issue was that the recorder wasn't pulling any schedule from
Airtime. It should pull it when real timeout(every 1 hr) happens
2012-02-01 10:59:03 -05:00
James 47eacd1165 CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
- fixed a bug.
- extra fix: handle cancel recording event gracefully
- better log
2012-02-01 10:33:03 -05:00
James da89b9fa74 CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
- bug fix
2012-02-01 10:33:03 -05:00
James 47acb16e20 CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
- The issue was that the recorder wasn't pulling any schedule from
Airtime. It should pull it when real timeout(every 1 hr) happens
2012-02-01 10:33:03 -05:00
James 3b64da7f4e CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
- fixed a bug.
- extra fix: handle cancel recording event gracefully
- better log
2012-01-31 15:28:57 -05:00
James 4874eb4f34 CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
- bug fix
2012-01-31 11:37:12 -05:00
James 733b23e7fc CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
- The issue was that the recorder wasn't pulling any schedule from
Airtime. It should pull it when real timeout(every 1 hr) happens
2012-01-31 11:22:30 -05:00
Martin Konecny 6215eb0dba -fix upgrade for large result sets. 2012-01-25 05:01:56 -05:00
James 438340ff9a CC-3266: Pypo: pypopush will perfom better if it only process the
lastest msg from the rabbitMQ queue

- done
2012-01-18 17:52:09 -05:00
Martin Konecny 54ee177f7d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-16 13:58:45 -05:00
James ecdd957525 CC-3245: upgrade 1.8->2.0 cause error in show recorder
- new cofig field was missing from recorder.cfg.200
- better log when execption happens
2012-01-13 16:25:56 -05:00
James a24310e690 CC-3245: upgrade 1.8->2.0 cause error in show recorder
- new cofig field was missing from recorder.cfg.200
- better log when execption happens
2012-01-13 16:24:16 -05:00
James 08a09e4096 CC-2977: Never delete files from the database
- using mtab(previous and current) files to figure out directories to be
added or removed
- adding index to cc_files
- see the tickets and media monitor design page for more info
2012-01-12 17:55:05 -05:00
James 09d50e7e25 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-12 16:38:21 -05:00
James 04b592b831 CC-3245: upgrade 1.8->2.0 cause error in show recorder
- fixed
2012-01-12 16:36:14 -05:00
James 04b48d47cc CC-2977: Never delete files from the database
- Files are marked deleted(file_exists to false) on deletion.
- Dirs are marked removed(removed flag to true) on removal of watched
folder in a usual way. If dir is unmounted, without being removed from
watched list first, it will be marked as not exists(exist flag to false)
- Manage Media Folders will show if dirs exist or not( mounted or not)
- Playlist builder will show if files exists or not
2012-01-11 12:17:48 -05:00