Commit Graph

540 Commits

Author SHA1 Message Date
Rudi Grinberg bb1e67a83c small refactoring of to os.path.join instead of manual path concatenation. 2012-08-21 10:46:48 -04:00
Martin Konecny a874e9fff7 CC-4114: use liquidsoap shutdown() command to restart liquidsoap
-tying up loose ends
2012-08-20 16:54:01 -04:00
James 1c9e290982 CC-4218: Live resource: Cannot connect live resource.
- fixed
2012-08-20 16:03:29 -04:00
Martin Konecny 5315d1efd0 CC-4114: use liquidsoap shutdown() command to restart liquidsoap
-fixed syntax error
2012-08-20 14:52:35 -04:00
Martin Konecny 4ad3927554 CC-4114: use liquidsoap shutdown() command to restart liquidsoap
-shutdown liquidsoap on install
2012-08-20 14:41:34 -04:00
Martin Konecny 0dd3dd506e add logging in scripts so we know which telnet command is issued 2012-08-20 14:40:46 -04:00
Martin Konecny 79ea05bc1b CC-4114: use liquidsoap shutdown() command to restart liquidsoap
-more fixes
2012-08-20 12:11:03 -04:00
Martin Konecny 72de78bcd1 CC-4114: use liquidsoap shutdown() command to restart liquidsoap
-changed to use init.d script to restart.
2012-08-19 00:41:25 -04:00
Martin Konecny 1dd1ba4420 CC-4114: use liquidsoap shutdown() command to restart liquidsoap
-moved liquidsoap into its own init.d script. Still need to do some testing.
2012-08-18 22:02:15 -04:00
Martin Konecny a6d10d8378 CC-1665: Scheduled stream rebroadcasting and recording
-fix syntax error
2012-08-18 21:48:57 -04:00
Martin Konecny b3ef67e617 CC-1665: Scheduled stream rebroadcasting and recording
-info about current pre-buffering webstream should be persistent...
2012-08-17 17:10:42 -04:00
Martin Konecny 84b616cd28 CC-1665: Scheduled stream rebroadcasting and recording
-reduce liquidsoap CPU percentage from 20 -> 17%.
2012-08-17 16:32:26 -04:00
Martin Konecny d8c48a53fe CC-1665: Scheduled stream rebroadcasting and recording
-take care of situation where stream metadata has apostrophe in it.
2012-08-17 16:12:37 -04:00
Martin Konecny 86c0b7db37 CC-1665: Scheduled stream rebroadcasting and recording
-fix syntax error
2012-08-17 15:55:28 -04:00
Martin Konecny e2425dd22f EOL vim fixes 2012-08-17 15:38:40 -04:00
Martin Konecny a08b31dd39 CC-1665: Scheduled stream rebroadcasting and recording
-ability to schedule streams without a 5 second pre-buffer
2012-08-17 15:38:24 -04:00
Martin Konecny 831a1b1923 CC-4242: MP3 streams have the artist name duplicated
-fixed
2012-08-16 23:51:11 -04:00
Martin Konecny 704a8d0805 CC-1665: Scheduled stream rebroadcasting and recording
-make sure any buffers are cleared out from stream when queue is playing and vice-versa
2012-08-16 23:50:32 -04:00
Martin Konecny 50b7597e28 CC-4242: MP3 streams have the artist name duplicated
-fixed
2012-08-16 23:49:37 -04:00
Martin Konecny 5c1c836f11 CC-1665: Scheduled stream rebroadcasting and recording
-pre buffer streams part 3
-finished
2012-08-15 18:30:12 -04:00
Martin Konecny 4ee0c368ac CC-1665: Scheduled stream rebroadcasting and recording
-pre buffer streams part 2
2012-08-15 17:03:14 -04:00
Martin Konecny 1e57c12ce7 CC-1665: Scheduled stream rebroadcasting and recording
-pre buffer streams part 1
2012-08-15 16:43:01 -04:00
Martin Konecny d773dcd112 CC-1665: Scheduled stream rebroadcasting and recording
-send stream name back to Airtime: [("url","http://idobiradio.com/"), ("title","Good Charlotte - Like It's Her Birthday")]
2012-08-15 15:12:44 -04:00
Martin Konecny f8d63b70d8 fix installer breaking liquidsoap package install 2012-08-08 00:21:19 -04:00
Martin Konecny f33485f8ea Merge branch '2.1.x' into devel 2012-08-08 00:09:13 -04:00
Martin Konecny b5e542ad36 make sure airtime-liquidsoap DNE before attempting to create 2012-08-07 17:41:24 -04:00
Martin Konecny 1891a11373 CC-1665: Scheduled stream rebroadcasting and recording
-Step 1 to make Liquidsoap send back web stream metadata to UI
2012-08-03 18:45:22 -04:00
Martin Konecny 3b25f676c9 CC-3412: Icecast stream name not defined
-fix name being assigned twice
2012-08-03 16:20:48 -04:00
Cliff edd4cbba13 Merge branch '2.1.x' into devel 2012-08-03 14:25:54 -04:00
Cliff 17e2417f18 put apt-get args in correct location 2012-08-03 14:24:39 -04:00
Martin Konecny eb4b3cfcfa Merge branch '2.1.x' into devel
Conflicts:
	install_full/ubuntu/airtime-full-install
2012-08-03 09:45:55 -04:00
Martin Konecny 3f10f94d8f CC-4147: Make Airtime work nicer with Debian package generation scripts.
-liquidsoap is installed from sofab repo
-make sure new deb-multimedia name takes effect
2012-08-03 09:42:41 -04:00
Martin Konecny 194b4ec36e Merge branch '2.1.x' into devel 2012-08-02 18:10:12 -04:00
Martin Konecny 4f1300f58a CC-3412: Icecast stream name not defined 2012-08-02 18:08:17 -04:00
Martin Konecny fcce4bf64c CC-1665: Scheduled stream rebroadcasting and recording
-cancelling a webstream works
2012-08-02 16:26:41 -04:00
Martin Konecny 5f8a5a618d Remove unecessary trailing whitespace 2012-08-01 14:52:21 -04:00
Martin Konecny 63b89043b6 CC-1665: Scheduled stream rebroadcasting and recording
on-air light works with streams now
2012-08-01 14:51:56 -04:00
Martin Konecny eb4c23b0b6 CC-1665: Scheduled stream rebroadcasting and recording
-Fix scheduled streams mixed with scheduled files
2012-07-26 14:49:32 -04:00
Martin Konecny fbc5b72f14 CC-1665: Scheduled stream rebroadcasting and recording
-webstreams now start and stop at the correct time.
2012-07-26 14:49:32 -04:00
Martin Konecny 2ad7e78e10 CC-1665: Scheduled stream rebroadcasting and recording
-initial prototype
2012-07-26 14:41:39 -04:00
Rudi Grinberg 34194e6411 cc-4105: Removed -u from running pypo and mediamonitor. Not necessary anymore. 2012-07-18 11:16:55 -04:00
Rudi Grinberg b021c3e925 Added todo comment 2012-07-17 16:43:04 -04:00
Rudi Grinberg 98b4e3c47b cc-4105: Tweaked php method to have more consistent return values 2012-07-17 16:43:04 -04:00
Rudi Grinberg 68a218d277 cc-4105: fixed runtime error where recorder would initialize and api client instance from a method that would not exist\n\tRefactored getDateTimeObj a little bit 2012-07-17 16:43:04 -04:00
Rudi Grinberg 20e32b98ba Merge branch 'devel' into mediamonitor2
Conflicts:
	python_apps/api_clients/api_client.py
2012-07-16 17:41:36 -04:00
Martin Konecny 832eafdea1 CC-4104: airtime-uninstall should not purge airtime database be default
-small fix
2012-07-16 15:43:17 -04:00
Martin Konecny 35d3d63e08 CC-4104: airtime-uninstall should not purge airtime database be default
-on reinstall use the database
2012-07-16 15:34:09 -04:00
Martin Konecny e056e5ff01 correctly rename AirTime to Airtime 2012-07-16 15:33:44 -04:00
Martin Konecny 4ebcb1b1f9 Merge branch '2.1.x' into devel
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/models/Playlist.php
	python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
2012-07-16 14:31:03 -04:00
Rudi Grinberg 120305f383 cleared up a lot of boilerplate with lazy properties 2012-07-13 11:28:16 -04:00
Martin Konecny 62287a2313 -Remove useless api_client interface 2012-07-12 16:51:11 -04:00
Martin Konecny ee3447f903 CC-4090: Make code style PSR compliant
-User.php
-removed all trailing whitespace
2012-07-10 18:51:32 -04:00
Martin Konecny aecee0574d Random commits gathered and put into one
-since we had an accidental merge between devel and 2.1.x, I'm rounding
up these changes that need to be in 2.1.x and putting them here.
2012-07-09 18:58:22 -04:00
Martin Konecny 5c1af49252 CC-430: Audio normalization (Replaygain Support)
-Added support on Liquidsoap side
2012-07-05 23:24:34 -04:00
denise bc93119adc Merge branch '2.1.x' into devel 2012-07-04 09:46:30 -04:00
Martin Konecny 00745d372d CC-4058: Timeline -> Cannot add song twice if last cursor is selected
-fixed
2012-07-03 17:06:35 -04:00
Martin Konecny 7f66d735a1 fix spelling 2012-07-03 16:43:33 -04:00
denise 3e75b28c9d Merge branch '2.1.x' into devel
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
2012-07-03 10:42:29 -04:00
James 06ac33b130 CC-4052: Pypo: it's not manually grabbing schedule when it times out.
- fixed
2012-06-29 16:07:03 -04:00
denise 001f0790f9 Merge branch '2.1.x' into devel 2012-06-29 12:26:45 -04:00
James e5e0c925e6 CC-4043: Pypo: add same song twice and cancel the first song, the
following song wont play any more

- fixed
2012-06-29 12:11:38 -04:00
denise 335dd1516b Merge branch '2.1.x' into devel
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
2012-06-29 10:57:14 -04:00
James 93bdcf0b26 CC-4032: pyponotify.py fails because not all files in
/var/log/airtime/pypo are read/writable by pypo

- fix
2012-06-28 17:17:36 -04:00
Martin Konecny 13fb3a02c5 CC-4032: pyponotify.py fails because not all files in /var/log/airtime/pypo are read/writable by pypo
-fixed
2012-06-28 17:09:41 -04:00
Martin Konecny dd098d47fa CC-4041: get_current_chain, get_next_schedule_chain should use same utc time variable
-fixed
2012-06-28 16:43:22 -04:00
Martin Konecny f16d8eb438 Log file cleanup + improvements
-Don't show queue timeout as error
-Show UTC time and current timezone on pypo startup
2012-06-28 16:16:02 -04:00
Martin Konecny 226b6e8709 CC-4040: Pypo can start before Liquidsoap
-fixed
2012-06-28 16:15:39 -04:00
Martin Konecny 939fa24495 CC-4039: pypo-push can sometimes die
-fixed
2012-06-28 15:29:38 -04:00
Martin Konecny 7f735fe2fa Log file cleanup + improvements
-Don't show queue timeout as error
-Show UTC time and current timezone on pypo startup
2012-06-28 12:12:22 -04:00
Martin Konecny 81c9eacd00 CC-3892: Pypopush can be executed before Pypofile copying file
-fixed
2012-06-27 16:29:33 -04:00
Martin Konecny 63aae4d9b5 pypocli.py cleanup 2012-06-27 14:37:40 -04:00
Martin Konecny a0723b7007 CC-4030: POLL interval should be 1/2 of the schedule being sent
-fixed
2012-06-27 14:37:16 -04:00
Martin Konecny d6a5200d58 CC-4029: Pypo Notify script incorrectly attempts to use pypo.log log file (should use notify log file)
-fixed
2012-06-27 12:42:38 -04:00
Martin Konecny 0a3c9c7351 clean up indentation + imports for python apps 2012-06-26 22:41:11 -04:00
Martin Konecny 4061059d3a CC-3938: Mono sources don't work for stream rebroadcasting
-fixed
2012-06-26 18:04:05 -04:00
Martin Konecny 43c4b943f2 CC-4017: Run airtime-playour process as root user
fixed world readable permissions when caching file
2012-06-26 17:50:26 -04:00
Martin Konecny a6eb74b1fd CC-4017: Run airtime-playour process as root user
-Done
2012-06-26 17:00:14 -04:00
Martin Konecny 7e7f8147da CC-4017: Run airtime-playour process as root user
-done
2012-06-26 14:55:19 -04:00
denise f029124447 Merge branch '2.1.x' into devel 2012-06-19 17:57:27 -04:00
Martin Konecny 27a6326c58 Merge branch '2.1.2' into 2.1.x
Conflicts:
	python_apps/pypo/pypofetch.py
2012-06-18 14:57:22 -04:00
denise ad978c7843 Merge branch '2.1.x' into devel 2012-06-18 11:23:42 -04:00
Martin Konecny ff35322ae9 CC-3988: Pypo: pypo doesn't update last schedule update time when pyp… 2012-06-17 23:24:15 -04:00
James 53af1928cf CC-3988: Pypo: pypo doesn't update last schedule update time when pypo pulls
schedule from the server

- fixed
2012-06-15 21:31:08 -04:00
denise 3f0a06ee2b CC-3578: Stream label for scheduled shows could fall back to show or station name when no song is currently playing
-done
2012-06-13 12:23:00 -04:00
denise f27fbc14f7 CC-3578: Stream label for scheduled shows could fall back to show or station name when no song is currently playing
-done (falls back to stream name)
2012-06-12 17:40:00 -04:00
denise f3b925daa2 CC-3412: Icecast stream name not defined
-done
2012-06-12 17:08:36 -04:00
James 67c90ae3d6 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-08 14:58:48 -04:00
James 0040f29fd2 CC-3953: Airtime will not auto query for new schedule after 1 hour if it
received new messages unrelated to schedule in the meantime

- fixed
2012-06-08 14:57:59 -04:00
Martin Konecny 2d78f58d42 CC-3947: Pypo log history is too brief
-increased history by 10x
2012-06-08 11:43:55 -04:00
Martin Konecny b128050cc2 CC-3889: Add line "export TERM=xterm" to pypo bash script startup file
-fixed
2012-06-05 13:07:59 -04:00
Martin Konecny b6446442ba CC-3917: record_date field in recorded shows causing problem
-fixed
2012-06-04 11:43:41 -04:00
Martin Konecny 3f481309b8 fix cache not being removed 2012-05-30 18:26:49 -04:00
Martin Konecny 8f214c2ae6 make sure pypo user can write /etc/airtime/liquidsoap.cfg 2012-05-29 11:23:42 -04:00
Martin Konecny 11b52905df CC-3892: Pypopush can be executed before Pypofile copying file
-temp solution
2012-05-29 11:10:48 -04:00
Martin Konecny d8ae8002d2 -make sure to autogenerate liquidsoap.cfg before liquidsoap starts 2012-05-28 18:48:40 -04:00
Martin Konecny b9c6eab39c make sure we explicitly need to tell Airtime services to start 2012-05-28 17:42:48 -04:00
Martin Konecny 41efd93628 pypo-initialize syntax cleanup 2012-05-28 14:28:07 -04:00
Martin Konecny 34523e8ec9 don't start liquidsoap if liquidsoap.cfg DNE 2012-05-28 14:27:44 -04:00
Martin Konecny fb715b135c regenerate liquidsoap.cfg if it doesn't exist 2012-05-28 14:27:30 -04:00
Martin Konecny 3d23d5102b make sure /usr/bin/airtime-liquidsoap symlink is gone 2012-05-28 13:36:49 -04:00
Martin Konecny 7299704ed0 remove airtime-liquidsoap symbolic link on uninstall 2012-05-23 12:38:37 -04:00
Martin Konecny dc789b808d CC-3852: Liquidsoap source.skip just skip current item in the queue instead of all the items in the queue
-replace queue.ignore with queue.remove
2012-05-18 18:11:51 -04:00
Martin Konecny b2c63544a9 CC-3840: Deleting current playing item sometimes results in random next track playing
-possibly fixed
2012-05-17 16:30:40 -04:00
Martin Konecny 105d752ada CC-3840: Deleting current playing item sometimes results in random next track playing
-possibly fixed
2012-05-16 17:12:47 -04:00
Martin Konecny 97df2ee6c7 CC-3840: Deleting current playing item sometimes results in random next track playing
-possibly fixed
2012-05-16 16:27:38 -04:00
denise 1629f41a8d CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing
-fixed
2012-05-16 12:54:02 -04:00
Martin Konecny fd70768910 fix bug with pypo crashing 2012-05-16 10:28:30 -04:00
Martin Konecny 4fd7cd75e9 CC-3828: Pypo push crashed
-fixed
2012-05-15 17:35:44 -04:00
Martin Konecny cadf0acac7 CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
-fix utf-8 check
2012-05-14 19:53:07 -04:00
Martin Konecny c397a6f797 CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
-move utf-8 locale check to bash
2012-05-14 19:46:53 -04:00
Martin Konecny c1d33e9f72 CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
-syntax errors
2012-05-14 19:31:50 -04:00
Martin Konecny b79f02ab88 CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder 2012-05-14 19:19:42 -04:00
Martin Konecny 08c20cff10 CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
-add UTF-8 header everywhere...
2012-05-14 16:09:49 -04:00
Naomi Aro 4165bf6289 CC-3812 : Recorder needs to sleep using microseconds 2012-05-11 18:50:56 +02:00
Martin Konecny 9bb8e2ad8e CC-3792: Record show's file cannot be saved
-fixed
2012-05-10 00:12:14 -04:00
Martin Konecny ee52d2e36e CC-3792: Record show's file cannot be saved
-fixed
2012-05-09 23:24:15 -04:00
Martin Konecny aeb9db95f0 CC-3794: Liquidsoap isn't in media monitor's path 2012-05-09 14:18:17 -04:00
Martin Konecny 22c1e67d58 CC-3779: Make Airtime more resilient to Ubuntu upgrades
undo this change for now
2012-05-07 18:12:59 -04:00
Martin Konecny 95a130bd90 CC-3779: Make Airtime more resilient to Ubuntu upgrades 2012-05-07 16:46:53 -04:00
Martin Konecny 8de8a0be33 replace many Popen calls with more modern subprocess.call 2012-05-07 15:46:49 -04:00
Martin Konecny 240756f98b CC-3767: Pypo push crashed 2012-05-04 19:50:16 -04:00
Martin Konecny 6f3b1bc7c2 Remove 2 second sleep after pushing to Liquidsoap queue 2012-04-30 21:06:26 -04:00
Martin Konecny 39a3382157 CC-3736: Full Install fail at Ubuntu 12.04: virtualenv problem
-should be fixed
2012-04-30 17:53:28 -04:00
Martin Konecny f59bae4246 CC-3736: Full Install fail at Ubuntu 12.04
-Fix logger format
2012-04-30 17:26:04 -04:00
Martin Konecny 234ee0f696 CC-3736: Full Install fail at Ubuntu 12.04 2012-04-30 17:13:52 -04:00
Martin Konecny c84acdfea6 CC-3736: Full Install fail at Ubuntu 12.04
-Forgot some imports
2012-04-30 17:10:12 -04:00
Martin Konecny 141d27bf27 CC-3736: Full Install fail at Ubuntu 12.04
-various fixes
2012-04-30 17:06:35 -04:00
Martin Konecny cf1e9e7615 configure locale for pypo 2012-04-27 17:25:12 -04:00
Martin Konecny b3816061b9 CC-3610: Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW
-fixed
2012-04-26 14:46:29 -04:00
James 83a8c301d7 CC-3708: Recorded file has no creator in metadata, not being associated with
a rebroadcast show.

- the propel db integration was changing str value to int for int columns in DB
2012-04-25 12:14:13 -04:00
Martin Konecny 86282a8d8a CC-3699: Calls to system() function from our Liquidsoap script are blocking
-fixed
2012-04-22 12:01:40 -04:00
Martin Konecny dae8682e51 CC-3691: Pypo needs to write stderr + stdout to the log file
-fixed
2012-04-20 19:12:36 -04:00
paul.baranowski 96b010e7f0 CC-1927 Remove PEAR DB
* Removed all traces of PEAR functions.
* Fixed AirtimeInstall::GetVersionInstalled() to return the correct answer
  even when it cant connect to the database.  Also fixed return value to
  be consistent on failure.
* Fixed phone_home_stat.php and soundcloud-uploader.php
2012-04-19 16:35:19 -04:00
Martin Konecny 9c9838b35c CC-3664: setting of pypo.cfg -> cache_for does not take effect
-these options are deprecated. Have been removed.
2012-04-17 10:23:15 -04:00
Martin Konecny 31303d26e4 CC-3651: tmp file does not copy to Pypo cache
-fixed
2012-04-16 11:45:48 -04:00
Martin Konecny 26be52c459 CC-3462: If destination file already exists in pypo cache, double check if it's the correct file size
-had two copy functions :S
2012-04-13 15:23:01 -04:00
James 7a983b52ed CC-3641: Stream Transition: When a song is added to the for the first time
, the transition fade effects fade in

- fixed
2012-04-13 13:25:40 -04:00
Martin Konecny 169a4827e4 -cleanup unused variables.
-use lambda functions instead of littering class with small functions
2012-04-12 23:14:02 -04:00
Martin Konecny f96b990275 Merge branch '2.0.x' into devel
Conflicts:
	VERSION
	airtime_mvc/application/models/Systemstatus.php
	install_minimal/include/airtime-constants.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/media-monitor/install/media-monitor-copy-files.py
	python_apps/media-monitor/install/media-monitor-initialize.py
	python_apps/pypo/install/pypo-initialize.py
	python_apps/pypo/liquidsoap_bin
	python_apps/pypo/pypopush.py
	utils/airtime-log.php
2012-04-12 19:10:17 -04:00
Martin Konecny fe3dfb6b0c CC-3635: Pypo needs subsecond accuracy for start time
-Done
2012-04-12 17:21:42 -04:00
Martin Konecny a594569ddc CC-3625: "Now Playing->delete the current playing items" will stop output of pypo-liquidsoap
-fixed
2012-04-12 17:09:54 -04:00
denise d06b3573e9 CC-3623: Need to send show name to Liquidsoap. (Currently sending name as "TODO")
-fixed
2012-04-11 19:22:47 -04:00
James 1f5f5057bf CC-3430: Live Stream: Admin should be able to kick out the source connection
- fixed
2012-04-11 16:20:27 -04:00
James 92f0f11047 CC-3475: Pypo does not handles the case of RabbitMQ being restarted
- added the other exception as well
2012-04-11 16:12:06 -04:00
James 268ba66194 CC-3566: Preferences->"Fade In" is not respected when Show starts
- adding some comments
2012-04-11 13:44:24 -04:00
James 13502b4c08 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-11 12:27:54 -04:00
James f82aef2a85 CC-3566: Preferences->"Fade In" is not respected when Show starts
- millisecond value of fade was sent wrong from php side.
- crossfade() call was removed and it was causing fade in/out not working.
2012-04-11 12:27:41 -04:00
Martin Konecny a09a31bc88 CC-3610: Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW
-pypo side fixed
2012-04-10 23:13:52 -04:00
James 21f8ed2578 CC-3475: Pypo does not handles the case of RabbitMQ being restarted
- pypomsghandler catches such execption and handles the case by calling
init_rabbit_mq()
2012-04-10 17:36:59 -04:00
Martin Konecny e549e997ae CC-3525: Pypo needs to look at end time of each track when receiving a new schedule 2012-04-07 22:33:32 -04:00