681fe4630b
CC-5708: proftpd hook for new File API
...
url and API key are hard coded right now.
Next task is to somehow decipher these with whatever ftp parameters we can pass in to the scipt.
2014-03-25 18:09:47 -04:00
03267fe83b
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-03-25 14:35:07 -04:00
f8c221a610
CC-5709: Airtime Analyzer
...
* Fixed and updated the unit tests
2014-03-25 14:34:50 -04:00
3bffb02bc0
CC-5708: proftpd hook for new File API
2014-03-24 18:22:34 -04:00
6952902b22
CC-5709: Airtime Analyzer
...
* Unbreak stuff
2014-03-24 16:05:53 -04:00
eb37b39406
CC-5709: Airtime Analyzer
...
* Added missing FileMoverAnalyzer file that I forgot to commit
2014-03-24 13:03:20 -04:00
61c2c90b7e
CC-5709: Airtime Analyzer
...
* Remove the "hidden" field from the REST blacklist, the analyzer needs to set it.
* Added import_status column messages in the recent uploads table
* Auto-refresh the recent uploads table while imports are pending
* Moved the file moving stuff to its own analyzer in airtime_analyzer
* Basic error reporting to the REST API in airtime_analyzer, needs
hardeneing though
* Fixed a bug with the number of recent uploads
* Prevent airtime_analyzer from running if media_monitor is running
2014-03-22 02:12:03 -04:00
8f7ecafcf6
CC-5709: Airtime Analyzer
...
* A bunch of changes that somehow didn't make it into my last commit...
* confused
2014-03-21 14:03:17 -04:00
878dd11ccc
CC-5709: Airtime Analyzer
...
* Overhauled Add Media screen, now shows state of recent uploads
* Dropped old unused "state" column, added new file_import column to cc_files
* New PluploadController methods
* Save the filename as the track title for unprocessed uploads
* Hide pending files from the library until they've been processed.
* Don't overwrite files with duplicate names, we rename them instead.
2014-03-21 13:22:00 -04:00
3c40c6d627
Merge branch '2.5.x' into 2.5.x-saas
2014-03-21 09:46:30 -04:00
b827321093
cc-5747 Replaygain: doesnt work for aac tracks
2014-03-20 13:02:37 -04:00
2a783f3825
Merge branch '2.5.x' into 2.5.x-saas
2014-03-17 15:41:14 -04:00
16c56e6aff
CC-5709: Airtime Analyzer
...
* Fixed error in media API authentication
* Improved documentation
2014-03-17 14:43:50 -04:00
50a42f12bb
CC-5709: Airtime Analyzer
...
* File import via the Add Media page now works!
* Reworked StoredFile::copyFileToStor() because it's still needed.
* Reworked the way file paths are reported in airtime_analyzer
and in the RESTful media API
2014-03-17 10:19:39 -04:00
259edebadc
CC-5709: Airtime Analyzer
...
* Fixed import of length, MIME type, and bitrate into Airtime
2014-03-13 16:52:11 -04:00
c0aee37e37
CC-5709: Airtime Analyzer
...
* Fixed the RabbitMQ setup instructions in the README
2014-03-13 14:38:01 -04:00
451b19150b
CC-5709: Airtime Analyzer
...
* Notify airtime_analyzer of new uploads with RabbitMQ
* Use a durable exchange for airtime-uploads
2014-03-13 13:35:48 -04:00
f4ea417b83
CC-5709: Airtime Analyzer
...
* Renamed a function in MediaController for clarity
* Updated airtime_analyzer README
2014-03-13 12:12:12 -04:00
73cbead4c3
CC-5729: Pypo race condition on show source kick event kills playout
...
* Fixed a race condition in pypo which could kill playout. Input kick
events and non-file/webstream events could result in an exception
being thrown. Fixed the logic error behind this, caught the exception
just in case, and added some code to prevent uncaught pypopush
exceptions from terminating the thread.
* Could prevent playout breakage in similar situations
2014-03-11 18:01:29 -04:00
6d7117f670
CC-5709: Airtime Analyzer
...
* Added MetadataAnalyzer unit tests and test data
* Improved debug logging and squashed pika logging
* Implemented file moving
* Extract the track number/total
* Fixed mapping of mutagen to Airtime fields in a few spots. The mapping
matches the DB column names now.
* Fixed the bin/airtime_analyzer binary
* Started work on PluploadController to make it work with the new File
API
2014-03-10 16:32:23 -04:00
4e39fce701
CC-5709: Airtime Analyzer
...
* Basic HTTP reporting back to the File API works (PUT)
* Use the database table names as JSON field names.
* Fixed result returning bug in message_listener.py
* Fixed API key verification to adhere with the HTTP Basic Auth spec
2014-03-06 16:55:20 -05:00
59535850e2
CC-5709: Airtime Analyzer Queue
...
* Added StatusReporter class to make HTTP requests back to Airtime
* Handle even more errors now
* Added proper logging and log rotation
* Added --debug flag for increased logging.
2014-03-05 22:43:47 -05:00
a6a64a2b9e
CC-5709 / CC-5705 : Airtime Analyzer
...
* Finished the skeleton of the airtime_analyzer service.
* Basic round-robin, reliable AMQP messaging works.
* Using multiprocess arch so the daemon survives analyzer crashes and
avoids failures propagating to other nodes.
* Basic metadata extractor using Mutagen is done.
* HTTP requests to the File API to are next to come...
2014-03-05 12:15:25 -05:00
86dafaf61c
SAAS-404: Separate the Airtime API version from the Airtime version
...
* Airtime PHP side can be version bumped without pypo freaking out now
2014-02-14 16:22:15 -05:00
02a96646e1
Merge branch '2.5.x' into 2.5.x-saas
...
Conflicts:
python_apps/pypo/listenerstat.py
2014-02-05 17:35:59 -05:00
b4e7b9324b
Fixed listener stats thread hanging on network errors
...
* Same fix as before, urlopen() wasn't being used with a timeout.
* Fixes CC-5472 and SAAS-394 aka. listener stats breaking all the time
2014-02-05 17:29:15 -05:00
dfc4c2f308
SAAS-387: Hunt playout freezes
...
* Really kill hung pyponotify processes.
2014-02-05 12:20:04 -05:00
d53c81a410
Fix major pypo freeze
...
* Set a timeout for HTTP requests in api_client so that they don't
hang forever if there's a network interruption.
* Prevents pypo from completely freezing up in the network gets jacked.
2014-02-04 17:09:00 -05:00
c7c2d37b30
Merge branch '2.5.x' into 2.5.x-saas
2014-01-31 13:21:33 -05:00
8a6ac21e8c
CC-5679: Media Monitor: Uploading folder with tracks will erase organize folder itself
...
* Fixed problem where the "organize" folder would get deleted if you
copied a directory into it. Would break FTP uploads on Pro.
2014-01-31 13:20:10 -05:00
2525c0dbd6
Fixed a race condition in media-monitor
...
* Prevent exception if files are copied in very quickly
2014-01-30 15:58:52 -05:00
49474ab5c4
Merge branch '2.5.x' into 2.5.x-saas
...
Conflicts:
airtime_mvc/application/forms/AddShowWhen.php
airtime_mvc/application/forms/LiveStreamingPreferences.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
2013-12-17 17:20:38 -05:00
2032eefdde
Update version number in airtime-constants.php
...
Update version number in api_client.py
Create upgrade folder
2013-12-09 15:30:30 -05:00
2ab269dd29
CC-5299 : Back to back record shows doesn't work with some devices
...
waiting until the ecasound process has completed before starting a new recording thread.
2013-10-15 14:31:06 -04:00
f91cb39e46
CC-5363 : pushing a file twice, noticeable replaygain switch
2013-10-11 17:05:42 -04:00
f34a6d201a
Double the pypo->liquidsoap timeout on second attempt if first attempt failed
2013-10-07 15:39:14 -04:00
02101db088
Raise timeout for pypo->liquidsoap communication to improve reliability under load
2013-10-07 15:37:34 -04:00
a34ae69d4b
CC-5347 : Random Error think to do with updating is scheduled status of a webstream
...
not sending a notify message if webstream source is -1
2013-09-30 15:56:26 -04:00
9f38e5a9c6
CC-5342 : Pypo: Webstream disconnection happens when any changes on Now playing page
2013-09-26 17:03:18 -04:00
58ad52f93f
CC-5328 Fix virtualenv version check for newer distros
2013-09-25 13:03:35 +01:00
577bbf14b6
Remove swear words from source code
2013-09-23 16:16:51 +01:00
682a37894b
Merge branch 'ryerson-history' into 2.5.x-saas
...
Conflicts:
airtime_mvc/application/views/scripts/menu.phtml
2013-09-02 15:52:43 -04:00
60bf334aeb
Merge branch '2.4.x' into 2.4.x-saas
2013-09-02 15:46:25 -04:00
71ee72015b
release version updates and changelog edits.
2013-09-01 00:56:47 -04:00
186e438ccb
adding upgrades to 2.4.1 for version.
2013-08-28 11:54:34 -04:00
12a62a3827
CC-5309:Calendar-> Recording Show: Fail to open context menu
...
Better error msg, also add more information in show-record.log
2013-08-23 14:23:47 -04:00
ceba84d1f7
CC-5308 Liquidsoap input habor will block schedule contents sometime
...
Remove makesafe wrapper
2013-08-22 15:03:25 -04:00
9cbdd06af2
Removed ugly comment
2013-08-12 16:05:44 -04:00
6501d563be
CC-5276: Adding watched folder throws exception sometimes
...
Fixed by only converting length format if it is not already in the correct format
2013-08-12 16:01:55 -04:00
694e3101a8
Merge branch '2.4.x' into 2.4.x-saas
2013-07-22 11:02:35 -04:00
de76b3a12f
CC-5278: Exception in Pypo
2013-07-17 15:29:21 -04:00
18bb477845
Merge branch '2.4.x' into 2.4.x-saas
2013-07-10 11:32:51 -04:00
f9a1cae72e
CC-5260: Liquidsoap: Fail to play mono file
...
Fixed thanks to Bill Burton
2013-07-10 10:35:24 -04:00
f2d5fa96da
Merge branch '2.4.x' into 2.4.x-saas
...
Conflicts:
python_apps/pypo/liquidsoap_scripts/ls_script.liq
utils/phone_home_stat.php
2013-06-26 01:25:26 -04:00
c11021af0f
remove commented code
2013-06-14 16:36:47 -04:00
caa3b420c4
Liquidsoap restart shouldn't timeout
2013-06-13 14:59:23 -04:00
b929cc0ce5
CC-5232: During playback, a reinstall may push some tracks twice
2013-06-13 14:06:07 -04:00
bc1c8129a9
CC-5232 - During playback, a reinstall may push some tracks twice
2013-06-13 12:08:25 -04:00
c365373aab
remove useless code and imports
2013-06-12 17:36:24 -04:00
fb80530069
CC-5229: map_metadata in Liquidsoap is applied twice
...
fixed
2013-06-12 16:04:57 -04:00
6961ba0a00
use he-aac v2 for fdk-aac
2013-06-12 15:31:36 -04:00
949ae9667b
CC-5226: Metadata isn't correct during playing
...
-fixed using "insert_metadata" and callbacks instead.
2013-06-12 14:04:52 -04:00
4e71345a61
CC-5226: Metadata isn't correct during playing
...
-fix incorrect metadata formatting
2013-06-12 12:49:28 -04:00
0e560d89ad
CC-5226:
...
Metadata isn't correct during playing
-should be fixed
2013-06-12 12:43:27 -04:00
21c84dcaad
CC-5227 - Sometimes Liquidsoap telnet is unresponsive which causes all Pypo threads to block
...
-restart Liquidsoap if communication fails..
2013-06-11 17:26:48 -04:00
f164cf0ad4
CC-5227 - Sometimes Liquidsoap telnet is unresponsive which causes all Pypo threads to block
...
-initial commit
2013-06-11 15:55:17 -04:00
622a7e6ff3
CC-5212
...
Lucid: Installation is blocked because monit "restart" fails
fixed
2013-06-06 17:13:30 -04:00
f7a6fec5eb
CC-5195: Media Folder: Update media folder will block media uploader
...
-fixed
2013-06-06 12:54:48 -04:00
f61eeaf18c
CC-5195:
...
Media Folder: Update media folder will block media uploader
-fixed
2013-06-06 12:44:20 -04:00
c7d0b6df92
CC-5204
...
Pypo: Updating stream settings will cause redundant pypopush
-fixed
2013-06-04 15:36:25 -04:00
905dd08ed5
Use proper unit conventions for Kilo
2013-05-31 15:59:20 -04:00
82a71fdb61
CC-5199
...
aacencplus encoder is very low quality
2013-05-31 15:59:04 -04:00
bc22a8a871
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-30 14:02:13 -04:00
6fddabdd7c
CC-5192
...
Pypo: Live Streaming in first show will block the next show's first track
-fixed. Was caused by clashing keys
2013-05-30 14:02:05 -04:00
1e9829e85c
CC-5182
...
Liquidsoap: Sometime the tracks in schedule cannot be played
2013-05-28 18:06:23 -04:00
73a908055a
Revert "CC-5123 Pypo: Redundant Pypopush happens after restart pypo service"
...
This reverts commit 4c3d2b20db
2013-05-28 16:38:15 -04:00
176dd91e20
use proper parameters for earlier versions of 'timeout' command
...
-hide warning if older version of timeout doesn't support --version
2013-05-28 16:29:07 -04:00
3247c7288d
use proper parameters for earlier versions of 'timeout' command
...
-small typo
2013-05-28 16:21:45 -04:00
a4ca2deb0f
use proper parameters for earlier versions of 'timeout' command
...
-lucid has timeout with incompatible parameters compared to newer
versions of ubuntu.
2013-05-28 16:18:29 -04:00
4c3d2b20db
CC-5123 Pypo: Redundant Pypopush happens after restart pypo service
...
-if does not exist does not work on pre 5.2 monit version
2013-05-28 15:54:31 -04:00
66bb1f6d93
CC-5123 Pypo: Redundant Pypopush happens after restart pypo service
...
-added timeout so that monit doesn't try to start Liquidsoap while
it is already being restarted.
2013-05-28 15:48:15 -04:00
82c0fe1088
CC-5123
...
Pypo: Redundant Pypopush happens after restart pypo service
-added timeout so that monit doesn't try to start Liquidsoap while
it is already being restarted.
2013-05-28 15:24:26 -04:00
1130cf961c
CC-5049: Error messages on Liquidsoap start up/shut down after Airtime install
...
-fixed
2013-05-27 13:41:36 -04:00
ca37ec3aff
CC-5049:
...
Error messages on Liquidsoap start up/shut down after Airtime install
Suppress global warning messages. Clients should decide whether to print
or not.
2013-05-23 17:17:00 -04:00
2a897414a4
make operators more local to each queue source
...
Conflicts:
python_apps/pypo/liquidsoap_scripts/ls_script.liq
2013-05-23 13:02:50 -04:00
5c11f5fc72
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
...
Conflicts:
python_apps/pypo/liquidsoap_scripts/ls_script.liq
2013-05-22 18:08:14 -04:00
4e1dc6a86e
make operators more local to each queue source
2013-05-22 18:07:12 -04:00
45e5d339a1
make more operators local to each source
2013-05-22 18:03:56 -04:00
dc19d3f0b0
Merge branch '2.4.x' into 2.4.x-saas
2013-05-22 17:39:33 -04:00
36567c85cd
create on_metadata callback for each source instead of once on unified source
2013-05-22 17:39:18 -04:00
ab89b80b85
remove unnecessary install code for saas
2013-05-21 17:36:57 -04:00
ab5639ef79
remove unnecessary install code for saas
2013-05-21 17:27:34 -04:00
3b9b23a7dd
Merge branch '2.3.x-saas' into 2.4.x-saas
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/forms/AddShowWhen.php
airtime_mvc/application/models/Schedule.php
python_apps/pypo/airtime-playout
2013-05-21 16:40:10 -04:00
8e617b33de
add ability to use id's with mksafe operator
2013-05-21 16:31:32 -04:00
76a02796b7
implement method stub
2013-05-17 12:16:04 -04:00
d205b0dbd3
remove string literal
2013-05-17 12:14:33 -04:00
59785a952f
make up for lack of 'total_seconds()' lib function for pre 2.7 version of python
2013-05-16 12:25:21 -04:00
d2f29b1f88
more informative message to user about new init.d script behaviour
2013-05-16 12:08:32 -04:00
1ab27e3cf8
be more idiomatic
2013-05-15 17:18:42 -04:00
95bb5b2f36
CC-5153:
...
Cancel show won't cut off current song after airtime-playout is restarted
-fixed
2013-05-15 17:18:15 -04:00
8545803dbf
CC-5126: Media Monitor: Exception happens when cuein value is 00:00:00
...
-slightly better way of not writing cue-in/cue-out
2013-05-15 13:19:29 -04:00
4a82fe2e52
Revert "CC-5126: Media Monitor: Exception happens when cuein value is 00:00:00"
...
This reverts commit 9ad42b2b2c
2013-05-15 13:13:37 -04:00
ba3703b556
Revert "CC-5126:"
...
This reverts commit a2b500729c
2013-05-15 13:10:56 -04:00
80686b7063
add parameter parsing to airtime-liquidsoap script.
...
-Allow us to prevent running as daemon
2013-05-15 13:06:16 -04:00
9ad42b2b2c
CC-5126: Media Monitor: Exception happens when cuein value is 00:00:00
...
-also removed functions that query for cue-in/cue-out,
since we don't care about these.
2013-05-14 22:26:48 -04:00
a2b500729c
CC-5126:
...
Media Monitor: Exception happens when cuein value is 00:00:00
-fixed this be ensuring we're not writing cue-in/out values to the file.
This should never have been allowed.
2013-05-14 22:16:30 -04:00
c693c4b015
remoe id's for mksafe (they aren't supported params)
2013-05-14 15:14:57 -04:00
a59fc69d17
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 15:10:13 -04:00
b3f0a2fcdd
CC-5144:
...
SHOUTcast listener stats auth not working
2013-05-14 15:10:04 -04:00
298e5a9b77
better idenfication of which mksafe is being applied
2013-05-13 17:52:43 -04:00
f5a0d0a9a4
CC-5123:
...
Pypo: Redundant Pypopush happens after restart pypo service
-was clearing the queue after fetching the schedule :S
2013-05-13 17:52:22 -04:00
be465be9b2
CC-5133: Make sure Liquidsoap 1.1.1 is used
...
add missing file
2013-05-13 16:10:21 -04:00
85afe53c89
CC-5133: Make sure Liquidsoap 1.1.1 is used
...
fixed
2013-05-13 15:45:56 -04:00
28576adf42
disable liquidsoap's add operator normalizing audio
2013-05-10 23:19:54 -04:00
d06b2f3f94
CC-5116:
...
Please add opus into the file name filter
-fixed
2013-05-08 17:06:50 -04:00
4dba722272
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-08 16:53:42 -04:00
56b9d0580f
CC-5071:
...
Better RabbitMQ passwords
-fixed
2013-05-08 15:25:30 -04:00
f0e846db75
CC-5049: Error messages on Liquidsoap start up/shut down after Airtime install
...
fixed
2013-05-08 13:47:24 -04:00
3ae3c7e802
sanity check to warn if cue_out - cue_in != end - start
2013-05-07 15:05:14 -04:00
81b2012a45
remove some overly-verbose logging
2013-05-07 13:25:21 -04:00
1895686c85
CC-5098: Liquidsoap: Restart liquidsoap will make the output stream silence until next song starts
...
-fixed
2013-05-06 16:39:17 -04:00
2fc4afef68
ensure a proper environment everytime we restart liquidsoap
2013-05-06 12:11:19 -04:00
2eaf81d366
ensure a proper environment everytime we restart liquidsoap
2013-05-06 12:08:57 -04:00
3a1048bdec
ensure pypo registers with server before doing Liquidsoap check
2013-05-06 11:42:39 -04:00
ec7eb5f264
CC-5094 Liquidsoap crash if unsupported encoder in the liq script
...
-keep up with liquidsoap changes
2013-05-04 14:11:21 -04:00
fdcfc4d06c
CC-5094
...
Liquidsoap crash if unsupported encoder in the liq script
2013-05-04 10:57:22 -04:00
6c42064c14
refactor methods into appropriate locations
2013-05-02 18:46:16 -04:00
84efb4a9b7
work around to work with annoying static methods - should remove these later..
2013-05-02 17:59:03 -04:00
1e25d786ee
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-02 17:31:42 -04:00
f2564cf732
temporarily disable opus + aac until liquidsoap binaries are ready
2013-05-02 16:09:04 -04:00
88ba36601f
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-01 00:37:26 -04:00
623a67d6aa
CC-5072:
...
Ensure all api requests are returning valid JSON
-fixed
2013-04-26 18:27:40 -04:00
21b84c153a
better logging for return values
2013-04-26 17:54:52 -04:00
21bed91678
add brackets to force operator precedence
2013-04-26 15:56:48 -04:00
49d1755b52
fix incorrect merge
2013-04-26 13:58:44 -04:00
705329ee5d
cleanup of unecessary code
...
-we shouldn't be loading config file multiple times.
2013-04-26 13:48:15 -04:00
6cc366b100
CC-5069:
...
Airtime 2.4 upgrade scripts
-initial commit
2013-04-26 13:43:40 -04:00
655c1eb5a9
CC-5043:
...
Invalid literal for float error from mutagen
2013-04-26 11:37:46 -04:00
628e075828
pypo syntax error
2013-04-26 11:35:52 -04:00
1158fc2c9e
more legible comment
2013-04-25 22:38:06 -04:00
ca86d6b68b
fix potential out-of-bounds string index error
2013-04-25 22:36:21 -04:00
7bf6f3669b
more stringent verification of equivalence between tracks
2013-04-25 22:33:03 -04:00
039d8a7c0f
fix worst offenders of > 80 character row length
2013-04-25 22:32:27 -04:00
1a765e6cb9
Merge branch 'master' of dev.sourcefabric.org:airtime
...
Conflicts:
python_apps/pypo/pypocli.py
python_apps/pypo/pypofetch.py
python_apps/pypo/pypopush.py
2013-04-25 22:20:03 -04:00
fb4a02faec
cleanup of unecessary code
...
-we shouldn't be loading config file multiple times.
2013-04-25 22:11:26 -04:00
5b2e8e221f
Merge branch 'CC-4417-opus-support'
...
Conflicts:
python_apps/pypo/airtime-liquidsoap
2013-04-25 18:23:37 -04:00
ccd3293f3d
CC-4417: Opus codec support
2013-04-25 18:23:02 -04:00
45ac5282b8
clean unused import
2013-04-24 15:16:50 -04:00
80bd57ce4e
CC-5050: Tracks with a very high track count cannot be saved into database
...
-fixed
2013-04-22 17:54:25 -04:00
07f0ae6c28
CC-1469: Crossfading support (non-equal power)
...
-fix restarting airtime playout not resyncing to schedule correctly
2013-04-22 17:33:56 -04:00
drigato
Albert Santoni
cliffctwang
cliff.wang
Naomi Aro
Daniel James
cliff.wang
denise
Martin Konecny