Commit Graph

1717 Commits

Author SHA1 Message Date
Martin Konecny b9d829a33c CC-4754: Replay gain modifier
-make pypo repush song if its replay_gain changed
2012-12-28 13:58:55 -05:00
Martin Konecny 0596d1c391 Merge branch 'cc-4759-add-aac-stream-in-support' into devel
Conflicts:
	python_apps/media-monitor2/media/monitor/pure.py
2012-12-27 17:29:25 -05:00
Martin Konecny 735ad30483 CC-4726: Sometimes mm doesn't start after a fresh install
-fixed
2012-12-03 16:56:11 -05:00
Martin Konecny e3761bd8d6 -make sure lsof works for files with spaces 2012-12-03 16:33:24 -05:00
denise b2699fa914 merge from devel 2012-12-03 11:06:56 -05:00
Martin Konecny 7249e36081 -2.2.1 upgrade scripts 2012-11-27 12:13:16 -05:00
martin 735640d40b Merge branch 'lsof_quote_fix' of https://github.com/rgrinberg/Airtime into devel 2012-11-23 16:18:23 -05:00
martin 50bdeeef26 CC-4702: Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule 2012-11-23 16:00:10 -05:00
James 8d3024d42e api_client fix 2012-11-22 15:59:37 -05:00
James da6013b523 CC-4717: Lintian warnings from devel branch
- fixed
2012-11-22 15:14:55 -05:00
Martin Konecny 612ac415d2 cc-4708: cue points not working
-fixed
2012-11-22 12:24:59 -05:00
Martin Konecny 3a1945a818 CC-4702Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule
-fixed
2012-11-22 11:40:44 -05:00
james 8cc162f7a9 CC-4716: Cannot hear fade in & fade out
- fixed
2012-11-21 17:34:07 -05:00
Rudi Grinberg 1f5a5fd294 typo 2012-11-21 17:24:31 -05:00
Rudi Grinberg 0e91188939 made a unique toucher file 2012-11-21 17:22:32 -05:00
Rudi Grinberg 8c97995c2f Added vulnerability where strings would not be escaped when pass to shell command 2012-11-21 12:55:57 -05:00
Martin Konecny 8aa11f7e8c Better error message for api client constructor 2012-11-21 12:26:37 -05:00
Rudi Grinberg ac6a5a11bf docstring fixes 2012-11-20 16:41:45 -05:00
Rudi Grinberg 383244f962 changed implementation of timer thread because using threading.Timer does not allow us to properly inject
the AirtimeInstance object.
2012-11-20 14:44:58 -05:00
Rudi Grinberg 95e757a52c removed file mediator because it seems to be useless and incompatible with saas 2012-11-20 14:44:24 -05:00
Rudi Grinberg 58d888a59f Small refactoring to let user be assignable from any class that inherits from HasUser 2012-11-20 14:43:48 -05:00
Rudi Grinberg 58662b42be fixed typo missing self 2012-11-20 12:11:31 -05:00
Martin Konecny fed39077c0 Merge branch '2.2.x' into devel 2012-11-20 11:21:29 -05:00
Rudi Grinberg c1959f936e added TODO + formatting 2012-11-19 20:16:06 -05:00
Rudi Grinberg fdf8c9fb4e refactored EventRegistry to play nice with saas. 2012-11-19 20:13:19 -05:00
Rudi Grinberg ebca3fa9f5 refactored file mediator to play nice with saas 2012-11-19 20:13:00 -05:00
Rudi Grinberg 8696571b02 refactor owner to be saas friendly 2012-11-19 19:57:33 -05:00
Rudi Grinberg a28c9d9e27 added untracked configs 2012-11-19 16:46:47 -05:00
Rudi Grinberg a995129df5 added general getsig routine to get the correct signals from anywhere in the code. 2012-11-19 16:07:40 -05:00
Rudi Grinberg 4acb7d92db removed hardcoded signals in the code. 2012-11-19 16:07:26 -05:00
Rudi Grinberg 6101e9dfe3 fixed bug where only part of the path was joined. 2012-11-19 16:06:36 -05:00
Rudi Grinberg e46da35d3b made root path a variable to remove duplication. 2012-11-19 16:06:19 -05:00
Rudi Grinberg cd7d292aa5 fixed faulty regex. 2012-11-19 16:05:52 -05:00
Rudi Grinberg 9d04204389 fixed bug where path was only relative. 2012-11-19 16:05:26 -05:00
Rudi Grinberg 8dd0d80f68 fixed typo that was causing bug 2012-11-19 16:04:43 -05:00
Rudi Grinberg dc8315fef9 added more detailed output when launching baby mm 2012-11-19 16:04:22 -05:00
Rudi Grinberg d595d1112f added routine to verify config exists in "baby" media monitor" 2012-11-19 16:03:58 -05:00
Rudi Grinberg 647832b0a0 added comments to document config options 2012-11-19 16:03:25 -05:00
Rudi Grinberg c784df7f6e Added comments describing config options 2012-11-19 11:35:37 -05:00
Rudi Grinberg 1cbe2fb1a1 typo 2012-11-16 12:59:17 -05:00
Rudi Grinberg 57b2762e5c cleaned up imports 2012-11-16 12:51:23 -05:00
Rudi Grinberg bc9f7c4c95 removed hardcoding of path received from MM for SaaS. 2012-11-16 12:51:07 -05:00
Rudi Grinberg cf6e1d66ee removed direct usage of api client to AirtimeDB which encapsulates that behaviour 2012-11-16 12:36:58 -05:00
Rudi Grinberg 11214d754d docstring formatting 2012-11-16 12:31:10 -05:00
Rudi Grinberg e22162cc87 added initialization message 2012-11-16 12:29:06 -05:00
Rudi Grinberg aeb449ea76 import formatting 2012-11-16 11:15:49 -05:00
Rudi Grinberg a50995cd9b formatting + clearer name. 2012-11-16 11:14:31 -05:00
Rudi Grinberg cc66ac4a83 typo 2012-11-16 11:14:18 -05:00
Rudi Grinberg 7527b366d0 removed instance specific logging 2012-11-16 00:10:40 -05:00
Rudi Grinberg 757a561975 added missing import 2012-11-16 00:10:24 -05:00
Rudi Grinberg 26ad6dae74 Added a convenience constructor for an AirtimeInstance 2012-11-16 00:09:56 -05:00
Rudi Grinberg e12e311537 Added some routines to baby mm. 2012-11-16 00:09:33 -05:00
Martin Konecny 62b3c39c5b CC-4702: Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule
-fixed
2012-11-15 17:35:06 -05:00
Martin Konecny 5f534b5ef6 CC-4702Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule 2012-11-15 17:29:25 -05:00
Martin Konecny 8c73731c41 CC-4633: Use David's new method of Liquidsoap webstream switching
-fixed
2012-11-15 16:43:22 -05:00
Rudi Grinberg 88231a19c3 added baby mm launcher 2012-11-15 15:08:49 -05:00
Rudi Grinberg 9c74b0ea2c removed bastard injection from AirtimeApiClient 2012-11-15 15:08:18 -05:00
Rudi Grinberg 350c6e2f94 moved logging logic to launcher 2012-11-15 15:02:26 -05:00
Rudi Grinberg 11a43eb891 Generalized a lot of launching logic into the saas launcher away from the hosted installation script: mm2.py. 2012-11-15 14:49:55 -05:00
Rudi Grinberg c43dbe42a8 refactored creating an instance into its own function 2012-11-15 14:27:09 -05:00
Rudi Grinberg 975508a549 added TODO 2012-11-15 14:24:17 -05:00
Rudi Grinberg 57b13607c5 removed crap hacks 2012-11-15 14:22:42 -05:00
Martin Konecny 2010778876 cleanup redundant code, remove whitespace 2012-11-15 13:33:27 -05:00
Rudi Grinberg 0b0e96f49c removed old runner code 2012-11-15 12:46:57 -05:00
Rudi Grinberg 8a7535774c fixed import typo 2012-11-15 12:13:52 -05:00
Rudi Grinberg 4ac3efe228 renamed typo log to logger. 2012-11-15 12:13:33 -05:00
Rudi Grinberg 5073ced732 Made timeout watcher provide AirtimeInstnace 2012-11-15 12:12:47 -05:00
Rudi Grinberg fa66f33ffa changed RequestSync to use injected apc and injected it in ThreadedRequestedSync. 2012-11-15 12:12:19 -05:00
Rudi Grinberg 15f4212360 make ManagerTimeout provide the correct AirtimeInstance object. 2012-11-15 12:11:48 -05:00
Rudi Grinberg ab35263869 inject apc properly into AirtimeNotifier 2012-11-15 12:11:18 -05:00
Rudi Grinberg 7ed1f08e07 Added new launch script for mm. 2012-11-15 12:10:52 -05:00
Rudi Grinberg ce4dbf0028 added launcher that should replace most of mm2.py 2012-11-14 22:06:09 -05:00
Rudi Grinberg dd139e5028 added default value for exception class parameter 2012-11-14 16:50:34 -05:00
Rudi Grinberg fcfa5cceee removed useless comment 2012-11-14 14:49:28 -05:00
Rudi Grinberg 2e59eca131 moved files to pypo dir 2012-11-14 14:43:33 -05:00
Rudi Grinberg d5cacf4011 moved replay gain to pypo for better saas performance 2012-11-14 14:43:10 -05:00
Rudi Grinberg f1effc37a9 removed dependency of mm from replaygain 2012-11-14 11:51:00 -05:00
Rudi Grinberg 93ff2ce9f6 removed extra import 2012-11-13 17:32:42 -05:00
Rudi Grinberg 6f42291f8a merge api client conflict 2012-11-13 17:21:48 -05:00
Rudi Grinberg 350d5dd620 refactored logging setup when mm is setup 2012-11-10 09:24:26 -05:00
James 6145f9bcad Merge branch '2.2.x' into devel 2012-11-08 17:28:23 -05:00
James 33b2520c14 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-08 17:27:28 -05:00
James 628e6bed37 CC-4689: Live Stream: The 1st song of a show won't play if there is another show have live stream assigned and finished right before
- fixed
2012-11-08 17:26:55 -05:00
Rudi Grinberg eaf0baa6b6 removed useless code 2012-11-07 23:22:25 -05:00
Rudi Grinberg c222ac10f7 typo 2012-11-07 23:21:48 -05:00
Rudi Grinberg 55f0462946 removed useless line of code 2012-11-07 23:21:08 -05:00
Rudi Grinberg ed00089a1a added user level method to get current user of thread 2012-11-07 22:53:39 -05:00
Rudi Grinberg 7e5ec6505b added tests for instance 2012-11-07 18:16:48 -05:00
Rudi Grinberg 13f59be21d typo 2012-11-07 18:16:33 -05:00
Rudi Grinberg 9e7b8a6b28 added tests 2012-11-07 17:45:08 -05:00
Rudi Grinberg 882a515caa refactored threads which know the user they belong to 2012-11-07 17:44:55 -05:00
James 7300b608cf Merge branch 'cc-4661-listener-statistics' into devel
Conflicts:
	python_apps/api_clients/api_client.py
2012-11-07 17:20:12 -05:00
Rudi Grinberg debc5b6081 Merge remote-tracking branch 'sf/devel' into mm_refactor_for_saas 2012-11-07 12:19:35 -05:00
denise 073d243007 -airtime couldn't connect to liquidsoap 2012-11-07 12:18:10 -05:00
Rudi Grinberg cd6c305b81 Merge remote-tracking branch 'sf/devel' into mm_refactor_for_saas 2012-11-07 12:05:37 -05:00
denise 4200059200 -airtime_version fix 2012-11-07 11:43:49 -05:00
Rudi Grinberg 110008e909 added saas shit 2012-11-07 11:29:39 -05:00
Rudi Grinberg af51ddca79 Merge remote-tracking branch 'sf/devel' into mm_refactor_for_saas 2012-11-07 11:29:17 -05:00
denise b817684972 Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/bootstrap/bootstrap.js
2012-11-07 11:21:36 -05:00
Rudi Grinberg b3c9472bcb cc-4672: added dirty workaround to fix this issue 2012-11-06 16:16:37 -05:00
Rudi Grinberg 1762e418c0 added better logging 2012-11-06 14:57:53 -05:00
Rudi Grinberg b4555e9845 docstring formatting 2012-11-06 13:51:04 -05:00
Rudi Grinberg 66138c4baf removed references to gevent 2012-11-05 16:11:35 -05:00
Rudi Grinberg 6392c69e27 Removed unused code 2012-11-05 16:10:59 -05:00
Rudi Grinberg a851d8dd74 docstring format 2012-11-05 16:04:39 -05:00
Rudi Grinberg 83d4705bca removed useless comments 2012-11-05 14:19:37 -05:00
Rudi Grinberg 3509cfc212 formatting 2012-11-05 14:03:46 -05:00
Rudi Grinberg c287e11bee moved setting up unicde into it's own routine 2012-11-05 14:02:55 -05:00
Rudi Grinberg ce313a5b22 docstring formatting 2012-11-05 13:29:10 -05:00
Martin Konecny f6ee2afb88 CC-4665: ReplayGain does not work for FLAC files
-fixed
2012-11-05 12:03:25 -05:00
Martin Konecny fffaf7788a Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-05 11:53:52 -05:00
Martin Konecny af7e94a44d don't break 80 character line limit 2012-11-05 11:53:37 -05:00
Martin Konecny d89166e2ff CC-4665: ReplayGain does not work for FLAC files
-fixed
2012-11-05 11:53:20 -05:00
Martin Konecny 34d0ee5954 CC-4661: Listener Statistics
-add mount point names
2012-11-02 18:04:32 -04:00
Martin Konecny 5bd0fe0300 clean up source file tailing whitespace 2012-11-02 17:51:02 -04:00
Martin Konecny 6438b54a5f CC-4661: Listener Statistics
-backend part working
2012-11-02 17:50:43 -04:00
Rudi Grinberg dfc3cf9267 removed useless tests 2012-11-02 15:05:08 -04:00
Rudi Grinberg c79b28aa90 Removed gevent from pybundle 2012-11-02 15:03:27 -04:00
Rudi Grinberg 899c62d31f removed gevent from requirements 2012-11-02 15:01:11 -04:00
Rudi Grinberg aec11feba5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-02 14:59:02 -04:00
Rudi Grinberg a1d5037e04 cc-4584: fixxxed 2012-11-02 12:42:24 -04:00
denise 135aadf16b Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 12:28:21 -04:00
Rudi Grinberg e9524c8615 Merge remote-tracking branch 'rudi/cc-4652' into 2.2.x 2012-11-02 11:30:04 -04:00
James b746f65304 CC-4601: Do not rewrite metadata for master source and show source streams.
- fixed
2012-11-01 17:24:41 -04:00
Rudi Grinberg bf363dcdde cc-4652: Added code to create the stor/ structure before adding any watched 2012-11-01 15:48:26 -04:00
Rudi Grinberg 176f2c45ba Added information message when media monitor is restarted 2012-11-01 15:42:58 -04:00
Rudi Grinberg c0dc38be62 cc-4652: added logging for when watch fails on startup 2012-11-01 15:16:23 -04:00
Rudi Grinberg 7c710fd84e Removed unused method 2012-10-31 12:48:11 -04:00
Rudi Grinberg 11043d2eba Refactored notify_webstream_data 2012-10-31 12:46:51 -04:00
Rudi Grinberg 83211698a4 Added retrying mechanism to ApiRequest 2012-10-31 12:20:00 -04:00
Rudi Grinberg 4ef38cbc91 Added retry mechanism 2012-10-31 11:45:22 -04:00
Rudi Grinberg 474f5aba48 Added hack for the response type not being set 2012-10-31 11:33:42 -04:00
Rudi Grinberg 18d6cd7868 removed commented code 2012-10-31 11:22:04 -04:00
Rudi Grinberg cf27c18df7 Refactored update_replay_gain_values 2012-10-31 11:01:24 -04:00
Rudi Grinberg e3914c429d refactored get_stream_setting 2012-10-31 10:56:52 -04:00
Rudi Grinberg 82a8fe99ae Refactored docstring 2012-10-31 10:54:02 -04:00
Rudi Grinberg 162028ee8a Unused method removed 2012-10-31 10:52:14 -04:00
Rudi Grinberg 24088d63e0 Formatting 2012-10-31 10:48:14 -04:00
Rudi Grinberg 8e6f6b8894 formatted comment. added TODO 2012-10-31 10:48:03 -04:00
Rudi Grinberg 09c3e3a694 Refactored get_schedule not to suck 2012-10-31 10:47:08 -04:00
Rudi Grinberg 9cea6210bb refactored __get_airtime_version 2012-10-31 10:45:36 -04:00
Rudi Grinberg 91ce35ee9a added todo 2012-10-31 10:43:59 -04:00
Rudi Grinberg 75ce5b205d Fixed setup_media_monitor 2012-10-30 17:48:24 -04:00
Rudi Grinberg 3ed762bc38 check_live_stream_auth fixed 2012-10-30 17:47:09 -04:00
Rudi Grinberg 4ad1468313 refactored get_shows_to_record 2012-10-30 17:45:22 -04:00
Rudi Grinberg d6f644d53f Removed unused method 2012-10-30 17:44:27 -04:00
Rudi Grinberg e85996d814 Removed unused method 2012-10-30 17:43:11 -04:00
Rudi Grinberg 8f82e2623c Removed unused method 2012-10-30 17:42:52 -04:00
Rudi Grinberg d482933b1a notify_liquidsoap_started refactored 2012-10-30 17:41:53 -04:00
Rudi Grinberg 1d325949e7 notify_media_item_start_playing uses RequestProvider 2012-10-30 17:40:53 -04:00