Commit Graph

905 Commits

Author SHA1 Message Date
Martin Konecny 8828961246 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-18 14:55:39 -04:00
Martin Konecny b64b84b9ce re-add replay gain to old media-monitor 2012-07-18 14:55:29 -04:00
Rudi Grinberg 3599f32ee6 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-18 12:35:43 -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
Rudi Grinberg cdbabfafce -cc 4105 : Added error handling in case server does not respond with
proper json
2012-07-16 17:10:13 -04:00
Rudi Grinberg a1c205edff cc-4105: Removed wrong error handling from api_client. Split up controller action to make it reusable through other actions 2012-07-16 16:43:48 -04:00
Rudi Grinberg ebd12448ee cc-4105: placed docstrings inside of methods instead of above 2012-07-16 15:51:51 -04:00
Rudi Grinberg 1c084a3101 moved misplaced docstring 2012-07-16 15:47:44 -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
Rudi Grinberg a9f6bb3b5c cc-4105: changed error handling from returning none to throwing exception 2012-07-16 14:58:23 -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 3e24b71436 removed wrong comments 2012-07-16 10:31:00 -04:00
Rudi Grinberg 8ae0d216c6 formatting fix 2012-07-16 10:09:49 -04:00
Martin Konecny ce1a63f47d CC-430: Audio normalization (Replaygain Support)
-small bug fixes
2012-07-15 22:55:52 -04:00
Martin Konecny 583695f98c CC-430: Audio normalization (Replaygain Support)
-values are now written through to database
2012-07-15 22:22:42 -04:00
Martin Konecny 632f039977 CC-430: Audio normalization (Replaygain Support)
-values are now written through to database
2012-07-15 22:19:55 -04:00
Martin Konecny b4f1cc13c0 CC-430: Audio normalization (Replaygain Support)
make code simpler (don't download database to file)
2012-07-15 22:19:16 -04:00
Rudi Grinberg 0e98bc75c8 cc-4105: hasattr in conditional statement instead of getattr 2012-07-15 22:17:36 -04:00
Rudi Grinberg 71dc7d99b4 cc-4105: added a method in API client corresponding to chunked requests.\nAlso add prepared corresponding apicontroller method 2012-07-15 22:17:36 -04:00
Rudi Grinberg 44d91f7798 cc-4105: clean up url construction in api client 2012-07-15 22:17:36 -04:00
Rudi Grinberg 9f1ec3c05c created a new controller action for chunked requests from media monitor 2012-07-15 22:16:58 -04:00
Rudi Grinberg 54116fe5aa cosmetic changes 2012-07-15 22:13:24 -04:00
Rudi Grinberg 6b9cf85fc5 cleared up a lot of boilerplate with lazy properties 2012-07-15 22:13:24 -04:00
Rudi Grinberg 206027073c added some stat counting 2012-07-15 22:13:24 -04:00
Rudi Grinberg f9a1af1c1c fixed clean empty dirs 2012-07-15 22:13:24 -04:00
Rudi Grinberg 69674529cd almost alpha version 2012-07-15 22:13:24 -04:00
Rudi Grinberg 3b385df969 initial commit 2012-07-15 22:13:24 -04:00
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