Commit Graph

47 Commits

Author SHA1 Message Date
Lucas Bickel bf5cfbcf56 gracefully handle missing config option 2017-10-15 14:45:22 +02:00
Lucas Bickel ace7e493f4 Fix port and protocol default values
Turns our bare ConfigObjects don't to default passing very automatically.
2017-10-15 13:46:40 +02:00
Lucas Bickel 4287ac1c70 Revert pypofile try block move
Config file getting is allowed to fail. I didn't realize that it
would not just use the default instead of excepting and getting
caught. Sorry for that.
2017-10-15 13:14:40 +02:00
Lucas Bickel 6e35cfb44b Fix whitespace and move config getting into try 2017-10-08 16:15:08 +02:00
Xabi Spacebiker 5160fc64d7 Update pypofile.py
Last update
2017-10-03 03:37:06 +02:00
Xabi Spacebiker 216294428a Update pypofile.py 2017-10-03 01:28:01 +02:00
Xabi Spacebiker cfb99fa926 Update pypofile.py
1st- Changes the file permissions of cache files from 444 to 644
2nd- Put the host variables into a single array, this way we can pass the full variable to the report_file_size_and_md5_to_airtime function.
2017-10-02 23:42:11 +02:00
Xabi Spacebiker 2104b53761 Update pypofile.py
Adding user write permission in cached file
2017-09-28 11:12:57 +02:00
Robb Ebright 314654dfe4 Enable logging for analyzer and pypo 2017-08-05 17:56:23 -04:00
Lucas Bickel 0a556adbfa Use proper protocol in URL if port is set to 443
This adds TLS support to pypo when downloading files from the REST
API. I previously fixed some similar issues in the api_client and
wasn't aware that pypo isn't using it for every URL..
2017-07-21 12:27:34 +02:00
Lucas Bickel b267036483 Fix recording through ecasound
This is part 2 of fixing ecasound recordings from line-in. Part 1 restored the User-Interface, part 2 takes care of getting to the point where ecasound gets started, records something and uploads it through rest when done. Part 3 will take care of making sure that the recorded file is mapped to the show and not just stored as a new track.

I refactored api_clients to not use urllib2 for posting multipart data since I was loosing my sanity over it and requests seems to have a modern approach to doing this compared to what api_clients was previously doing.
2017-03-24 15:15:37 +01:00
Lucas Bickel 5f04dbb8a8 Get base_recorder_file config from proper subsection in conf
It took me way too long to figure this one out it wasn't logging nicely. With this ecasound actually gets called again. It's still failing on my install but I'm not yet sure why exactly.
2017-03-23 13:18:52 +01:00
Lucas Bickel c6225f9db5 Reverse pypo changes
The TODO seems to have been wrong due to the fact that everything works as advertised w/0 the change.
2017-03-19 13:15:59 +01:00
Robb Ebright 1b90dbd4ca working python liquidsoap reconfigure script, might need further refinement 2017-03-14 04:02:51 +00:00
Robb Ebright 67ffd2d34a Making show and master source ports and mount points editable. 2017-03-14 01:15:14 +00:00
Lucas Bickel dfe3f077fd Replace std_err_override with logging.captureWarnings(True) in pypo
The quite ugly hack with std_err_override seems to have been made for python < 2.7. Since all major distros
have al least python 2.7 installed we can stop using the std_err_override hack.

This removes it from pypo, media-monitor still uses the module and we can completely delete it when we have
remove media-monitor after having maybe backported the watched folders feature to analyzer.
2017-03-13 16:28:07 +01:00
Lucas Bickel 0e8d0868e8 Make pypo media downloader port aware
This is needed if the base port is not 80 like in the vagrant setup.
2017-03-10 19:10:15 +01:00
Albert Santoni 91e1252b86 SAAS-1239: Listener stats with Shoutcast not working 2015-12-04 15:05:17 -05:00
Albert Santoni bb05fa996a SAAS-1132: Improve safety of XML parsing for listener stats 2015-11-09 19:32:56 -05:00
Albert Santoni 3592eceb22 Merge branch 'saas' into saas-dev 2015-08-24 17:11:52 -04:00
Albert Santoni f21fcb3dcc SAAS-1011 - Fixed one mimetype problem and fixed installer 2015-08-24 16:25:09 -04:00
Albert Santoni fdb2d4fae2 SAAS-1011: Files on NFS with incorrect file extensions won't play out
* Simplified the mime type detection code in pypo and made it actually work
2015-08-24 11:29:45 -04:00
Albert Santoni dab0f00736 Fixed m4a file extension mapping in pypo 2015-08-11 08:59:44 -04:00
Duncan Sommerville 1816be156f SAAS-922 - change file extensions in pypo based on mime-type, update lists of accepted mime types 2015-07-16 16:26:52 -04:00
Duncan Sommerville dd2ffd148d Fix bug where pypo fails to restart liquidsoap; uncomment adding pypo template files 2015-06-29 12:20:39 -04:00
Duncan Sommerville d9f17f3919 SAAS-871 - Fix consumer cancellation bug 2015-06-26 17:11:04 -04:00
Albert Santoni 195935cccf Slightly better exception handling and logging to help with SAAS-884 2015-06-22 15:49:23 -04:00
Albert Santoni 01ea6f27ae Merge branch 'saas-dev' into saas-installer-albert
Conflicts:
	python_apps/api_clients/api_clients/api_client.py
2015-06-02 15:40:57 -04:00
Albert Santoni 6ca0e340a4 Merge branch '2.5.x-installer' into saas-installer-albert
Conflicts:
	python_apps/pypo/pypo/pypofile.py
2015-05-22 18:26:16 -04:00
Albert Santoni 027adc7749 Three bugfixes
* Removed Support Settings nav link
* SAAS-801: pypo log configuration files are overkill and must be removed
* CC-6043: CTRL-C doesn't work in pypo / airtime-playout
2015-05-22 18:20:45 -04:00
Albert Santoni 11c6818e61 Merge branch '2.5.x-installer' into saas-installer-albert
Conflicts:
	.gitignore
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/configs/conf.php
	airtime_mvc/application/controllers/SystemstatusController.php
	airtime_mvc/application/controllers/UpgradeController.php
	airtime_mvc/application/upgrade/Upgrades.php
	airtime_mvc/application/views/scripts/systemstatus/index.phtml
	airtime_mvc/build/airtime.conf
	airtime_mvc/build/sql/defaultdata.sql
	airtime_mvc/public/index.php
	airtime_mvc/tests/application/helpers/AirtimeInstall.php
	install_minimal/airtime-install
	install_minimal/include/airtime-constants.php
	install_minimal/include/airtime-copy-files.sh
	install_minimal/include/airtime-db-install.php
	install_minimal/include/airtime-initialize.sh
	install_minimal/include/airtime-install.php
	install_minimal/include/airtime-installed-check.php
	install_minimal/include/airtime-remove-files.sh
	install_minimal/include/airtime-upgrade.php
	python_apps/media-monitor/install/media-monitor-copy-files.py
	python_apps/monit/monit-airtime-generic.cfg
	python_apps/pypo/airtime-playout
	python_apps/pypo/install/pypo-copy-files.py
	python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py
	python_apps/pypo/liquidsoap/ls_script.liq
	python_apps/pypo/pypo/__main__.py
	python_apps/pypo/pypo/media/update/replaygain.py
	python_apps/pypo/pypo/media/update/replaygainupdater.py
	python_apps/pypo/pypo/media/update/silananalyzer.py
	python_apps/python-virtualenv/airtime_virtual_env.pybundle
	python_apps/python-virtualenv/requirements
	utils/airtime-check-system.php
2015-05-22 16:05:29 -04:00
Albert Santoni cca9ba0c36 Fixed pypo config file loading 2015-03-12 19:09:00 -04:00
Albert Santoni a2d8da617d Fixed everything about Airtime on Debian
* Added sysvinit scripts back in and cleaned them up
* service status now works correctly for all services
* Moved logging config files into install/ folders for the python_apps
* Fixed some small setup.py problems in the various python_apps
* Gave each python app a better bin/ script which doesn't fork, which lets
  service status work automagically.
2015-02-13 16:06:59 -05:00
Albert Santoni d46f4a52eb Installer tweaks and a pypo bugfix
* Moved all the remaining DEB requirements into the requirements files
* The installer should now be distro agnostic (unless you ask it to
  install third-party deps for you)
* Fixed pypo not being able to find replaygainupdater
* Tweaked a bunch of styling for the installer
2015-02-10 18:06:46 -05:00
Duncan Sommerville bc604b992e CC-5986 - Fixed unit tests, removed unnecessary code from service execution files 2015-01-28 13:19:50 -05:00
Duncan Sommerville 875a9dfd8b CC-5990, CC-5991 - Python cleanup, removed need for /usr/lib/airtime 2015-01-27 18:43:36 -05:00
Albert Santoni c03dd38c00 Merge branch '2.5.x' into 2.5.x-installer
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/models/Show.php
2015-01-16 17:27:52 -05:00
Duncan Sommerville 791466b023 Fixes for code review https://github.com/sourcefabric/Airtime/pull/84 2015-01-15 16:33:33 -05:00
Duncan Sommerville 5e22f929c7 Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
Duncan Sommerville 674b8c69e4 Add very basic uninstall script, move install script to root directory 2015-01-12 16:13:39 -05:00
Duncan Sommerville 0fef350e9d Fixed issue with liquidsoap service starting as daemon, fixed logging issue in pypocli 2015-01-07 14:25:24 -05:00
Duncan Sommerville 05c2ecdb89 Changed logger init to use paths relative to current file 2015-01-07 11:46:06 -05:00
Duncan Sommerville 5e8c4b112f More work on getting services working with new installer 2015-01-07 10:54:17 -05:00
Duncan Sommerville 8e6e72a501 More work on getting services working with new installer 2015-01-07 10:31:00 -05:00
Duncan Sommerville f4c5cf1353 Added virtualenv back into install process 2015-01-05 16:41:03 -05:00
Duncan Sommerville 75c2a4a18b More work on media-monitor and pypo install process 2014-12-19 13:49:33 -05:00
Duncan Sommerville 97805ad271 Removed many unnecessary files and started changing pypo to use setuptools 2014-12-17 16:22:40 -05:00