Commit Graph

1126 Commits

Author SHA1 Message Date
Rudi Grinberg 499a0a5850 cc-4105: hasattr in conditional statement instead of getattr 2012-07-13 18:04:20 -04:00
Rudi Grinberg 8340079b95 cc-4105: added a method in API client corresponding to chunked requests.\nAlso add prepared corresponding apicontroller method 2012-07-13 17:57:18 -04:00
Rudi Grinberg 47893865cc cc-4105: clean up url construction in api client 2012-07-13 16:32:17 -04:00
Rudi Grinberg a6d51bea8d created a new controller action for chunked requests from media monitor 2012-07-13 14:51:43 -04:00
Rudi Grinberg a4c322efac cosmetic changes 2012-07-13 12:01:14 -04:00
Rudi Grinberg 120305f383 cleared up a lot of boilerplate with lazy properties 2012-07-13 11:28:16 -04:00
Rudi Grinberg 309b071142 added some stat counting 2012-07-13 10:36:36 -04:00
Rudi Grinberg 832401704a fixed clean empty dirs 2012-07-13 10:36:36 -04:00
Rudi Grinberg b0433d4ca4 almost alpha version 2012-07-13 10:36:36 -04:00
Rudi Grinberg d0245e09fc initial commit 2012-07-13 10:36:36 -04:00
Martin Konecny f0f033b4fb CC-430: Audio normalization (Replaygain Support) 2012-07-12 17:58:29 -04:00
Martin Konecny 62287a2313 -Remove useless api_client interface 2012-07-12 16:51:11 -04:00
Martin Konecny b782b9a9b6 CC-4099: More stricter checking on ogg file types
-fixed
2012-07-11 18:14:03 -04:00
Martin Konecny fc1b69e1d1 CC-4092: Not checking for return type "None" on some function calls in media-monitor
-more fixes
2012-07-11 17:09:17 -04:00
Martin Konecny ba5a749073 CC-4092: Not checking for return type "None" on some function calls in media-monitor
-more fixes
2012-07-11 16:48:46 -04:00
Martin Konecny bed2a0731b fix potential exception 2012-07-11 10:39:23 -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 2e5b1d9ca8 CC-4092: Not checking for return type "None" on some function calls in media-monitor
-fixed
2012-07-10 10:48:44 -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
Rudi Grinberg 32c3e877a5 fix typo 2012-07-09 16:30:54 -04:00
Martin Konecny dec68649c1 code cleanup
-changed module name to correct naming convention
-remove some unused imports
2012-07-06 10:20:44 -04:00
Martin Konecny 24349e64d8 CC-430: Audio normalization (Replaygain Support)
-some minor fixes for default value (should be 0 dB not 1dB)
2012-07-05 23:30:53 -04:00
Martin Konecny 5c1af49252 CC-430: Audio normalization (Replaygain Support)
-Added support on Liquidsoap side
2012-07-05 23:24:34 -04:00
Martin Konecny ce698d4123 CC-430: Audio normalization (Replaygain Support)
-Added support on server side
2012-07-05 22:37:40 -04:00
Martin Konecny 70a0dce26e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
	python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
2012-07-05 21:57:12 -04:00
Martin Konecny a687e48d80 CC-430: Audio normalization (Replaygain Support)
-Added support on media-monitor's side
2012-07-05 21:54:44 -04:00
Rudi Grinberg 6fe48547d9 Make sure md['MDATA_KEY_FILEPATH'] is always normalized 2012-07-05 16:46:25 -04:00
Rudi Grinberg e67be25b85 Fixed typo from copy pasting 2012-07-05 16:32:54 -04:00
Rudi Grinberg 38dbc28e1c get rid of pypo permissions since it now runs as root 2012-07-05 16:32:54 -04:00
Rudi Grinberg 5e9302d912 Removed unnecessary whitespace 2012-07-05 16:32:54 -04:00
Rudi Grinberg 7f4e6f98f5 fixed is_audio_file to handle extensionless files. made sure is_user_readable closes opened filehandle 2012-07-05 16:32:54 -04:00
Rudi Grinberg 1916ea8b0e Put duplicate code into mediamonitorcommon. Removed unnecessary blank lines 2012-07-05 16:32:54 -04:00
Rudi Grinberg 6c1af8a96e Changed uses of 'find' to respect supported_file_formats list 2012-07-05 16:32:54 -04:00
Rudi Grinberg 3dfb35d2d1 Fixed typo. Made supported_file_formats static because they should be same for all instances 2012-07-05 16:32:54 -04:00
Rudi Grinberg 2317a3eba8 removed more code duplication 2012-07-05 16:32:54 -04:00
Rudi Grinberg 5f1b2d23bf fixed code duplication and replaced manual path concatenation with os.path.join 2012-07-05 16:32:54 -04:00
Rudi Grinberg d73197b89a Added traceback log to section where a general exception can be caught 2012-07-04 16:40:35 -04:00
Rudi Grinberg f8660ed89d Fixed bug where exception was thrown and logged when metadata was missing(bitrate, samplerate) 2012-07-04 16:40:35 -04:00
Rudi Grinberg 4064512c83 A couple of stylistic changes 2012-07-04 16:40:35 -04:00
Rudi Grinberg 96da87bccb removed a few line characters 2012-07-04 16:40:35 -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
Martin Konecny 619f17b2f9 fix indentation 2012-07-03 16:43:24 -04:00
Martin Konecny 0286aa364e 2.1.3 preparation 2012-07-03 16:43:10 -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 c8559cc88c 2.1.2 preparation 2012-06-17 23:44:36 -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 d02607ed94 CC-3561: Add button to automatically rescan watched folders.
-done
2012-06-15 12:16:19 -04:00
denise 6b990f8712 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into devel 2012-06-14 13:45:14 -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
Martin Konecny f188eeada2 preparation for 2.1.1 release 2012-06-13 11:35:14 -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
Martin Konecny 22453f3820 CC-3968: Cannot preview file as * .MP3
-fixed
2012-06-12 11:31:10 -04:00
James 841dd298d5 CC-3946: Files with upper case "MP3" extension not being imported
- fixed
2012-06-08 15:07:14 -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
James 0ca45e343b CC-3878: Recorded media file's track number is changed after restarting media-monitor
- fixed
2012-06-06 14:18:54 -04:00
Martin Konecny c37fe4b070 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-05 13:08:07 -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
denise c521e3c545 CC-3849: PlaylistLibrary->Edit Metadata: The deletion of metadata entries has no effect after saving
-fixed
2012-06-05 11:20:00 -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 910f8e8627 ensure dirs end with "/" 2012-05-25 16:19:39 -04:00
Martin Konecny 7299704ed0 remove airtime-liquidsoap symbolic link on uninstall 2012-05-23 12:38:37 -04:00
Martin Konecny 8720aabc27 CC-3857: Chmod fixes for files which should not be executable
-fixed
2012-05-22 11:22:43 -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
Martin Konecny b677d2985b -remove useless to utf8 conversions 2012-05-16 15:38:26 -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 191de74bae CC-3811: Error found in Media Monitor and Apache's log about Media Monitor try to store recorded file 2012-05-15 17:36:33 -04:00
Martin Konecny 4fd7cd75e9 CC-3828: Pypo push crashed
-fixed
2012-05-15 17:35:44 -04:00
Martin Konecny 4a6a31c5a4 CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
-indent error
2012-05-14 19:55:38 -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 92931f662f CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
-override LC_ALL=POSIX that happens on system bootup
2012-05-14 18:35:20 -04:00
Martin Konecny c24a8a2308 CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
-override LC_ALL=POSIX that happens on system bootup
2012-05-14 17:50:08 -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 a734540e5b CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
-fixed with hack...
2012-05-10 14:36:59 -04:00
Martin Konecny a7a3da85c3 more debug information for system encoding 2012-05-10 11:16:51 -04:00
Martin Konecny b7285bba0d -fix missing import 2012-05-10 11:14:44 -04: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 a56755ed47 CC-3789: Need to place rejected files into /problem_files directory
-test liquidsoap playability before organizing file
2012-05-09 22:03:58 -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 3b2e812e51 CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
-debug info
2012-05-09 12:21:53 -04:00
Martin Konecny 80861bc643 CC-3771: year column in cc_files sometimes has values greater than 2^31-1, which causes postgresql to fail when trying to convert this to a year.
-better way to do this...
2012-05-09 01:18:58 -04:00
Martin Konecny 0c6144a0f6 CC-3789: Need to place rejected files into /problem_files directory
-make test_file_playability() a class method
2012-05-09 01:02:49 -04:00
Martin Konecny 032fb4e981 CC-3789: Need to place rejected files into /problem_files directory
-only do this for files under /srv/airtime/stor
2012-05-09 00:06:33 -04:00
Martin Konecny 4caba5bdea CC-3789: Need to place rejected files into /problem_files directory
-done
2012-05-09 00:02:02 -04:00
Martin Konecny f769472252 CC-3788: In Media Monitor convert to UTF-8 "just" before passing to urlencode, not before that.
-fixed
2012-05-08 23:58:48 -04:00
Martin Konecny 7376e16077 CC-3784: Some media files can be added twice when trying to upload 200 media files
-should be fixed
2012-05-08 17:32:50 -04:00
Martin Konecny ad7964899c -better logging.
-Also moved "-type f" argument to end of find command so that it doesn't
 need to do a "stat" on non ogg/mp3 files.
2012-05-08 14:57:16 -04:00
Martin Konecny a895c3a354 CC-3783: Liquidsoap file verification rejects all mono files
-fixed
2012-05-08 14:56:13 -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 ece93ac054 CC-3770: Make sure files in /srv/airtime/stor have world-readable permissions.
-fix silly regression
2012-05-07 14:39:54 -04:00
Martin Konecny d997047f5e CC-3770: Make sure files in /srv/airtime/stor have world-readable permissions.
-fixed
2012-05-07 14:25:49 -04:00
Martin Konecny 91d1dfbbfa CC-3770: Make sure files in /srv/airtime/stor have world-readable permissions.
-fixed
2012-05-07 13:54:39 -04:00
Martin Konecny 240756f98b CC-3767: Pypo push crashed 2012-05-04 19:50:16 -04:00
Martin Konecny 0685148c10 CC-3749: Media Monitor should not load files pypo cannot read
-incorrect variable name
2012-05-04 18:05:02 -04:00
Martin Konecny b1611f5b86 CC-3749: Media Monitor should not load files pypo cannot read
-incorrect variable name
2012-05-04 18:01:49 -04:00
Martin Konecny 4d7d17fe55 fix invalid file variable name 2012-05-04 17:25:59 -04:00
Martin Konecny 676205bb00 CC-3750Media Library->Edit Metadata: media-monitor throw exception when trying to edit metadata with non-ascii characters
-Improved save metadata function
2012-05-04 15:49:33 -04:00
Martin Konecny 906b6e8bd0 CC-3749: Media Monitor should not load files pypo cannot read
-logic error
2012-05-04 15:22:54 -04:00
Martin Konecny d98d23d483 CC-3749: Media Monitor should not load files pypo cannot read
-fixed
2012-05-04 15:04:54 -04:00
Martin Konecny 7e9d1a3308 CC-3749: Media Monitor should not load files pypo cannot read
-fixed
2012-05-04 13:50:38 -04:00
Martin Konecny e13d06df45 CC-3749: Media Monitor should not load files pypo cannot read
-fixed
2012-05-04 13:45:43 -04:00
Martin Konecny d6a12053eb CC-3752: Media Monitor DB sync
-forgot to exit
2012-05-04 13:39:48 -04:00
Martin Konecny fa373a683e CC-3749: Media Monitor should not load files pypo cannot read
-fixed
2012-05-04 13:37:43 -04:00
Martin Konecny 08217d59fc CC-3749: Media Monitor should not load files pypo cannot read
-fixed
2012-05-04 13:23:46 -04:00
Martin Konecny ebc8af0863 CC-3749: Media Monitor should not load files pypo cannot read 2012-05-04 13:03:05 -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 db2ccb1859 CC-3736: Full Install fail at Ubuntu 12.04: virtualenv problem
-pip no longer supports and we don't need the -E (environment) option
2012-04-30 15:48:36 -04:00
Martin Konecny cf1e9e7615 configure locale for pypo 2012-04-27 17:25:12 -04:00
Martin Konecny 47051c460e -syntax error in api_client 2012-04-27 16:20:40 -04:00
Martin Konecny 763d1918d9 fix pypo refusing to start 2012-04-27 16:18:23 -04:00
Martin Konecny d7b6146ef9 locales for media-monitor 2012-04-27 16:08:51 -04:00
Martin Konecny 41aeec8a21 replace deprecated urllib with urllib2, and automatic reconnection attempts 2012-04-27 16:05:26 -04:00
Martin Konecny 0e32b5586f make sure we create tmp directory for media-monitor if it doesn't exist. 2012-04-27 16:04:19 -04:00
Martin Konecny da7b87866c -check whether getdefaultlocale actually returns a value before attempting to use it. 2012-04-26 17:59:25 -04:00
Martin Konecny 773206ab22 http://www.python.org/dev/peps/pep-0008/#package-and-module-names 2012-04-26 17:50:35 -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 ec8115828a CC-3673: media monitor encoding problem
-made media-monitor not start if non UTF-8 encoding detected.
2012-04-24 16:24:54 -04:00
Martin Konecny 7c49fc77d5 CC-3700: media-monitor- Surround all accesses to external resources with try/except
-fixed
2012-04-22 13:42:45 -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
James c1a6202da8 CC-3630: Deleting files from organize folder if they don't have
correct Meta data

- done
2012-04-20 10:56:51 -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 5bc720fd4c CC-3657: Watch Folders -> mp3 files could not be loaded
-fixed
2012-04-16 15:11:05 -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 6c17cf6e24 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 17:23:03 -04:00
Martin Konecny fe3dfb6b0c CC-3635: Pypo needs subsecond accuracy for start time
-Done
2012-04-12 17:21:42 -04:00
James 86718cc58e CC-3628: Media Monitor not sending a delete message to Airtime
- fixed
2012-04-12 17:20:31 -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
Naomi Aro e2adaff5cf CC-3630 : Deleting files from organize folder if they don't have correct Meta data 2012-04-12 18:07:16 +02: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 0ec58f0bc3 CC-3250: UI design for mount monitor for media monitor
( Manage Media Folder and Playlist Builder screen)

- adding tooltip and fixed a minor bug
2012-04-11 17:24:26 -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 92f057593e CC-3428: liquidsoap seems to have troubles with this file
-need to escape double quotes not single :P
2012-04-11 11:21:51 -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
Martin Konecny bc6e911673 CC-3615: AddMedia,Add Watched Folders-> Uploading of certain playable media fails
-fixed
2012-04-10 21:52:54 -04:00
Martin Konecny 1344c27d30 CC-3615: AddMedia,Add Watched Folders-> Uploading of certain playable media fails
-fixed
2012-04-10 19:55:53 -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 c71fb37c74 CC-3428: liquidsoap seems to have troubles with this file
-update path so that media-monitor finds our liquidsoap first instead
 of system's
2012-04-09 11:52:37 -04:00
Martin Konecny 6e471c0060 CC-3428liquidsoap seems to have troubles with this file
-check file integrity before adding to library.
2012-04-08 20:16:53 -04:00
Martin Konecny b9e840552b -cleaned up some WTF!?!??! code 2012-04-08 19:29:55 -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
Martin Konecny 60d521a88a CC-3575: Use invoke-rc.d to start and stop services, rather than calling init scripts directly
-done
2012-04-05 20:42:15 -04:00
Martin Konecny 788aef2f03 CC-3604: Clear Pypo cache dir on upgrade/reinstall
-done
2012-04-05 15:31:20 -04:00
Martin Konecny 3611f1071d CC-3575: Use invoke-rc.d to start and stop services, rather than calling init scripts directly
-fixed
2012-04-05 15:09:20 -04:00
Martin Konecny b00e74e831 -remove "disable_auto_start_services" install option 2012-04-05 14:56:11 -04:00
Martin Konecny d9d8211a3b CC-3601: Pypo schedule needs to be sorted before pushing
-fixed
2012-04-04 15:25:57 -04:00
Martin Konecny 162c35419d CC-3572: pypo user should have shell set to /bin/false
-done
2012-04-02 19:04:16 -04:00
Martin Konecny 57f782d3c2 CC-3520: Change default password of monit
-fixed
2012-04-01 00:20:47 -04:00
Martin Konecny e1fd58198c CC-3572: pypo user should have shell set to /bin/false
-fixed
2012-03-31 22:11:12 -04:00
James 4d9abb5f7c CC-3533: "On the fly" Stream Rebroadcasting-> interruption problem
while pause in-between DJ stream tracks

- fixed by wrapping all the input.harbor source with mksafe()
2012-03-30 16:30:17 -04:00
Martin Konecny 7045a4bd95 CC-3564: Sometimes Airtime output stream goes silent when it is playing and we are shuffling tracks around.
-fixed
2012-03-30 15:15:34 -04:00
James 7325d51ada CC-3449: Live Stream: Kick out live dj at the end of the show
- fixed so airtime sends series of kick_out events according to
cached_ahead value in cfg file.
2012-03-29 16:57:28 -04:00
Martin Konecny 9a4efd3faf CC-3493: Create submodule git repository for Liquidsoap binaries
-done
2012-03-29 11:31:50 -04:00
Martin Konecny 41b9ea1c14 -more detailed message if pypo-install can't find liquidsoap file 2012-03-28 23:50:49 -04:00
Martin Konecny 29afb6e191 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	python_apps/pypo/pypopush.py
2012-03-28 22:49:57 -04:00
Martin Konecny fe0f72c8f4 -remove liquidsoap binaries 2012-03-28 22:47:45 -04:00
Martin Konecny ffdc009290 CC-3485: Liquidsoap annotation is missing liq_fade_in and liq_fade_out
-fixed
2012-03-28 17:08:11 -04:00
James 4f5d7efaa1 CC-3449: Live Stream: Kick out live dj at the end of the show
- done
2012-03-28 15:12:01 -04:00
james f4b9774b08 CC-3535: PypoFetch: make disconnect_source() and switch_source() static method
- done
2012-03-28 09:39:46 -04:00
Martin Konecny f8a71a3923 CC-3531: When importing watched directory, correcting a file's permissions does not work correctly.
-fixed
2012-03-27 16:59:26 -04:00
Martin Konecny 24262d5ed5 cc-3521: remove 2 second delay 2012-03-27 15:34:56 -04:00
Martin Konecny 654ff76ea4 CC-3399: Use VBR instead of CBR for Vorbis (OGG) audio streams
-Done
2012-03-27 15:33:44 -04:00
Martin Konecny d83267e6dc -remove crossfade function from ls scripts since it wasn't doing anything. 2012-03-27 15:16:58 -04:00
James f41ebbe7a7 CC-3521: Live Stream: Remove 2 second scilence when transition happens
- reduced the blank duration to 0.1 sec
2012-03-26 18:56:28 -04:00
James 0bdfa74566 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-26 18:39:24 -04:00
Martin Konecny d7af91f306 CC-3520: Change default password of monit
-done
2012-03-26 17:59:44 -04:00
James ef801c7a10 CC-3484: Pypo: On bootup, it should grab station name and stream label
for liquidsoap

- fixed
2012-03-26 17:44:07 -04:00
James aba89824f0 CC-3490: liquidsoap_prepare_terminate.py is not using python virtual env
- fixed
2012-03-26 15:42:00 -04:00
Martin Konecny 269096b9e8 cc-3476: detect if Liquidsoap is not playing something when it should and fix it 2012-03-26 14:33:33 -04:00
Martin Konecny 1a4e6c563b cc-3476: dynamic timeout 2012-03-26 14:33:33 -04:00
Martin Konecny c301cd5256 cc-3476: dynamic timeout 2012-03-26 14:33:33 -04:00
Martin Konecny 2070de03ce cc-3476-dynamic-timeout
-finally found a way to make this simple
2012-03-26 14:33:33 -04:00
Martin Konecny a013e3b4d0 cc-3476: use dynamic timeouts in pypo 2012-03-26 14:33:33 -04:00
Martin Konecny 4f5b9a0c91 -decoding exec_command from UTF-8 multiple times (bad) 2012-03-26 10:57:56 -04:00
James b4e9f9699c CC-3483: Live Stream: default fade in/out for live stream transition
- take care of bootstrap of pypo
2012-03-20 22:29:52 -04:00
James 6b768c2f99 CC-3483: Live Stream: default fade in/out for live stream transition
- done. changing fade value doesn't require LS to restart
2012-03-20 22:16:17 -04:00
James d4142f8b8b CC-3484: Pypo: On bootup, it should grab station name and stream
label for liquidsoap

- fixed
- created new function set_bootstrap_variables()
2012-03-20 16:41:15 -04:00
Martin Konecny 6166d1d590 -updated comment in pypofetch 2012-03-18 00:38:39 -04:00
Martin Konecny d35332e0ba CC-3371: Don't pause 2 seconds between checking queue in pypo-push
-Done
2012-03-18 00:33:22 -04:00
Martin Konecny 22cc362f1c CC-3448: Cancel show shouldn't send "cancel show" msg to pypo anymore
-done
2012-03-17 23:51:58 -04:00
Martin Konecny 73eb691be2 -some cases where pypo-notify is still writing to pypo.log instead of notify.log 2012-03-17 14:16:54 -04:00
Martin Konecny 7a7eb02de5 -fix errors pointed out by pydev code completion 2012-03-17 14:16:11 -04:00
Martin Konecny db4c916d9a -add support for PyDev code analysis (need to make pypo directory a package) 2012-03-17 13:56:41 -04:00
Martin Konecny 903698efc5 CC-3470: Smarter way for pypo to recover when it should be playing something.
-fixed
2012-03-17 13:55:56 -04:00
Martin Konecny 6634e9f663 cc-3447: synchronize access to liquidsoap via telnet
-add another critical section
2012-03-16 20:47:46 -04:00
Martin Konecny c8c9e46228 cc-3447: pypo telnet class 2012-03-16 20:41:50 -04:00
Martin Konecny 4d96a16cbe -comment out unused function in pypo-fetch 2012-03-16 20:39:49 -04:00
Martin Konecny 067cd1280a -remove some annoying logging info from pypopush 2012-03-16 00:49:08 -04:00
Martin Konecny 79964186ed CC-3462: If destination file already exists in pypo cache, double...
-done
2012-03-16 00:48:39 -04:00
Martin Konecny 0716e0425c -Media monitor not handling unicode incorrectly or comparing UTF-8 with unicode 2012-03-15 23:28:47 -04:00
Martin Konecny cca3995dba cc-2675: edit ongoing show
-almost there?
2012-03-14 15:37:04 -04:00
Martin Konecny 217be89766 cc-2675: Edit ongoing show
-progress being made
2012-03-14 15:37:04 -04:00
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