e0e4d4c87f
Ensure all json loads calls use strings
2020-05-04 13:25:36 +02:00
cf3b9782ac
fix legacy version check
2020-04-29 19:06:52 +02:00
6640e5624c
move legacy script to python3
2020-04-29 19:06:52 +02:00
30d6db1e5e
Make sure command calls python3
2020-04-29 19:06:52 +02:00
91996c91bc
Remove double encode which caused webstream playout to break
2020-04-29 19:06:52 +02:00
d48e792922
Checking type of command to only encode if string.
2020-04-29 19:06:52 +02:00
348f8573c7
Add traceback so we can debug.
2020-04-29 19:06:52 +02:00
9724298f40
Use `utf-8` encoding.
2020-04-29 19:06:52 +02:00
0a9781d138
Added traceback so we can find the bug
2020-04-29 19:06:52 +02:00
0289f84111
Ok hopefully this is it. python3 requries a bytestring https://docs.python.org/3.7/library/telnetlib.html
2020-04-29 19:06:52 +02:00
dd46b4c984
Remove .encode(). Not needed in python3
2020-04-29 19:06:52 +02:00
42a5937288
Updated other old tn.write() functions
2020-04-29 19:06:52 +02:00
1ac3f691b4
Fixed #968 . Needed to send a byte string to telnet not a normal string.
2020-04-29 19:06:52 +02:00
4a45225369
Suggest using `universal_newlines` as the alias `text` only works for python 3.7 and above.
...
Default python3 for example is 3.6 in Ubuntu Bionic and therefore liquidsoap fails with parameter `text`.
2020-04-29 19:06:52 +02:00
6ebb1fd555
more pypo fixes
2020-04-29 19:06:52 +02:00
5923dee839
Fix running apps
2020-04-29 19:06:52 +02:00
e8a0783139
Fix tests
2020-04-29 19:06:52 +02:00
ea54493c21
add chaudum fixes
2020-04-29 19:05:35 +02:00
8346e89e99
install successfully using py3
2020-04-29 19:05:35 +02:00
632ba9acfe
convert print statements to py3
2020-04-29 19:05:35 +02:00
7a090e1bab
Merge pull request #987 from jeromelebleu/fix-logrotate
...
Fix postrotate command of airtime-liquidsoap
2020-04-18 10:53:52 +02:00
39469d3f88
Use stop instead of kick to disconnect the source
2020-04-01 19:01:06 +02:00
a8194e95ea
Fix postrotate command of airtime-liquidsoap
2020-03-25 17:55:22 +01:00
8edada6f3d
Added extra mime type for flac file
2020-03-18 17:19:57 +13:00
0931ba842a
add legacy script for liquidsoap 1.1.1 compatibility
2019-12-30 22:07:48 -05:00
a572f275fc
Update stream URLs to use LibreTime
2019-11-06 14:08:13 +02:00
bf7659dfa0
fix heartbeat spelling
2019-11-04 13:05:57 -08:00
8a0f474075
use AMQP heartbeat feature
2019-11-04 11:02:40 -08:00
5b3c0cb1c8
Revert "raising the exception might kill pypopush thread"
...
This reverts commit 2afe01b3ddc94194101a4a2149116e27e0e115e5.
2019-11-04 11:02:39 -08:00
cdf9f6f98e
PypoMessageHandlers using a kombu Consumer solves MVC/Liquidsoap synchronization issues:
...
The real error was PypoMessageHandler wasn't consuming messages from RabbitMQ, thus schedules were only updated on PypoFetch time out.
Proably queue is in a stale state because it didn't recover from a broken connection.
The issue is a SimpleQueue was being used, which's 'python-like' *get* method apparently doesn't handle recovery.
Consumers are the way to go instead.
2019-11-04 11:02:39 -08:00
03c3cb02d8
raising the exception might kill pypopush thread
...
this is apparently the reason why schedules don't get pushed after a silence
producing desynchronization between the mvc and liquidsoap and cannot catch up until pypofetch times out.
(ON AIR turns off and there's a mess until the schedule is fetched. sometimes it even continues playing the wrong tune)
((logging inside the while True loop produces no output, probably it is locked on the queue?))
2019-11-04 11:02:39 -08:00
8bdc63dffb
🐛 (pypo) CentOS 7/Python 2.7.5 fix
2019-08-18 18:04:06 +02:00
a3d6ea77e6
🐛 (pypo) disable fs block size based cache check
2019-07-29 20:19:54 +02:00
a526a59ef4
♻️ cleanup aac code
...
Removes unsupported codecs from our liquidsoap code
2019-01-20 15:37:21 +01:00
36891c18c8
♻️ (pypo) cleanup pypo/__main__.py
...
Clean up code and add python 3 support (with python 2 bc).
2018-12-23 12:06:26 +01:00
539b03dd8c
Stop ShoutCAST rejecting title updates
...
When Libretime streams a webstream, the ID3 data is put into a single title field, leaving the artist field blank. When processing the ID3 data, Libretime concatenates the blank 'artist' field with the title, leaving '- title'. ShoutCAST rejects title updates that begin with punctuation for stylistic reasons (thanks guys) and so effectively ignores all ID3 data coming with the stream, falling back to the 'Station off-air' message. This PR uses the title field alone if the artist field is blank, but both when the artist data is available e.g. when streaming an MP3.
2018-03-04 15:04:31 +00:00
bf5cfbcf56
gracefully handle missing config option
2017-10-15 14:45:22 +02:00
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
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
6e35cfb44b
Fix whitespace and move config getting into try
2017-10-08 16:15:08 +02:00
5160fc64d7
Update pypofile.py
...
Last update
2017-10-03 03:37:06 +02:00
216294428a
Update pypofile.py
2017-10-03 01:28:01 +02:00
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
2104b53761
Update pypofile.py
...
Adding user write permission in cached file
2017-09-28 11:12:57 +02:00
314654dfe4
Enable logging for analyzer and pypo
2017-08-05 17:56:23 -04:00
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
65a4961aac
Merge pull request #187 from Kirill-Kad/patch-1
...
Correction lines 399 and 400. ls_script.liq
2017-04-25 13:09:58 +02:00
ebd7c1d2a3
Merge pull request #163 from radiorabe/feature/python-debug-flag-for-140
...
Problem: airtime-liquidsoap --debug only works for liquidsoap
2017-04-17 16:36:07 -04:00
8253a070f4
Update name in ref_off_air_meta in Liquidsoap
2017-04-16 01:23:40 +02:00
007ff5561c
Pass debug flag to python logger as well
2017-04-15 23:27:04 +02:00
b12d132aab
removed hardcoded include of pervasives.liq
2017-04-03 19:54:18 -04:00
acdc529139
Do not bundle liquidsoap library
...
I think the code was bundled into legacy upstream before it was
readily available in liquidsoap proper. These snippets are now
maintained at https://github.com/savonet/liquidsoap/tree/master/scripts .
On all distros I checked these scripts are installed to /usr/bin/liquidsoap
by the corresponding package. Liquidsoap loads them from there by
default.
By not bundling this we will be ready to profit from new features and
bugfixes in liquidsoap that is expected to land on opam soon. We'll
need to figure out how to get debian and others updated when that
happens.
2017-03-28 12:26:11 +02:00
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
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
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
1b90dbd4ca
working python liquidsoap reconfigure script, might need further refinement
2017-03-14 04:02:51 +00:00
67ffd2d34a
Making show and master source ports and mount points editable.
2017-03-14 01:15:14 +00:00
479bdb1c80
Merge pull request #76 from radiorabe/feature/no-more-std_err_override-for-pypo
...
Problem: std_err_override is a hack for python < 2.7
2017-03-13 14:44:01 -04:00
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
99a0ce37cc
Fix fix_cue_in to work with liquidsoap 1.2
...
The previous syntax only worked with 1.1, this one should work on both.
2017-03-13 14:30:51 +01:00
0775bc4f59
Correction lines 399 and 400. ls_script.liq
...
Lines 399 and 400. Changed the values of s3_name and s3_description places.
(Because of this error, the Icecast confused the name and description of the flow)
_______________________
Строки 399 и 400. Поменял значения s3_name и s3_description местами. (Из-за этой ошибки Icecast путал название и описание потока)
_______________________
Sorry for my clumsy translation, I'm from Russia
2017-03-12 20:03:30 +04:00
ac5f608bd8
Refactor into def check_version
...
Make the code more readable :)
2017-03-12 14:18:06 +01:00
80373ca7bc
cue_cut workaround
...
This is the workaround for <https://github.com/savonet/liquidsoap/issues/390 >.
I still need to do proper testing on it and maybe we should figure out the proper "formula" for getting to the 0.04 value.
2017-03-12 14:18:06 +01:00
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
a26f1a70e3
Respawn liquidsoap and pypo indefinitely if they fail to launch. Throttled it though.
2015-12-04 15:56:06 -05:00
91e1252b86
SAAS-1239: Listener stats with Shoutcast not working
2015-12-04 15:05:17 -05:00
2eea558dfd
SAAS-1267: AAC streams stuck at 64 kbps, even at higher bitrates
2015-12-04 10:51:07 -05:00
bb05fa996a
SAAS-1132: Improve safety of XML parsing for listener stats
2015-11-09 19:32:56 -05:00
3592eceb22
Merge branch 'saas' into saas-dev
2015-08-24 17:11:52 -04:00
f21fcb3dcc
SAAS-1011 - Fixed one mimetype problem and fixed installer
2015-08-24 16:25:09 -04:00
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
dab0f00736
Fixed m4a file extension mapping in pypo
2015-08-11 08:59:44 -04:00
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
238bb15793
SAAS-941: Liquidsoap fails to start for stations with the substrings true/false in their names
2015-07-09 22:32:34 -04:00
dd2ffd148d
Fix bug where pypo fails to restart liquidsoap; uncomment adding pypo template files
2015-06-29 12:20:39 -04:00
d9f17f3919
SAAS-871 - Fix consumer cancellation bug
2015-06-26 17:11:04 -04:00
d54eb37317
Merge branch 'saas' into saas-dev
2015-06-24 15:19:38 -04:00
195935cccf
Slightly better exception handling and logging to help with SAAS-884
2015-06-22 15:49:23 -04:00
92ad5bde6d
Add fields to airtime.example.conf for compatibility, remove /etc/init scripts to prevent duplicate processes on startup
2015-06-17 14:49:12 -04:00
3996e757b7
Merge branch 'saas-dev' into saas-installer-albert
2015-06-10 12:02:08 -04:00
146146e35f
CC-6052: Fix problem with stream passwords
2015-06-08 14:18:19 -04:00
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
700fddbada
SAAS-818: If the network connection is interrupted, pypo sometimes can't recover
2015-06-02 14:51:20 -04:00
532bd1ea85
SAAS-772: Send metadata to Tunein
...
Made Improvement so Airtime always makes a request to TuneIn every 4
minutes so TuneIn does not turn metadata off
2015-05-25 15:37:45 -04:00
6fad0a3ee6
Merge branch 'saas-dev' into saas-installer-albert
2015-05-22 19:09:30 -04:00
fc02de4920
Revert "Add on_metadata wrapper to liquidsoap master/show sources"
...
This reverts commit 415a0d21f9
2015-05-22 19:09:04 -04:00
d3f89c9507
Revert "Add on_metadata wrapper to liquidsoap master/show sources"
...
This reverts commit 82c801cb79
2015-05-22 19:08:48 -04:00
9ffbdfbfa3
Merge branch '2.5.x-installer' into saas-installer-albert
2015-05-22 18:43:28 -04:00
b81069ace3
Added missing requests dependency to pypo's requirements
2015-05-22 18:43:05 -04:00
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
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
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
196e08fc90
Fix bug where users can't connect to Master source due to hardcoded path in liquidsoap
2015-05-21 12:49:26 -04:00
415a0d21f9
Add on_metadata wrapper to liquidsoap master/show sources
2015-05-15 15:46:45 -04:00
82c801cb79
Add on_metadata wrapper to liquidsoap master/show sources
2015-05-15 15:15:49 -04:00
e2ca218ac2
Merge remote-tracking branch 'stash/saas-four-streams' into saas-embed-player
2015-03-23 15:54:04 -04:00
cca9ba0c36
Fixed pypo config file loading
2015-03-12 19:09:00 -04:00
b49e98693b
Ignore artist_name and track_titles that aren't strings (fixes playout
...
for empty artist name or track titles)
2015-03-12 10:52:28 -04:00
a29d464eb2
SAAS-642: Files with doublequotes in their track titles fail to playout
...
(pypo->LS communication bug)
* Fixed it by escaping the command
2015-03-11 18:34:50 -04:00
0042fb50fe
Refactor some stuff related to four streams, Liquidsoap is a piece of
...
shit too - no dynamic variables
2015-03-10 19:15:38 -04:00
Kyle Robbertze
Keoni Mahelona
Keoni Mahelona
Kyle Robbertze
Jérôme Lebleu
Robb Ebright
Roberto Soto
Lucas Bickel
Lucas Bickel
expert-geeks
Xabi Spacebiker
Robb Ebright
Kirill Kadoshnikov
Albert Santoni
Duncan Sommerville
Duncan Sommerville
drigato