Commit Graph

812 Commits

Author SHA1 Message Date
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
Martin Konecny b2a9abe3ef CC-3231: Tracks are still playing after a show ends
-fixed
2012-01-09 17:46:42 -05:00
james 9216da7f03 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2011-12-24 11:03:02 -05:00
james c9c6a08a1c CC-3220: Stream Setting: Status box is stuck on waiting if nothing is
changed and click save

- done
- liquidsoap_update_error and liquidsoap_update_connection functions are
combined into one function, liquidsoap_update_status, in various place
- created various telnet commands in liquidsoap( connection check for each
stream, connection status for all streams)
- In liquidsoap, shoutcast stream doesn't use default id. It is more
informative by using id with "shoutcast_stream_#{stream_number}
2011-12-24 10:59:09 -05:00
Martin Konecny 00a05e146b CC-3222: Add option to disable auto starting Airtime services (after install and after system restart)
-Done
2011-12-23 15:53:30 -05:00
James 579484a91c Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2011-12-15 16:10:42 -05:00
James 22b2b466e5 CC-3207: Exception 'latin-1' codec can't encode character u'\u2013' in
position 32: ordinal not in range(256)

- fixed
2011-12-15 16:09:58 -05:00
Martin Konecny 7d60530312 CC-3206: Add ability to do Airtime upgrade without restarting liquidsoap
-done
2011-12-15 11:22:22 -05:00
Martin Konecny e7ad7f4b79 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2011-12-15 11:16:35 -05:00
Martin Konecny 76fac6fbef CC-3206: Add ability to do Airtime upgrade without restarting liquidsoap
-done
2011-12-15 11:16:14 -05:00
Naomi Aro 6d9e9f3459 CC-2268 : Make MP3 optional for show recorder to remove dependency on lame 2011-12-14 18:07:06 +01:00
Naomi Aro 7a607ba98f CC-2268 : Make MP3 optional for show recorder to remove dependency on lame
have changed to default ogg option/choice between mp3|ogg recording in config.
haven't removed any packages from install just incase they affect liquidsoap.
2011-12-14 17:59:40 +01:00
Martin Konecny 695073c116 -SAAS release 2011-12-07 12:06:31 -05:00
Martin Konecny 60299ff789 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-12-07 11:51:41 -05:00
Martin Konecny 257824c411 -preparation for beta2 release 2011-12-07 11:51:28 -05:00
James 8463262190 CC-3169: Default liquidsoap.cfg file is missing sX_user
- fixed
2011-12-07 11:31:21 -05:00
Martin Konecny 21643a3734 SAAS-56: RabbitMQ virtual host support
-Add support for specifying vhost in config files
2011-12-05 21:05:28 -05:00
Martin Konecny b8e1884583 CC-3155: Show doesn't resume playback on system crash / restarting pypo
-fixed
2011-12-02 17:28:57 -05:00
Martin Konecny f0342e9329 -remove some commented out code 2011-12-02 16:57:18 -05:00
Martin Konecny cbc2ba660f CC-3074: Give users the choice of which hardware sound API they wish to use (instead of hardcoded to ALSA)
-done
2011-12-02 13:39:16 -05:00
Martin Konecny 6bcd96db88 CC-3133: Enabling hardware audio output causes all playout to fail with Portaudio error in write_stream: Output underflowed
-should be fixed
2011-12-02 13:39:16 -05:00
James 043f0c29a1 CC-3074: Give users the choice of which hardware sound API they wish to
use (instead of hardcoded to ALSA)

- finished everything except LS part(including upgrade and UI)
2011-12-02 13:39:14 -05:00
Martin Konecny c48154ef2f SAAS-83: Add ability to install Airtime components separately
-fixed
2011-11-30 17:59:00 -05:00
James 48d9d2d93b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-29 20:16:01 -05:00
James 9c65bfeba7 CC-3131: Latency of stream authentication warning in Stream Settings page
- it compares boot time of liquidsoap and the time user clicks on "Save"
on stream setting page. The status only gets updated if the
"boot_time" > "user update time"
- as soon as a user click on save, status is set to "wating"
- since there is no timing issue, quering interval is reduced to 1 sec
2011-11-29 20:15:38 -05:00
Yuchen Wang 53aecd1c00 CC-3130: Disabling a Shoutcast stream causes the service type to revert back to Icecast
This happens because we use same field in the db to store whether stream is disabled, and which
type is it (Icecast/Shoutcast). Thus when we disable a stream, we forget about the fact that
it was set to Shoutcast before.

Fixed by separating out the enable/disable state from stream type.
Whether a stream is enabled/disabled is stored in new fields sx_enable.
Stream type is stored in the old fields, sx_output.
2011-11-29 16:25:30 -05:00
Martin Konecny 757b2cac4f CC-3041: Module virtualenv was already imported
-hid the error message.
2011-11-25 18:02:56 -05:00
Martin Konecny 15a27526f9 SAAS-83: Add ability to install Airtime components separately
-fixed
2011-11-24 18:10:06 -05:00
Martin Konecny 07b2ed2caf CC-3107: Recorded show file doesn't appear in the playlist builder
-fixed
2011-11-24 16:03:12 -05:00
martin 4c388f0a1a CC-3056: Liquidsoap binaries not working on Ubuntu Maverick
-compiled all liquidsoap binaries
2011-11-18 18:45:37 -05:00
Martin Konecny 34252d680a CC-3056: Liquidsoap binaries not working on Ubuntu Maverick
-use absolute paths since the testing scripts need this.
2011-11-18 15:50:21 -05:00
Martin Konecny 7b872fa89b CC-3056: Liquidsoap binaries not working on Ubuntu Maverick
-better messages at install time
2011-11-18 15:17:30 -05:00
James 6b7d7646c9 CC-3062: Stream Setting: Status box is not working for shoutcast
- fixed. added on_error and on_connect callback to shoutcast()
2011-11-18 11:18:35 -05:00
Martin Konecny 84e2fff36e CC-3058: Extranenous string during install process
-fixed
2011-11-17 18:15:27 -05:00
Martin Konecny 2fc46cd29b CC-3039: Install script doesnt check whether virtualenv exists (Ubuntu 11.10)
-fixed
-moved virtualenv version check into virtualenv-install.sh
2011-11-14 21:28:27 -05:00
Martin Konecny c19b7f7c6e Merge branch '1.9.1' into devel
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/models/MusicDir.php
	install_full/ubuntu/airtime-full-install
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
2011-11-14 21:19:56 -05:00
Martin Konecny 7a9e53fa04 CC-3040: Debian Squeeze requires the Liquidsoap natty binary instead of the generic one
-done
2011-11-14 14:12:12 -05:00
Martin Konecny c3429cbe2a CC-2952: Put in final Liquidsoap 1.0 binaries
-set binaries to executable
2011-11-14 13:08:26 -05:00
Martin Konecny 9270ff01a2 CC-2952: Put in final Liquidsoap 1.0 binaries
-Done
2011-11-10 23:55:15 -05:00
Martin Konecny c2eae518c4 CC-2978: Install fails on Ubuntu 11.10
-fixed for oneiric version of rabbitmq
2011-11-10 14:42:46 -05:00
James 32743ca780 CC-3016: Import files doesn't work on Debian(1.9.5, 2.0)
- added extra comment
2011-11-09 13:36:08 -05:00
James f2b3ef1b73 CC-3016: Import files doesn't work on Debian(1.9.5, 2.0)
- added extra comment
2011-11-09 13:35:22 -05:00
Martin Konecny b33ced99c8 CC-2954: Exception in media monitor using Dropbox
-Need to check if size is >=2, not 3.
2011-11-03 22:12:03 -04:00
James 8e88c56bc6 CC-2954: Exception in media monitor using Dropbox
- This will take care of the exception issue
2011-11-03 16:05:52 -04:00
James a156548ba6 CC-3016: Import files doesn't work on Debian(1.9.5, 2.0)
- adding comment
2011-11-03 15:35:30 -04:00
James b75935abc3 CC-3016: Import files doesn't work on Debian(1.9.5, 2.0)
- adding comment
2011-11-03 15:35:04 -04:00
James 905eaa9ec8 CC-3016: Import files doesn't work on Debian(1.9.5, 2.0)
- fixed
2011-11-03 15:26:10 -04:00
James a85f284296 CC-3016: Import files doesn't work on Debian(1.9.5, 2.0)
- fixed
2011-11-03 15:25:09 -04:00
Martin Konecny 4c5386c0f3 1.9.5 preparations 2011-11-02 15:19:27 -04:00
Martin Konecny 6291c67ace Merge branch '1.9.1' into devel 2011-11-02 10:39:00 -04:00
Martin Konecny 5d0f36f130 CC-3013: Media Monitor throws exception when trying to convert String to Int.
-fixed
-also specified base 10 radix
2011-11-02 10:36:00 -04:00
Martin Konecny b14f2e894d CC-3012: Media-monitor crash: "Exception: list index out of range"
-fixed
2011-11-02 10:10:28 -04:00
Martin Konecny 38a0f8697a CC-2758: Make airtime-install script Debian/Ubuntu compatible
-cleanup
2011-11-01 22:43:12 -04:00
martin f2ef006385 CC-2758: Make airtime-install script Debian/Ubuntu compatible
-cosmetic changes
2011-11-01 15:21:09 -04:00
Martin Konecny fccaa554f5 CC-2758: Make airtime-install script Debian/Ubuntu compatible
-further tweaks
2011-10-28 17:24:38 -04:00
Martin Konecny 56edfe4e68 CC-2758: Make airtime-install script Debian/Ubuntu compatible
-uninstall script added
2011-10-28 12:35:58 -04:00
Martin Konecny b25b0c7ea0 CC-2758: Make airtime-install script Debian/Ubuntu compatible
-rename old files
2011-10-27 16:16:36 -04:00
Martin Konecny 87970740a0 CC-2758: Make airtime-install script Debian/Ubuntu compatible
-install complete
2011-10-27 15:53:54 -04:00
Martin Konecny cd0ff848fc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-27 15:22:49 -04:00
Martin Konecny cf4f151302 CC-2758: Make airtime-install script Debian/Ubuntu compatible
-fixes
2011-10-27 15:22:35 -04:00
James 83c0f7db9b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-27 14:37:57 -04:00
James 455f10f815 CC-2954: Exception in media monitor using Dropbox
- This will take care of the exception issue
2011-10-27 14:34:03 -04:00
Martin Konecny 7496d26032 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-27 14:02:15 -04:00
Martin Konecny 8cafc52cad CC-2758: Make airtime-install script Debian/Ubuntu compatible
-initial commit
2011-10-27 14:01:59 -04:00
james cdcc8ee5ad CC-2935: Upgrade: delete virtualenv dir and reinstall virtualenv
- done
- we reinstall virtualenv on anycase, so we don't need virtualenv-check
2011-10-26 10:41:21 -04:00
James efbd2f53d0 CC-2745: Show status of liquidsoap/icecast connection on Stream
Settings page

- temp commit
2011-10-11 14:40:30 -04:00
James d8c6b722ac Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-11 10:00:39 -04:00
Martin Konecny 8fe10830d5 -fixed on-air light not working. 2011-10-11 13:36:07 +02:00
james d3833f9a32 CC-2745: Show status of liquidsoap/icecast connection on Stream Settings
page

- initial commit
2011-10-10 20:14:27 -04:00
Martin Konecny ffeeabc7c9 -need to install natty liquidsoap binary for oneiric 2011-10-09 02:29:16 -04:00
James c35f77a9aa CC-2932: Recorder: When show is recorded, the file name is generated
with UTC time.

- fixed
- new pybundle is created with 'pytz' package
2011-10-05 17:27:00 -04:00
martin 8d5efd7752 -update liquidsoap to pre-release 1.0 version 2011-10-05 11:44:44 -04:00
James b90b69ebde CC-2926: Clicking "Choose File" in support settings to upload image
defaults to "Audio/MPEG" type in Chrome

- fixed
- extra fix: removing debugging code from api_client.py
2011-10-05 11:21:13 -04:00
James 6e25ae5abf CC-2795: Give option to set download flag of recorded shows uploaded
to Soundcloud by default

- removed debugging code
2011-10-04 17:27:57 -04:00
James 973e934151 CC-2927: Media Monitor: if new dir is generated in the process of
importing a file, airtime doesn't import the file.

- fixed
2011-10-04 17:23:42 -04:00
James 2786d40db8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
2011-10-04 17:22:19 -04:00
James d56a3ee9d6 CC-2927: Media Monitor: if new dir is generated in the process of
importing a file, airtime doesn't import the file.

- fixed
2011-10-04 17:20:22 -04:00
martin cb3060623c Merge branch '1.9.1' into devel
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
2011-10-04 14:01:48 -04:00
martin 5190a0c24c Merge branch '1.9.1' into devel
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/MusicDir.php
	python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
2011-10-04 13:59:27 -04:00
martin e80a9330f5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-04 13:50:16 -04:00
martin b0f6f1e39b CC-2925: Airtime scripts broken with Liquidsoap 1.0 pre-release
-fixed
-also updated the liquidsoap library scripts
2011-10-04 13:50:03 -04:00
James 109bd5d044 CC-2919: Media Monitor: recorded show doesn't show on library after
recording is done

- comments were added
- timestamps updates with IN_MODIFY
2011-10-04 10:20:25 -04:00
James 8d21e4ea95 CC-2919: Media Monitor: recorded show doesn't show on library after
recording is done

- comments were added
- timestamps updates with IN_MODIFY
2011-10-04 10:19:44 -04:00
James b4d4c54c31 CC-2795: Give option to set download flag of recorded shows uploaded
to Soundcloud by default

- fixed name of Soundcloud Model class
2011-10-03 18:02:01 -04:00
James dcda08e17a CC-2919: Media Monitor: recorded show doesn't show on library after
recording is done

- fixed
- extra fix: Airtime wasn't updating file when updating metadata

Conflicts:

	airtime_mvc/application/controllers/LibraryController.php
2011-10-03 14:17:56 -04:00
James 83e8a610df Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-03 14:13:15 -04:00
James 5e9aec93a8 CC-2919: Media Monitor: recorded show doesn't show on library after
recording is done

- fixed
- extra fix: Airtime wasn't updating file when updating metadata
2011-10-03 14:10:47 -04:00
martin 3c6692ebce CC-2806: Create upgrade template file
-missing function
-comment out redundant code
-Create cc_component table on upgrade
2011-09-29 19:00:32 -04:00
James 8ef8dbc668 CC-2886: changing file name 2011-09-29 15:45:04 -04:00
James 38c19ed3a3 CC-2886: changing file name 2011-09-29 15:41:16 -04:00
James bf15b4cf0d Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1 2011-09-29 15:22:40 -04:00
James 6fbf1853ce CC-2743: Import fails on certain files with
'Exception can't sync to an MPEG frame'

- fixed by handling IN_CLOSE_WRITE instead of IN_CREATE
2011-09-29 15:06:31 -04:00
James ba09d712b6 CC-2882: fix misspelling
- fixed
2011-09-29 15:04:19 -04:00
James 3775e5f4a7 CC-2882: Airtime cannot delete watched folder when is been renamed
- done
2011-09-29 15:02:34 -04:00
James 46146d1216 cc-2882: Airtime cannot delete watched folder when is been renamed
- initial commit

Conflicts:

	airtime_mvc/application/models/MusicDir.php
2011-09-29 15:02:30 -04:00
martin c7ec73e1f2 CC-2891: Unicode error with metadata that contains unicode strings
-reversed two changes talked about in code review.
2011-09-29 14:45:56 -04:00
James 9cba129936 CC-2882: fix misspelling
- fixed
2011-09-29 10:25:38 -04:00
James e4959739dc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-29 10:22:25 -04:00
James f670158c6d CC-2743: Import fails on certain files with
'Exception can't sync to an MPEG frame'

- fixed by handling IN_CLOSE_WRITE instead of IN_CREATE
2011-09-29 10:21:52 -04:00
martin 79f8e36ee4 CC-2886: airtime-check-system should not fail Icecast check
if Icecast outputs are not configured in
 /etc/airtime/liquidsoap.cfg
2011-09-28 17:46:37 -04:00
martin 4e105e6151 CC-2891: Unicode error with metadata that contains unicode strings
-fixed
2011-09-28 16:04:40 -04:00
James 9366938240 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-28 15:59:37 -04:00
James c25a52f3ce CC-2894: script exits if there is error
- done
2011-09-28 15:59:13 -04:00
James 3bbd76466a CC-2894: install should check that Virtualenv is functional before proceeding
- install script now check if all python packages are installed, if not,
it will reinstall it
2011-09-28 15:48:42 -04:00
martin 4f22c5b424 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-28 13:53:19 -04:00
martin eb549fe71a CC-2897: Liquidsoap doesn't start when no streams are enabled
-fixed
2011-09-28 13:53:11 -04:00
James 28f1d885f2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-28 13:46:10 -04:00
James d1542b0d89 CC-2882: Airtime cannot delete watched folder when is been renamed
- done
2011-09-28 13:45:21 -04:00
martin 1cbc098e91 CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder 2011-09-28 12:15:13 -04:00
James b1fa8901ca cc-2882: Airtime cannot delete watched folder when is been renamed
- initial commit
2011-09-27 14:49:03 -04:00
martin 2c0b0a2eff CC-2888: Create a monit file for each airtime component
-remove old monit file on upgrade
-remove old monit file from git repo.
2011-09-26 14:47:21 -04:00
martin 974612badf CC-2888: Create a monit file for each airtime component 2011-09-26 14:40:26 -04:00
martin 5cc7de95ee CC-2833: Use ClassLoaders for PHP Files
-Done for class User
2011-09-23 17:00:55 -04:00
martin ee1a173953 CC-2850: Liquidsoap doesn't rotate its log files in Airtime
-fixed
-also noticed files were being chmod'd to 755, which is unnecessary. Also fixed.
2011-09-23 12:23:33 -04:00
martin 9bb901945e CC-2833: Use ClassLoaders for PHP Files
-shows.php
2011-09-23 10:54:20 -04:00
martin 5d7b51dafc CC-2833: Use ClassLoaders for PHP Files 2011-09-22 18:24:54 -04:00
James 6a0a739cef CC-2871: recorder doesn't record shows when it gets multiple shows in the
schedule

- fixed
2011-09-22 15:13:41 -04:00
martin 3a2eaecad8 Merge branch '1.9.1' into devel
Conflicts:
	python_apps/pypo/pypopush.py
2011-09-20 14:31:09 -04:00
martin b94004d7f4 CC-2847: Airtime doesn't resume playing audio after upgrade 2011-09-20 13:25:29 -04:00
martin 3601f37904 CC-2846: On crash recovery, Pypo pushes playlists up to 5 times to Liquidsoap.
-fixed
2011-09-20 12:44:48 -04:00
martin a11dba1469 CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder 2011-09-19 15:46:15 -04:00
Martin Konecny debfcc112d Merge branch '1.9.1' into devel 2011-09-19 12:48:15 -04:00
Martin Konecny 2152ae5b3a CC-2830: airtime-playout not working after reboot on Debian squeeze
-fixed
2011-09-19 12:44:43 -04:00
martin 15f91ca0e1 CC-2838: Character encoding errors with telnet'ing show name to Liquidsoap
-enforce UTF-8
2011-09-18 19:39:36 -04:00
martin 904c53c449 Merge branch '1.9.1' into devel
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
2011-09-18 19:34:45 -04:00
martin 0e503517f5 CC-2838: Character encoding errors with telnet'ing
show name to Liquidsoap

-fixed
2011-09-18 19:32:39 -04:00
martin e1e34d297c -CC-2750: Ability to query health status for pypo, liquidsoap,
media monitor, and recorder
2011-09-16 21:30:50 -04:00
martin 09c1259141 CC-2828: Use monit to monitor rabbitmq-server
-after hours of reading documentation, finally found a way to do this!!!
2011-09-16 20:49:33 -04:00
martin 3485b5a39f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-16 17:53:37 -04:00
martin 80da0ba4a9 CC-2828: Use monit to monitor rabbitmq-server
-potential solution for now...
2011-09-16 17:52:23 -04:00
martin 659e412eb7 CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder
-progress being made
2011-09-16 17:51:28 -04:00
James 7c94734277 CC-2810: More chmnod fixes for scripts
- removed shebang from .py files
- removed cron folder and its content as we don't use them
- .js files are from 3rd party(datatable) so we should leave them as they are
2011-09-16 14:01:23 -04:00
martin b5684bb5b1 Merge branch '1.9.1' into devel
Conflicts:
	install_full/ubuntu/airtime-full-install
	utils/airtime-update-db-settings.py
2011-09-15 17:44:07 -04:00
James c15d599dba CC-2827: Python shebangs should specify the version python2.6
- done
2011-09-15 12:28:31 -04:00
martin 583a5faf72 CC-2750: Ability to query health status for pypo, liquidsoap,
media monitor, and recorder
2011-09-13 18:43:16 -04:00
martin 1555c83668 CC-2750: Ability to query health status for pypo, liquidsoap,
media monitor, and recorder
-cleanup
2011-09-13 17:20:34 -04:00
martin 2c2bb86698 CC-2750: Ability to query health status for pypo,
liquidsoap, media monitor, and recorder

-fixed rabbitmq not delivering messages
2011-09-13 14:56:24 -04:00
martin 0546633ac7 CC-2750:Ability to query health status for pypo, liquidsoap, media monitor, and recorder 2011-09-12 17:15:46 -04:00
martin 1ba200441e CC-2792: installing Airtime 2.0 beta fails on ubuntu 10.04 64 bit
-possibly fixed
2011-09-09 15:38:14 -04:00
martin 9c7bab616d Merge branch '1.9.1' into devel
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/controllers/ScheduleController.php
	install_minimal/airtime-install
	install_minimal/include/AirtimeInstall.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py
2011-09-09 15:07:43 -04:00
martin f1c77845ea CC-2783: Investigate Pypo taking 100% CPU on production system
-fixed
2011-09-09 14:49:12 -04:00
martin ace98569ed CC-2783: Investigate Pypo taking 100% CPU on production system
-fixed
2011-09-09 14:11:56 -04:00
martin 53306dffa4 -update version string to 1.9.4 2011-09-08 15:18:54 -04:00
martin 611630d4eb CC-2788: Airtime uses both /bin/bash and /bin/sh in different scripts
-forgot notify.sh
2011-09-08 13:44:33 -04:00
martin 805e358d9c CC-2788: Airtime uses both /bin/bash and /bin/sh in different scripts
-fixed
2011-09-08 12:36:51 -04:00
martin 6dab211a12 CC-2784: Stopping rabbitmq-server causes pypo CPU usage to increase dramatically
-fixed
2011-09-08 12:17:42 -04:00
martin 03efb8f293 CC-2760: Remove shebangs from files that don't need them, fix chmod of files
-done
2011-09-06 19:06:13 -04:00
James abee16ba4a CC-2747: removing debug code
- fixed
2011-09-01 16:07:13 -04:00
James 610b7a6d2c CC-2747: removing debug code
- done
2011-09-01 16:06:01 -04:00
James 39b688c256 CC-2661: Uptrade script for stream config feature
- codes for conserving user's liquidsoap.cfg and porting into new stream
setting config.
- extra fix: fixed a bug with shoutcast(default value has to be set for
some variables)
2011-09-01 16:02:06 -04:00
James 17e7e9b80a CC-2089: create "cancel show" command for pypo
- removed comments
2011-08-31 16:33:40 -04:00
James fefbd9ac79 Merge branch '1.9.1' into devel 2011-08-31 16:23:32 -04:00
James 22c9416c31 CC-2747: When metadata contains non utf-8 encoding, we should handle it
- we cover some cases with cp1252 encoding for now.
- extra fix: Logging.php (copied from 2.0.0)
2011-08-31 14:46:21 -04:00
James c460519a88 Merge branch '1.9.1' into devel 2011-08-31 10:15:00 -04:00
James cab2a0f8f4 CC-2661: Upgrade script for steam config feature
- done
2011-08-29 17:44:28 -04:00
martin 8b0b5851f6 -fix typo in recorder.py 2011-08-29 14:43:30 -04:00
James 83bba9532e CC-2089: create "cancel show" command for pypo
- done
2011-08-29 11:54:44 -04:00
james 59a3076e42 CC-2726: monit monitor and unmonitor order change
- fixed
2011-08-26 15:44:19 -04:00
james d992457bd5 CC-2607: handling comment
- each line read is trimed now
- xtra bug fixed:
- bug on merging with 1.9.3
- state_change_restart array is filled with info for displaying
purpose
2011-08-26 13:13:02 -04:00
james 56ad8c6b3d Merge branch '1.9.1' into devel
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypofetch.py
2011-08-26 12:56:10 -04:00