eb72f25151
CC-5708: proftpd hook for new File API
...
uncomment curl command
2014-03-27 11:11:10 -04:00
700b28ae38
CC-5708: proftpd hook for new File API
...
removed testing lines
2014-03-27 11:09:18 -04:00
b37938dbd8
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-03-27 11:05:36 -04:00
ead1ec4795
CC-5708: proftpd hook for new File API
2014-03-27 11:05:23 -04:00
7e0c9bc684
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-03-26 15:07:40 -04:00
58a38ffd3a
CC-5709: Airtime Analyzer
...
* Added unit test coverage report stuff
* Added more unit tests
* 98% test coverage :-)
* Fixed a few bugs and removed some dead code
2014-03-26 15:06:48 -04:00
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
96579b7ef4
CC-5057: Pypopush error: no attribute 'push_item'
...
-fixed
2013-04-22 16:48:52 -04:00
54a9f50055
CC-5004: Fix mistake in api_client.cfg
...
-fixed by simply removing all unnecessary stuff to python file
2013-04-18 18:02:54 -04:00
479e69de12
CC-5009:
...
Use Silan to silently update track length in the background
-done
2013-04-18 15:40:33 -04:00
10fb9c9165
Merge branch '2.3.x' into 2.3.x-saas
2013-04-08 18:56:12 -04:00
5cb950e43f
Merge branch '2.3.x'
2013-04-08 18:55:54 -04:00
5b4bc038b0
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-04-08 18:53:49 -04:00
aca651a1b4
better logging
2013-04-08 18:53:35 -04:00
f13f6c6a70
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-04-07 20:20:57 -04:00
0d45d7b8cd
CC-5042:
...
Do process matching by process name instead of PID file
-fixed
2013-04-07 20:19:51 -04:00
67e3803189
Merge branch '2.3.x' into 2.3.x-saas
2013-04-05 17:33:19 -04:00
db5d2283f4
Merge branch '2.3.x'
...
Conflicts:
python_apps/pypo/pypofetch.py
2013-04-05 17:33:02 -04:00
3d135a9f4a
improved logging on why files sometimes aren't removed
2013-04-05 17:31:55 -04:00
18574fd10f
Merge branch '2.3.x'
2013-04-05 15:57:54 -04:00
5b1383d48d
Merge branch '2.3.x' into 2.3.x-saas
2013-04-05 15:57:41 -04:00
5ff7ce857f
use sigkill immediately for unresponsive telnet
...
-fix order of arguments
2013-04-05 15:57:16 -04:00
92d0a6178e
Merge branch '2.3.x' into 2.3.x-saas
2013-04-05 15:34:04 -04:00
4595aab694
Merge branch '2.3.x'
2013-04-05 15:33:48 -04:00
d1f655d79d
CC-5038: Silan error: list index out of range
...
-fixed
2013-04-05 15:32:44 -04:00
afb55c7b51
CC-5038:
...
Silan error: list index out of range
cosmetic bug fix to prevent so much logging
2013-04-05 14:20:34 -04:00
1a389a3765
Merge branch '2.3.x' into 2.3.x-saas
2013-04-05 13:57:46 -04:00
08c93e10fd
Merge branch '2.3.x'
2013-04-05 13:57:32 -04:00
cdb53048c7
ensure that an empty listener stats dict is not sent to the server
2013-04-05 13:56:41 -04:00
1a8ab6cd89
Merge branch '2.3.x'
2013-04-05 12:43:01 -04:00
7727b72e68
Merge branch '2.3.x' into 2.3.x-saas
2013-04-05 12:42:34 -04:00
266823b1d9
use sigkill immediately for unresponsive telnet
2013-04-05 12:42:05 -04:00
2b019c4615
Merge branch '2.3.x'
2013-04-05 11:28:47 -04:00
a0bfbce61b
Merge branch '2.3.x' into 2.3.x-saas
2013-04-05 11:28:07 -04:00
f8dbbe71ab
increase monit timeout after liquidsoap starts to 30 seconds.
2013-04-05 11:27:45 -04:00
b988cda2d1
monit alerts in saas
2013-04-04 16:30:39 -04:00
fcbac2a044
Merge branch '2.3.x' into devel
2013-04-04 15:15:19 -04:00
a061464ffb
Merge branch '2.3.x' into 2.3.x-saas
2013-04-04 15:14:04 -04:00
301115c035
CC-5039: Encoded forward slash causing lots of apache error logs
...
-fixed: data should have been sent as POST rather than GET
2013-04-04 15:12:52 -04:00
61f8e64329
Merge branch '2.3.x' into devel
2013-04-03 17:59:04 -04:00
6c0b0f7732
Merge branch '2.3.x' into 2.3.x-saas
2013-04-03 17:58:51 -04:00
3c68a295b4
CC-5039:
...
Encoded forward slash causing lots of apache error logs
-fixed: data should have been sent as POST rather than GET
2013-04-03 17:57:29 -04:00
5dd54783c0
Merge branch '2.3.x' into 2.3.x-saas
2013-04-03 16:48:37 -04:00
e2e6a4263c
Merge branch '2.3.x' into devel
2013-04-03 16:48:19 -04:00
ec7c898f5a
fix some problems with invalid Liquidsoap PID file
2013-04-03 16:47:46 -04:00
bfb252edf5
CC-4417: Opus codec support
2013-04-03 11:40:57 -04:00
2d2aa8eb46
Merge branch '2.3.x' into 2.3.x-saas
2013-04-02 12:31:03 -04:00
0bb7fa4975
don't change monit monitor state on service start/stop
2013-04-02 12:30:15 -04:00
811abc4baf
don't change monit monitor state on service start/stop
2013-04-01 19:31:13 -04:00
01cca88c58
Merge branch '2.3.x' into 2.3.x-saas
2013-03-26 15:02:43 -04:00
894887bd62
Merge branch '2.3.x' into devel
2013-03-26 15:02:17 -04:00
caa2413fd8
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-03-26 15:02:08 -04:00
7237d48ef6
fix missing import
2013-03-26 15:01:53 -04:00
d79bfaaef9
-fix infinite loop on invalid files
2013-03-26 15:01:44 -04:00
5ab52b12c7
CC-4417:
...
Opus codec support
2013-03-26 15:00:41 -04:00
38f8a0d231
more robust handling if system permissions go wrong
2013-03-24 22:58:13 -04:00
89983bd4f8
remove unnecessary file delete
2013-03-24 22:25:38 -04:00
a5c8b7624e
CC-1469: Crossfading support (non-equal power)
...
-handle file attributes changing (end time, replaygain etc.)
2013-03-22 15:56:05 -04:00
7a6940c96c
Merge branch 'cc-1469-crossfade' into devel
...
Conflicts:
python_apps/pypo/pypopush.py
2013-03-22 15:24:14 -04:00
8a5c82d71a
CC-1469: Crossfading support (non-equal power)
...
-fix few bugs
2013-03-22 15:21:28 -04:00
2fc1612460
Merge branch '2.3.x' into devel
2013-03-22 14:24:37 -04:00
00475275e5
Merge branch '2.3.x' into 2.3.x-saas
2013-03-22 14:24:12 -04:00
fc6742869f
better frozen liquidsoap handling
2013-03-22 14:23:42 -04:00
6d1025507a
Merge branch '2.3.x' into devel
2013-03-22 14:05:08 -04:00
19753429dc
add wait timer before liquidsoap is shutdown
2013-03-22 14:04:50 -04:00
33ca2e7c9c
CC-1469: Crossfading support (non-equal power)
...
-refactor
2013-03-22 12:16:17 -04:00
708d36ba9c
syntax error
2013-03-19 15:22:27 -04:00
6dae7d3973
CC-1469: Crossfading support (non-equal power)
...
-cleanup
2013-03-15 17:00:36 -04:00
445573dcdb
CC-1469: Crossfading support (non-equal power)
...
-webstreams scheduled in the future are now working...
2013-03-15 15:07:55 -04:00
dd7fc61e23
CC-1469: Crossfading support (non-equal power)
...
-further implementation..
2013-03-15 12:50:23 -04:00
2b7ebafa94
CC-1469: Crossfading support (non-equal power)
...
-further implementation..
2013-03-14 18:29:52 -04:00
91d1243554
CC-1469:
...
Crossfading support (non-equal power)
-initial commit
2013-03-14 16:50:55 -04:00
13b3eec0ad
Merge branch '2.3.x' into 2.3.x-saas
2013-03-12 16:38:16 -04:00
661a407f72
CC-5016: Allow user control for webstream metadata format
...
-fixed
2013-03-08 16:45:19 -05:00
fe96b66fd7
CC-5016:
...
Allow user control for webstream metadata format
-fixed
2013-03-08 16:00:16 -05:00
0075b27947
CC-5015: Allow for cue_out points to be Null in DB
...
-prep for 2.4
2013-03-08 14:57:20 -05:00
635dfd356d
Merge branch '2.3.x' into devel
2013-03-08 12:39:47 -05:00
30970598fe
minor fixes
...
-don't show print subprocess commands to py-interpreter.log
2013-03-08 12:39:29 -05:00
3969e38d51
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-03-07 18:34:10 -05:00
c2fb811100
CC-5012:
...
remove all shell=True commands for subprocess calls
-fixed
2013-03-07 18:33:55 -05:00
fc261035a8
CC-4999: Do silan analysis quietly in the background
...
-set silan nice level to 19
2013-03-06 19:48:35 -05:00
3497a3730c
Merge branch '2.3.x' into devel
2013-03-06 18:24:48 -05:00
0321464ab8
CC-4999:
...
Do silan analysis quietly in the background
-fixed
2013-03-06 18:24:19 -05:00
43ffa2aece
Merge branch '2.3.x' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/SystemstatusController.php
2013-03-06 13:47:21 -05:00
5ceeb88899
Merge branch '2.3.x' into devel
2013-03-06 13:46:01 -05:00
7ca178295f
CC-4993: airtime-check-system reports airtime-liquidsoap as down
...
-fixed
2013-03-06 13:43:22 -05:00
8e314477c7
CC-5005: airtime-purge doesn't remove all files
...
-cleanup
2013-03-06 12:26:07 -05:00
e669b7a91a
refactor some liquidsoap code + remove unused --data argument
2013-03-05 17:31:09 -05:00
7039493ea1
2.3.1 preparation
2013-03-05 17:00:52 -05:00
1c80701488
Merge branch '2.3.x' into 2.3.x-saas
2013-03-05 16:21:47 -05:00
cc69418215
Merge branch '2.3.x' into devel
2013-03-05 16:21:22 -05:00
215e5ccb4c
CC-5001: remove /etc/monit/conf.d/monit-airtime-rabbitmq-server.cfg on 2.3.1 upgrade
...
-don't even install rabbitmq monit file
2013-03-05 16:21:05 -05:00
c747b6ad47
CC-4978: Media Monitor: importing file slowly
...
-disable silan on file import
-silan will need to be done manually for now using airtime-silan
2013-03-04 16:00:14 -05:00
b744ab74ee
Merge branch '2.3.x' into 2.3.x-saas
2013-03-01 18:22:12 -05:00
05b988fc6a
CC-4758: File removed before Liquidsoap finishes reading it?
...
-fixed
2013-03-01 16:15:28 -05:00
259f70bc21
CC-4915: Media-Monitor cannot handle rabbitmq restart event
...
-fixed
2013-03-01 16:05:55 -05:00
764ee0389f
CC-4916: Pypo cannot handle Schedule updates after rabbitmq restart happens
...
-fixed
2013-03-01 15:52:41 -05:00
2f33e99ff5
CC-4915: Media-Monitor cannot handle rabbitmq restart event
...
-fixed
2013-03-01 15:52:19 -05:00
d4891803cc
CC-4989: upgrade to mutagen 1.21
...
-done
2013-03-01 14:58:26 -05:00
0f7063e8a6
another refactor of the switches in LS
2013-03-01 12:48:32 -05:00
7e19eba7e1
another refactor of LS source
2013-03-01 11:44:11 -05:00
6624911d2c
minor refactor of LS code
2013-02-28 18:54:23 -05:00
ae503121d8
CC-4984: Exception for replaygain
...
-fixed
2013-02-28 18:26:15 -05:00
5ae4ed67a5
CC-4986: Installation fail because of monit-airtime-liquidsoap.cfg
...
-fixed
2013-02-28 16:33:59 -05:00
66fbfa1554
CC-4986: Installation fail because of monit-airtime-liquidsoap.cfg
...
-fixed
2013-02-28 16:27:52 -05:00
b3ecb477be
minor refactor of LS code
2013-02-27 17:48:10 -05:00
fbaba59dca
CC-4974: Watchdog for ensuring Liquidsoap does not consume more than 1GB of memory
...
-changed to 600MB for now. May lower even more later
2013-02-26 14:47:48 -05:00
15f2533225
less verbose logging
2013-02-26 13:34:05 -05:00
0c88949eb2
potential future optimization by using -b silan option
...
-in the future this -b should be quicker for silan
2013-02-26 13:33:56 -05:00
1e1d291124
CC-4888: Add unofficial support for AAC plugin
...
-fixed
2013-02-26 12:06:22 -05:00
e08732fba7
CC-4975: airtime-silan cmd error
...
-fixed
2013-02-25 19:45:26 -05:00
e35416b1e8
undo - make sure path names are quoted when passing to lsof
2013-02-25 17:43:02 -05:00
deb50ea769
make sure path names are quoted when passing to lsof
2013-02-25 16:44:28 -05:00
b06fd8b3d3
Merge branch '2.3.x' into devel
2013-02-22 12:09:02 -05:00
8573a005c9
Merge branch '2.3.x' into 2.3.x-saas
2013-02-22 12:08:40 -05:00
57183b8ac8
prevent creation of Zombie processes when running lsof
2013-02-22 12:03:39 -05:00
168a364da5
Merge branch '2.3.x' into devel
2013-02-20 14:42:35 -05:00
8bec9dea55
Merge branch '2.3.x' into 2.3.x-saas
2013-02-20 14:41:55 -05:00
8f53871ddc
CC-4970: Process return codes aren't "reaped" after exiting - Zombie processes are created.
...
-fixed
2013-02-20 14:40:16 -05:00
e3f4e91bef
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-02-15 17:06:42 -05:00
f2773fcb01
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-15 16:32:43 -05:00
fe611e7c6a
CC-4957 : Replay Gain undefined error, json response not being sent back properly.
2013-02-15 16:32:05 -05:00
9715a9ad6d
CC-4883: Python services contacting Apache with strange URL format
...
-fixed
2013-02-15 12:55:57 -05:00
c398ce930b
Merge branch '2.3.x' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
2013-02-04 16:22:35 -05:00
331386f74f
CC-4910: Need to properly handle non-200 http status codes in api client
...
-fixed
2013-02-04 16:05:58 -05:00
34eee60bee
CC-4910: Need to properly handle non-200 http status codes in api client
...
-wrap all service calls in exception
2013-02-03 00:40:41 -05:00
04a956217f
Merge branch '2.3.x' into 2.3.x-saas
2013-02-02 08:51:06 -05:00
1f4cfa8f65
fix pypo not auto restarting
2013-02-02 08:50:44 -05:00
27ccefbf0f
Merge branch '2.3.x' into 2.3.x-saas
2013-02-01 01:41:16 -05:00
149b744ba7
remove using self in a static method
2013-02-01 01:40:48 -05:00
f145ede01b
CC-4905: Unit tests for Pypo
...
-whitespace removal
2013-01-31 17:45:57 -05:00
9053266a14
Merge branch '2.3.x' into 2.3.x-saas
2013-01-31 12:33:38 -05:00
8adb4b259c
CC-4905: Unit tests for Pypo
2013-01-31 12:33:14 -05:00
0a198ae424
Merge branch '2.3.x' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/models/User.php
2013-01-30 18:31:45 -05:00
e459f739f2
indentation error fix
2013-01-30 11:29:28 -05:00
2a0cc9e45f
fix indentation
2013-01-30 11:23:20 -05:00
9d4e0d2dd1
Merge branch 'martin' into 2.3.x
2013-01-29 12:17:36 -05:00
28c01760dd
be more gentle to Liquidsoap when sending lots of commands
2013-01-29 12:17:05 -05:00
db4e6bb94a
CC-4889: API client URL request is not wrapping in try/catch
...
-fixed
2013-01-29 10:29:29 -05:00
9d8a9faca8
make code formatting easier on eyes
2013-01-28 17:00:35 -05:00
d7358338f0
improved logging in pypo fetch
2013-01-28 17:00:16 -05:00
b389e44001
take liquidsoap by the horns if it misbehaves.
2013-01-27 15:00:56 -05:00
c93b90cc54
prepare for improvements to way pypo communicates with LS
2013-01-26 20:05:31 -05:00
ea9e97d834
Merge branch '2.3.x' into 2.3.x-saas
2013-01-25 15:15:07 -05:00
807aa6b4a6
fix restart liquidsoap being sent as default no arguments for pypo-notify
2013-01-25 15:14:40 -05:00
22aafda2a8
Merge branch '2.3.x' into 2.3.x-saas
2013-01-25 14:17:23 -05:00
8dd7ffee8c
locks should occur inside try/catch
2013-01-25 14:16:53 -05:00
7c327e4c75
Merge branch '2.3.x' into 2.3.x-saas
2013-01-25 12:12:21 -05:00
21a04803e5
Fix Pypo giving up too early on attempting to receive schedule
2013-01-25 12:11:50 -05:00
d5894279c4
Merge branch '2.3.x' into 2.3.x-saas
2013-01-25 11:30:46 -05:00
7b3850fac6
false not being returned on connection error
2013-01-25 11:30:36 -05:00
6f5ffdc1e7
Merge branch '2.3.x' into 2.3.x-saas
2013-01-24 17:49:08 -05:00
c6ee5bfe58
prepare baby mm for saas
2013-01-22 13:02:45 -05:00
b637365f55
add some missing statements in the sql upgrade script
2013-01-18 15:58:00 -05:00
f8208a355c
Merge branch 'devel' into 2.3.x-saas
2013-01-18 12:22:45 -05:00
ed7b22118c
Merge branch 'silan-script' into devel
2013-01-18 11:54:10 -05:00
f70ca93b53
CC-4841: Silan script
...
done
2013-01-18 11:53:26 -05:00
74877b289e
CC-4843: Make listener stats work with SaaS in 2.3.x-saas branch
...
-fixed
2013-01-16 14:05:45 -05:00
e98d6e92bb
Merge branch 'devel' into 2.3.x-saas
2013-01-15 15:38:27 -05:00
bbedce2951
Changed default base directory in airtime.conf and api_client.cfg
2013-01-15 13:47:35 -05:00
8cd6bd9aa4
Merge branch 'devel' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/forms/AddShowWhen.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/forms/LiveStreamingPreferences.php
airtime_mvc/application/forms/SoundcloudPreferences.php
airtime_mvc/application/forms/SupportSettings.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
airtime_mvc/application/views/scripts/form/preferences_general.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
airtime_mvc/public/js/airtime/preferences/preferences.js
python_apps/api_clients/api_client.py
python_apps/pypo/listenerstat.py
2013-01-15 13:44:44 -05:00
c266bf189f
upgrade version number to 2.3.0
2013-01-15 12:31:41 -05:00
1d6ff24242
SAAS-298: Issues with http://iqkidsradio.airtime.pro/Schedule
...
potential fix
2013-01-10 10:29:57 -05:00
6e7f45e615
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 17:32:39 -05:00
1263c04621
CC-4796: Listener Stat: Authentication exception happens but no warning message on UI
...
- done
2013-01-08 17:32:27 -05:00
8b8e12a234
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 17:23:28 -05:00
e79066de55
CC-4760: Airtime fails to play out 2nd webstream upon switching from one webstream to another
...
-fix attempt
2013-01-08 17:23:21 -05:00
adda497bbb
CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start
...
- fixed
2013-01-08 15:52:11 -05:00
b580a7be73
CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start
...
- fixed
2013-01-08 12:31:14 -05:00
6e241fd3ec
CC-4512: Allow changing stream "Offline" message via Web UI
...
- fixed
2013-01-07 18:14:57 -05:00
225a5d8f48
CC-4733: Stream statistics for Shoutcast users
...
-initial implementation
2013-01-04 18:32:20 -05:00
5d76bb2d17
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-03 18:00:33 -05:00
ae7b6fe092
CC-4732: Ask for admin username + password in Stream Settings page
...
- done
2013-01-03 17:58:50 -05:00
5df867d142
remove whitespace
2013-01-03 15:05:31 -05:00
a05259bd8f
CC-4771: System -> Streams: It will restart liquidsoap every time when I click "Save" button without changing anything
...
- fixed
2013-01-03 14:42:12 -05:00
f5b6d85406
CC-3018: Automatically strip out silence from audio tracks
...
- adding logging
2013-01-03 14:30:19 -05:00
a1837366be
Merge branch 'cc-3018-silence-detection' into devel
2013-01-03 14:08:21 -05:00
f936f510c5
CC-3018: Automatically strip out silence from audio tracks
...
- adding try/catch
2013-01-03 14:07:34 -05:00
b8f80866cf
CC-3018: Automatically strip out silence from audio tracks
...
- done
2013-01-03 14:02:06 -05:00
f2322e4f76
-disable liquidsoap playability test
2013-01-03 11:48:00 -05:00
77da642996
-fix missing import
2013-01-02 17:49:06 -05:00
2589b133d9
CC-4343: Unflushed events loop in media monitor
...
-fixed
2013-01-02 16:58:24 -05:00
b9d829a33c
CC-4754: Replay gain modifier
...
-make pypo repush song if its replay_gain changed
2012-12-28 13:58:55 -05:00
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
fc09e8cd74
Merge branch '2.2.x' into 2.2.x-saas
2012-12-03 17:08:49 -05:00
735ad30483
CC-4726: Sometimes mm doesn't start after a fresh install
...
-fixed
2012-12-03 16:56:11 -05:00
e3761bd8d6
-make sure lsof works for files with spaces
2012-12-03 16:33:24 -05:00
b2699fa914
merge from devel
2012-12-03 11:06:56 -05:00
4983721565
Merge branch '2.2.x' into 2.2.x-saas
...
Conflicts:
airtime_mvc/application/forms/LiveStreamingPreferences.php
2012-11-28 16:10:33 -05:00
7249e36081
-2.2.1 upgrade scripts
2012-11-27 12:13:16 -05:00
735640d40b
Merge branch 'lsof_quote_fix' of https://github.com/rgrinberg/Airtime into devel
2012-11-23 16:18:23 -05:00
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
8d3024d42e
api_client fix
2012-11-22 15:59:37 -05:00
da6013b523
CC-4717: Lintian warnings from devel branch
...
- fixed
2012-11-22 15:14:55 -05:00
612ac415d2
cc-4708: cue points not working
...
-fixed
2012-11-22 12:24:59 -05:00
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
8cc162f7a9
CC-4716: Cannot hear fade in & fade out
...
- fixed
2012-11-21 17:34:07 -05:00
1f5a5fd294
typo
2012-11-21 17:24:31 -05:00
0e91188939
made a unique toucher file
2012-11-21 17:22:32 -05:00
8c97995c2f
Added vulnerability where strings would not be escaped when pass to shell command
2012-11-21 12:55:57 -05:00
8aa11f7e8c
Better error message for api client constructor
2012-11-21 12:26:37 -05:00
ac6a5a11bf
docstring fixes
2012-11-20 16:41:45 -05:00
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
95e757a52c
removed file mediator because it seems to be useless and incompatible with saas
2012-11-20 14:44:24 -05:00
58d888a59f
Small refactoring to let user be assignable from any class that inherits from HasUser
2012-11-20 14:43:48 -05:00
58662b42be
fixed typo missing self
2012-11-20 12:11:31 -05:00
fed39077c0
Merge branch '2.2.x' into devel
2012-11-20 11:21:29 -05:00
c1959f936e
added TODO + formatting
2012-11-19 20:16:06 -05:00
fdf8c9fb4e
refactored EventRegistry to play nice with saas.
2012-11-19 20:13:19 -05:00
ebca3fa9f5
refactored file mediator to play nice with saas
2012-11-19 20:13:00 -05:00
8696571b02
refactor owner to be saas friendly
2012-11-19 19:57:33 -05:00
a28c9d9e27
added untracked configs
2012-11-19 16:46:47 -05:00
a995129df5
added general getsig routine to get the correct signals from anywhere in the code.
2012-11-19 16:07:40 -05:00
4acb7d92db
removed hardcoded signals in the code.
2012-11-19 16:07:26 -05:00
6101e9dfe3
fixed bug where only part of the path was joined.
2012-11-19 16:06:36 -05:00
e46da35d3b
made root path a variable to remove duplication.
2012-11-19 16:06:19 -05:00
cd7d292aa5
fixed faulty regex.
2012-11-19 16:05:52 -05:00
9d04204389
fixed bug where path was only relative.
2012-11-19 16:05:26 -05:00
8dd0d80f68
fixed typo that was causing bug
2012-11-19 16:04:43 -05:00
dc8315fef9
added more detailed output when launching baby mm
2012-11-19 16:04:22 -05:00
d595d1112f
added routine to verify config exists in "baby" media monitor"
2012-11-19 16:03:58 -05:00
647832b0a0
added comments to document config options
2012-11-19 16:03:25 -05:00
c784df7f6e
Added comments describing config options
2012-11-19 11:35:37 -05:00
1cbe2fb1a1
typo
2012-11-16 12:59:17 -05:00
57b2762e5c
cleaned up imports
2012-11-16 12:51:23 -05:00
bc9f7c4c95
removed hardcoding of path received from MM for SaaS.
2012-11-16 12:51:07 -05:00
cf6e1d66ee
removed direct usage of api client to AirtimeDB which encapsulates that behaviour
2012-11-16 12:36:58 -05:00
11214d754d
docstring formatting
2012-11-16 12:31:10 -05:00
e22162cc87
added initialization message
2012-11-16 12:29:06 -05:00
aeb449ea76
import formatting
2012-11-16 11:15:49 -05:00
a50995cd9b
formatting + clearer name.
2012-11-16 11:14:31 -05:00
cc66ac4a83
typo
2012-11-16 11:14:18 -05:00
7527b366d0
removed instance specific logging
2012-11-16 00:10:40 -05:00
757a561975
added missing import
2012-11-16 00:10:24 -05:00
26ad6dae74
Added a convenience constructor for an AirtimeInstance
2012-11-16 00:09:56 -05:00
e12e311537
Added some routines to baby mm.
2012-11-16 00:09:33 -05:00
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
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
8c73731c41
CC-4633: Use David's new method of Liquidsoap webstream switching
...
-fixed
2012-11-15 16:43:22 -05:00
88231a19c3
added baby mm launcher
2012-11-15 15:08:49 -05:00
9c74b0ea2c
removed bastard injection from AirtimeApiClient
2012-11-15 15:08:18 -05:00
350c6e2f94
moved logging logic to launcher
2012-11-15 15:02:26 -05:00
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
c43dbe42a8
refactored creating an instance into its own function
2012-11-15 14:27:09 -05:00
975508a549
added TODO
2012-11-15 14:24:17 -05:00
57b13607c5
removed crap hacks
2012-11-15 14:22:42 -05:00
2010778876
cleanup redundant code, remove whitespace
2012-11-15 13:33:27 -05:00
0b0e96f49c
removed old runner code
2012-11-15 12:46:57 -05:00
8a7535774c
fixed import typo
2012-11-15 12:13:52 -05:00
4ac3efe228
renamed typo log to logger.
2012-11-15 12:13:33 -05:00
5073ced732
Made timeout watcher provide AirtimeInstnace
2012-11-15 12:12:47 -05:00
fa66f33ffa
changed RequestSync to use injected apc and injected it in ThreadedRequestedSync.
2012-11-15 12:12:19 -05:00
15f4212360
make ManagerTimeout provide the correct AirtimeInstance object.
2012-11-15 12:11:48 -05:00
ab35263869
inject apc properly into AirtimeNotifier
2012-11-15 12:11:18 -05:00
7ed1f08e07
Added new launch script for mm.
2012-11-15 12:10:52 -05:00
ce4dbf0028
added launcher that should replace most of mm2.py
2012-11-14 22:06:09 -05:00
dd139e5028
added default value for exception class parameter
2012-11-14 16:50:34 -05:00
fcfa5cceee
removed useless comment
2012-11-14 14:49:28 -05:00
2e59eca131
moved files to pypo dir
2012-11-14 14:43:33 -05:00
d5cacf4011
moved replay gain to pypo for better saas performance
2012-11-14 14:43:10 -05:00
f1effc37a9
removed dependency of mm from replaygain
2012-11-14 11:51:00 -05:00
93ff2ce9f6
removed extra import
2012-11-13 17:32:42 -05:00
6f42291f8a
merge api client conflict
2012-11-13 17:21:48 -05:00
dfede98b82
Merge branch '2.2.x-saas' of dev.sourcefabric.org:airtime into 2.2.x-saas
...
Conflicts:
airtime_mvc/application/models/Schedule.php
2012-11-12 17:46:22 -05:00
a0a9fc71f1
disable unlimited attempts for pushing stats data
2012-11-12 17:44:26 -05:00
350d5dd620
refactored logging setup when mm is setup
2012-11-10 09:24:26 -05:00
6145f9bcad
Merge branch '2.2.x' into devel
2012-11-08 17:28:23 -05:00
f657ee4f20
Merge branch '2.2.x' into 2.2.x-saas
2012-11-08 17:27:51 -05:00
33b2520c14
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-08 17:27:28 -05:00
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
eaf0baa6b6
removed useless code
2012-11-07 23:22:25 -05:00
c222ac10f7
typo
2012-11-07 23:21:48 -05:00
55f0462946
removed useless line of code
2012-11-07 23:21:08 -05:00
ed00089a1a
added user level method to get current user of thread
2012-11-07 22:53:39 -05:00
7e5ec6505b
added tests for instance
2012-11-07 18:16:48 -05:00
13f59be21d
typo
2012-11-07 18:16:33 -05:00
9e7b8a6b28
added tests
2012-11-07 17:45:08 -05:00
882a515caa
refactored threads which know the user they belong to
2012-11-07 17:44:55 -05:00
ed7aba83bf
Merge branch 'cc-4661-listener-statistics' into 2.2.x-saas
2012-11-07 17:22:36 -05:00
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
bb8f5e107c
CC-4661: Listener Statistics
...
-ability to gather stats without
admin password
2012-11-07 17:19:47 -05:00
debc5b6081
Merge remote-tracking branch 'sf/devel' into mm_refactor_for_saas
2012-11-07 12:19:35 -05:00
073d243007
-airtime couldn't connect to liquidsoap
2012-11-07 12:18:10 -05:00
cd6c305b81
Merge remote-tracking branch 'sf/devel' into mm_refactor_for_saas
2012-11-07 12:05:37 -05:00
4200059200
-airtime_version fix
2012-11-07 11:43:49 -05:00
110008e909
added saas shit
2012-11-07 11:29:39 -05:00
af51ddca79
Merge remote-tracking branch 'sf/devel' into mm_refactor_for_saas
2012-11-07 11:29:17 -05:00
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
272e428fa7
Merge branch '2.2.x' into 2.2.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/forms/EmailServerPreferences.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/forms/LiveStreamingPreferences.php
airtime_mvc/application/forms/Preferences.php
airtime_mvc/application/forms/SupportSettings.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/application/views/scripts/menu.phtml
airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
2012-11-06 17:23:32 -05:00
b3c9472bcb
cc-4672: added dirty workaround to fix this issue
2012-11-06 16:16:37 -05:00
3f7d8a0c7f
Merge branch '2.2.x' into 2.2.x-saas
2012-11-06 16:11:51 -05:00
1762e418c0
added better logging
2012-11-06 14:57:53 -05:00
b4555e9845
docstring formatting
2012-11-06 13:51:04 -05:00
66138c4baf
removed references to gevent
2012-11-05 16:11:35 -05:00
6392c69e27
Removed unused code
2012-11-05 16:10:59 -05:00
a851d8dd74
docstring format
2012-11-05 16:04:39 -05:00
83d4705bca
removed useless comments
2012-11-05 14:19:37 -05:00
3509cfc212
formatting
2012-11-05 14:03:46 -05:00
c287e11bee
moved setting up unicde into it's own routine
2012-11-05 14:02:55 -05:00
ce313a5b22
docstring formatting
2012-11-05 13:29:10 -05:00
f6ee2afb88
CC-4665: ReplayGain does not work for FLAC files
...
-fixed
2012-11-05 12:03:25 -05:00
fffaf7788a
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-05 11:53:52 -05:00
af7e94a44d
don't break 80 character line limit
2012-11-05 11:53:37 -05:00
d89166e2ff
CC-4665: ReplayGain does not work for FLAC files
...
-fixed
2012-11-05 11:53:20 -05:00
34d0ee5954
CC-4661: Listener Statistics
...
-add mount point names
2012-11-02 18:04:32 -04:00
5bd0fe0300
clean up source file tailing whitespace
2012-11-02 17:51:02 -04:00
6438b54a5f
CC-4661: Listener Statistics
...
-backend part working
2012-11-02 17:50:43 -04:00
dfc3cf9267
removed useless tests
2012-11-02 15:05:08 -04:00
c79b28aa90
Removed gevent from pybundle
2012-11-02 15:03:27 -04:00
899c62d31f
removed gevent from requirements
2012-11-02 15:01:11 -04:00
aec11feba5
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-11-02 14:59:02 -04:00
a1d5037e04
cc-4584: fixxxed
2012-11-02 12:42:24 -04:00
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
e9524c8615
Merge remote-tracking branch 'rudi/cc-4652' into 2.2.x
2012-11-02 11:30:04 -04:00
b746f65304
CC-4601: Do not rewrite metadata for master source and show source streams.
...
- fixed
2012-11-01 17:24:41 -04:00
bf363dcdde
cc-4652: Added code to create the stor/ structure before adding any watched
2012-11-01 15:48:26 -04:00
176f2c45ba
Added information message when media monitor is restarted
2012-11-01 15:42:58 -04:00
c0dc38be62
cc-4652: added logging for when watch fails on startup
2012-11-01 15:16:23 -04:00
7c710fd84e
Removed unused method
2012-10-31 12:48:11 -04:00
11043d2eba
Refactored notify_webstream_data
2012-10-31 12:46:51 -04:00
83211698a4
Added retrying mechanism to ApiRequest
2012-10-31 12:20:00 -04:00
4ef38cbc91
Added retry mechanism
2012-10-31 11:45:22 -04:00
474f5aba48
Added hack for the response type not being set
2012-10-31 11:33:42 -04:00
18d6cd7868
removed commented code
2012-10-31 11:22:04 -04:00
cf27c18df7
Refactored update_replay_gain_values
2012-10-31 11:01:24 -04:00
e3914c429d
refactored get_stream_setting
2012-10-31 10:56:52 -04:00
82a8fe99ae
Refactored docstring
2012-10-31 10:54:02 -04:00
162028ee8a
Unused method removed
2012-10-31 10:52:14 -04:00
24088d63e0
Formatting
2012-10-31 10:48:14 -04:00
8e6f6b8894
formatted comment. added TODO
2012-10-31 10:48:03 -04:00
09c3e3a694
Refactored get_schedule not to suck
2012-10-31 10:47:08 -04:00
9cea6210bb
refactored __get_airtime_version
2012-10-31 10:45:36 -04:00
91ce35ee9a
added todo
2012-10-31 10:43:59 -04:00
75ce5b205d
Fixed setup_media_monitor
2012-10-30 17:48:24 -04:00
3ed762bc38
check_live_stream_auth fixed
2012-10-30 17:47:09 -04:00
4ad1468313
refactored get_shows_to_record
2012-10-30 17:45:22 -04:00
d6f644d53f
Removed unused method
2012-10-30 17:44:27 -04:00
e85996d814
Removed unused method
2012-10-30 17:43:11 -04:00
8f82e2623c
Removed unused method
2012-10-30 17:42:52 -04:00
d482933b1a
notify_liquidsoap_started refactored
2012-10-30 17:41:53 -04:00
1d325949e7
notify_media_item_start_playing uses RequestProvider
2012-10-30 17:40:53 -04:00
3b8181062c
pointless refactoring of stuff that's never used
2012-10-30 17:35:10 -04:00
c7e1902aa2
removed unnecessary json parse
2012-10-30 17:18:06 -04:00
41839ed872
Fixed list_all_db_files to use RequestProvider
2012-10-30 17:17:02 -04:00
de72067e90
Fixed typo calling get_files_without_replay_gain
2012-10-30 17:02:33 -04:00
722a3e6e5d
Fixed register_component to use RequestProvider
2012-10-30 16:50:38 -04:00
81074f9c44
changed notify_source_status to use RequestProvider
2012-10-30 16:42:00 -04:00
f8b5f1dce6
update_file_system_mount is removed because it's not used
2012-10-30 16:31:14 -04:00
81bfbe9e7e
get_boostrap_info and get_files_without_replay_gain_value use RequestProvider
2012-10-30 16:29:37 -04:00
830a8b6fa5
removed watched_dir_missing
2012-10-30 16:24:20 -04:00
671d784204
Changed set_storage_dir to use RequestProvider
2012-10-30 16:23:35 -04:00
efc15e4d88
Changed remove_watched_dir to use RequestProvider
2012-10-30 16:22:34 -04:00
08242336a0
Changed list_all_watched_dirs and add_watched_dirs to use RequestProvider
2012-10-30 16:21:18 -04:00
4b526fe454
Fixed bug where post data is None
2012-10-30 16:16:02 -04:00
959cb11bec
Removed old code in send_media_monitor_requests
2012-10-30 16:11:08 -04:00
5a8f51fc26
Fixed urlencode in ApiRequest
2012-10-30 16:08:52 -04:00
83f5c9a3ce
Fixed typo
2012-10-30 16:03:33 -04:00
013346056e
Changed send_media_monitor_requests to use RequestProvider
2012-10-30 15:48:24 -04:00
845db6a3cc
Added TODO
2012-10-30 15:45:41 -04:00
24dce45a06
Added support for post data and updated test
2012-10-30 15:45:10 -04:00
b751482183
Formatting
2012-10-30 15:36:39 -04:00
59c55ae27f
Updated api client to do automatic json parsing. Updated tests to reflect that as well
2012-10-30 15:19:51 -04:00
3e60ac4393
remove \r line endings
2012-10-30 13:23:09 -04:00
232bbd2bb7
Added tests for the requestprovider class
2012-10-30 00:29:52 -04:00
a6417439af
Fixed a few simple bugs
2012-10-30 00:29:35 -04:00
a71bebc35b
Fixed typo in RequestProvider definition
2012-10-29 23:38:33 -04:00
a33a1e6e2a
Added more testing for ApiRequest using mocks
2012-10-29 23:34:26 -04:00
ccb4925779
Added tests for ApiRequest
2012-10-29 22:44:45 -04:00
593542b5ed
Fixed ApiRequest typo (def -> class)
2012-10-29 22:44:29 -04:00
fb59e78fda
Added tests for ApcUrl class
2012-10-29 22:19:35 -04:00
5ab3ba221d
Fixed bug in params method returning after first iteration in loop
2012-10-29 22:19:16 -04:00
5a1f405993
formatting
2012-10-29 19:53:06 -04:00
c9ce288a65
Beginning of api client refactor
2012-10-29 19:01:48 -04:00
b5bad594bf
Wrapping + initial ApiClient
2012-10-29 17:46:47 -04:00
0b71c913a9
Added TODO and removed line of code that assigned to unused variables
2012-10-29 17:25:53 -04:00
0d78a825e0
Formatting
2012-10-29 17:20:56 -04:00
5f0fd0ef09
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-29 16:29:20 -04:00
e40d49219b
add missing gstreamer.liq file
2012-10-29 16:29:10 -04:00
2556f3ba30
added error handling on the caller of replaygain instead of in api client
2012-10-29 14:57:43 -04:00
18d8e24a56
Formatting
2012-10-29 14:40:24 -04:00
a3be821f3f
Added Url class for making Api Client requests
2012-10-29 12:30:53 -04:00
dc00528cd5
Merged baseUrl related conflicts
2012-10-29 11:56:20 -04:00
bf5bc3a116
Changed APC to new-style classes
2012-10-29 11:43:39 -04:00
3cec987d10
Added todo
2012-10-29 11:42:24 -04:00
31a7b8f943
Removed usesless try catch from send_media_monitor_requests.
2012-10-29 11:40:41 -04:00
3b51c93766
Refactored pyponotify. Removed code duplication and made runner reusable by other scripts.
2012-10-29 11:25:05 -04:00
5ab183e01e
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-26 18:23:36 -04:00
0a396378e5
cc-4635: Fix
2012-10-26 17:15:28 -04:00
c4f0491ff6
cc-4635: Fix
2012-10-26 17:04:42 -04:00
72928bb5e6
cc-4635: Fix
2012-10-26 16:59:32 -04:00
e10f81aec8
cc-4635: Fix
2012-10-26 16:48:03 -04:00
7cd8541696
cc-4635: Fix
2012-10-26 16:41:29 -04:00
7c48683492
cc-4635: Fix
2012-10-26 16:02:32 -04:00
b8a5c6ce95
cc-4634: Fixed
2012-10-26 15:44:58 -04:00
0135fbe9dd
Fixed code formatting
2012-10-26 13:10:09 -04:00
10a6a4d541
formatted docstrings. fixed decorator with functools
2012-10-26 13:10:09 -04:00
2e54fd64d3
Formatted more docstrings
2012-10-26 13:10:09 -04:00
0f1e843017
Formatted docstring
2012-10-26 13:10:09 -04:00
b2650b9a21
Added comment
2012-10-26 13:10:08 -04:00
41b1b357eb
formatted more docstrings
2012-10-26 13:10:08 -04:00
cccbfa2c34
Formatted docstrings
2012-10-26 13:10:08 -04:00
5ed86e2666
added docstring for wave duration
2012-10-26 13:10:08 -04:00
958b489fca
formatted comments and removed unused function
2012-10-26 13:10:08 -04:00
a0f83c4db0
removed big unused method
2012-10-26 13:10:08 -04:00
a42210e321
added comment for destructor
2012-10-26 13:10:08 -04:00
fb28c3a6c5
Formatting
2012-10-26 13:10:08 -04:00
212e3bd30e
created a module for requests (refactorings)
2012-10-26 13:10:08 -04:00
0422127689
Added unit tests for requestsync
2012-10-26 13:10:08 -04:00
38cbd7d7e4
added emf unit tests
2012-10-26 13:10:08 -04:00
a6ab91333f
formatting
2012-10-26 13:10:08 -04:00
289d5575ec
Cleaned the shit out of RequestSync. Removed old comments and useless code
2012-10-26 13:10:08 -04:00
86b262ed8f
uncoupled threading from making a request
2012-10-26 13:10:08 -04:00
f718070d3c
Uncoupled the api_client instance from the RequestSync object
2012-10-26 13:10:08 -04:00
9169893e4d
Alignment of method definitions
2012-10-26 13:10:08 -04:00
29c96d2efe
Removed md5 related test
2012-10-26 13:10:08 -04:00
1359bb402e
Removed useless comment
2012-10-26 13:10:08 -04:00
54e6bec16a
Reshuffled/removed some unit tests to get rid of omf
2012-10-26 13:10:08 -04:00
f81f671292
Removed unused method
2012-10-26 13:10:08 -04:00
66b5bf304f
changed test strings
2012-10-26 13:10:08 -04:00
6a8d902a61
Removed omf
2012-10-26 13:10:08 -04:00
9a1948707c
Removed duplicate code
2012-10-26 13:10:08 -04:00
0638d21473
Refactored code
2012-10-26 13:10:08 -04:00
7255241e6c
Removed old commented code
2012-10-26 13:10:08 -04:00
5a593112b3
Use emf instead of omf
2012-10-26 13:10:08 -04:00
ff8969efb9
Improved handling for paths and added tests for it
2012-10-26 13:10:08 -04:00
cefc5c99d9
Added special handling for title in emf
2012-10-26 13:10:08 -04:00
d00c74fdbe
Renamed test
2012-10-26 13:10:08 -04:00
482e2475ca
cleaned up test
2012-10-26 13:10:08 -04:00
7db61cc4b4
fixed tests
2012-10-26 13:10:07 -04:00
591d2d741f
Added original path element in metadata
2012-10-26 13:10:07 -04:00
027153b882
Fixed emf handling of bad definitions
2012-10-26 13:10:07 -04:00
09a8dfefc1
Fixed metadata definitions in emf
2012-10-26 13:10:07 -04:00
4242ed38be
Added more testing for emf
2012-10-26 13:10:07 -04:00
445ec23b8e
Added utility method for reading mutagen info through emf.
2012-10-26 13:10:07 -04:00
a2792b01ac
Got rid of emf bug where a list of 0 elements might be accessed.
2012-10-26 13:10:07 -04:00
4bbc1fa95b
Added comparison for emf and non emf metadata values.
2012-10-26 13:10:07 -04:00
31b2a29392
Added docstirng for __slice_deps
2012-10-26 13:10:07 -04:00
55567d1de0
Aded diff_dict function to help locate differences between emf and old metadata parsing.
2012-10-26 13:10:07 -04:00
b7b11feae0
emf improvements
2012-10-26 13:10:07 -04:00
10c4a71866
Added default translator for mdata elements that don't specify it
2012-10-26 13:10:07 -04:00
a88b7255ff
removed automatic loading of emf definitions
2012-10-26 13:10:07 -04:00
cad6a7e7b0
added perliminary stuff for emf
2012-10-26 13:10:07 -04:00
e285bcfba1
update liquidsoap library scripts
...
-git commit hash f776e7f4c5d3729cbcf863381f3cadd96c578a5b
2012-10-26 12:54:10 -04:00
6500c3312d
Merge branch '2.2.x'
...
Conflicts:
install_minimal/airtime-install
python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
2012-10-26 00:31:12 -04:00
63e48d73bd
easier maintenance of pypo containers on SaaS
2012-10-26 00:03:34 -04:00
3dd5b2869d
Added lsof to check if file is locked
2012-10-25 18:38:15 -04:00
5b051aae32
changed throttling
2012-10-25 17:20:02 -04:00
b89862f304
tweaked throttling
2012-10-25 16:34:00 -04:00
9811c67019
more throttling
2012-10-25 16:10:33 -04:00
f21c26677b
added throttling
2012-10-25 16:04:12 -04:00
795ffbbf63
CC-2236: Overbooked shows do not respect default fade time
...
-move map_metadata after crossfade function
2012-10-22 16:36:57 -04:00
780a05c2aa
CC-2236: Overbooked shows do not respect default fade time
...
-once a release we manage to break fades :) fixed.
2012-10-22 16:23:33 -04:00
d9932dc542
Removed gevent
2012-10-22 15:05:38 -04:00
32ce685e0e
gevent ain't working so it's cut
2012-10-22 12:52:47 -04:00
75ba2d8e90
Added gevent magic.
2012-10-22 12:14:36 -04:00
b59d71aa4f
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-19 16:49:11 -04:00
ef78cefcd9
CC-4487: Webstream could not be heard unless you restart playout as well
...
-cleanup of unused variables
2012-10-19 16:49:01 -04:00
2bab46a12e
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-19 16:40:49 -04:00
58535bef88
CC-4580: No contents in rebroadcast show
...
- fixed
2012-10-19 16:40:32 -04:00
bd5fef0bcd
CC-4487: Webstream could not be heard unless you restart playout as well
...
-fixed
2012-10-19 16:29:31 -04:00
9dfee6aa68
CC-4564: Webstream: Book same webstream twice in Scheduler, the 2nd one doesn't get played
...
-fixed
2012-10-19 15:39:45 -04:00
1d4b905572
CC-4564: Webstream Book same webstream twice in Scheduler, the 2nd one doesn't get played
...
-small syntax error in last commit
2012-10-19 15:18:48 -04:00
77b430ce01
CC-4564: Webstream Book same webstream twice in Scheduler, the 2nd one doesn't get played
...
-fixed
2012-10-19 15:14:52 -04:00
7d8079f770
Merge branch '2.2.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ShowbuilderController.php
airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
airtime_mvc/public/js/airtime/common/common.js
2012-10-19 12:50:36 -04:00
d32495d100
CC-2184: Hardcoded CSS path should be relative path instead
2012-10-19 11:09:34 -04:00
893f9509fa
cc-4556: fixed
2012-10-16 18:35:56 -04:00
df54a75d5d
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-16 12:20:13 -04:00
a929561088
CC-4565: Pypopush: Error happens when trying to insert a song right behind a Webstream as well as that Webstream is just finished
...
-make sure we don't return a negative when calculating interval
seconds
2012-10-16 11:59:37 -04:00
b4cf857ce5
remove cluttering comments
2012-10-09 12:09:44 -04:00
286e62ffdd
typo in comment
2012-10-09 12:09:22 -04:00
a91c166332
Fixed failing unit tests
2012-10-09 12:08:49 -04:00
b41c03902e
cc-4518: fixed
2012-10-02 14:43:17 -04:00
4d9fbaf216
Formatted code better and added TODO
2012-10-02 13:30:37 -04:00
30c95f3e9d
Removed duplication of truncate_to_length routine
2012-10-02 13:30:02 -04:00
396e857035
removed profanity
2012-10-02 10:59:54 -04:00
d72a8e9686
Cleaned up interval handling in ManagerTimeout and left a TODO pointing at further work
2012-10-02 10:34:15 -04:00
f7daf4e737
Added docstring
2012-10-02 10:32:10 -04:00
672102da6f
Cleaned up logging
2012-10-02 10:30:18 -04:00
48f3b18acd
removed wrong comments
2012-10-02 10:25:51 -04:00
b8d15d9d6b
Removed more unused code
2012-10-02 10:24:19 -04:00
23635f00f7
removed bad metadata handling
2012-10-01 11:32:42 -04:00
4aae1153b9
Added todo to remove methods later
2012-10-01 10:48:32 -04:00
ad2be45ff6
removed dead code
2012-10-01 09:45:47 -04:00
e6c7b114e5
Removed unused set of unittests
2012-09-20 12:50:35 -04:00
b920b63787
removed unneeded file
2012-09-20 12:38:14 -04:00
9f24b72d0e
Added some emf elements
2012-09-19 15:44:16 -04:00
a6f1d4b7ec
Completely reworked event contractor
2012-09-19 12:47:11 -04:00
be302d70c2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 17:23:56 -04:00
bb00659687
cc-4483: Fixed raising exceptions before writing
2012-09-18 17:23:47 -04:00
b69f3288d3
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 17:22:22 -04:00
6420e6a830
remove trailing whitespace
2012-09-18 17:22:14 -04:00
8787a72195
-ensure stream metadata formatting is correct
2012-09-18 17:21:57 -04:00
083bee38fd
cc-4483: Fixed import
2012-09-18 17:14:25 -04:00
a20dc7dc96
cc-4493: Cleaned up handling of metadata specific to filetypes.
2012-09-18 17:09:12 -04:00
539cc9e11d
added comments
2012-09-18 16:10:55 -04:00
da11dc077e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-18 15:27:35 -04:00
4c58c4c9a9
CC-4473: On Air button greys out when one out of two same Webstreams is cancelled
...
-fixed
2012-09-18 15:27:27 -04:00
66aee1a01b
Added TODO
2012-09-18 15:13:39 -04:00
81887b291a
cc-4129: Changed unused organization to label
2012-09-18 11:39:28 -04:00
c0f3395a61
CC-4404: restart airtime-liquidsoap will interrupt the output stream and never resume until restart playout engine
...
-fixed
2012-09-14 19:01:21 -04:00
be80eeb5fd
CC-4404: restart airtime-liquidsoap will interrupt the output stream and never resume until restart playout engine
...
-fixed
2012-09-14 18:20:46 -04:00
b61abe2474
Hard coded mime for wav
2012-09-14 16:19:34 -04:00
d0d9c5ecfc
Refactored hack
2012-09-14 14:39:37 -04:00
40bd5a0989
Changed xxx-owner_id.mp3 to owner_id/xxx.mp3
2012-09-14 14:27:04 -04:00
6c759ea06c
Fixed a few typos
2012-09-14 12:57:32 -04:00
8a0c91fd44
Added moronic hack to barely support multi user file storage
2012-09-14 12:45:45 -04:00
53ec408249
Removed code duplication
2012-09-14 11:48:34 -04:00
7a46bdc4a2
Removed old comments
2012-09-14 11:23:21 -04:00
240881b8b4
Added TODO to shank md5 in code
2012-09-14 11:21:53 -04:00
96f693687b
cc-4426
2012-09-13 17:59:13 -04:00
6c75a086e1
cc-4421: Added for wav length
2012-09-13 17:47:04 -04:00
12e27e659a
Extracted read_wave_duration out of code
2012-09-13 17:03:05 -04:00
7586aa37f3
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 16:28:54 -04:00
8e0f003309
Formatting
2012-09-13 16:28:38 -04:00
4349dbe4fd
Added special handling for wav
2012-09-13 16:26:31 -04:00
d534f22ce4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 16:11:15 -04:00
da72c00f28
CC-4370: Transitioning between two webstreams: a hiccup in the stream is audible
...
-fixed
2012-09-13 16:10:17 -04:00
251e0f054a
Typo
2012-09-13 15:48:36 -04:00
1e76b6c751
Fixed typo
2012-09-13 15:45:30 -04:00
9eaa052744
FakeMutagen inherits from dict
2012-09-13 15:38:30 -04:00
05f4bb64b2
cc-4421: Created a fake mutagen object for files that mutagen does not recognize
2012-09-13 15:05:36 -04:00
8d08aa888b
cc-4421: Added special handling for files that mutagen returns None for.
2012-09-13 14:54:52 -04:00
a832ad61dc
Fixed bug where path would not be normpathed
2012-09-13 11:38:40 -04:00
e2f8d8e0e7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-13 11:10:43 -04:00
50f723fa7a
CC-4416: Error with AAC files and Replaygain
...
-fixed
2012-09-13 11:06:44 -04:00
52882ef938
Added mp4 removed aac.
2012-09-13 10:35:13 -04:00
8e91c515f0
cc-4397: Fixed handling for bad metadata.
2012-09-12 17:26:37 -04:00
92532cb708
cc-4394: Added m4a
2012-09-12 14:54:11 -04:00
03d3dc8312
Added good debugging for removed_watch_directory
2012-09-11 17:03:49 -04:00
b0a7f60b10
Fixed typo
2012-09-11 16:29:45 -04:00
355b0ad35d
cc-4292: Initial fix of the MD5 issue. Now MD5's are only collected not really used for anything. Moves are handled completely
...
through paths.
2012-09-11 16:02:39 -04:00
458089a773
cc-4359: Fixed without breaking anything else. Reverted bootrsrapping to default operation except for media monitor restart which uses a
...
special bootstrap that respects file_exists settings.
2012-09-11 11:19:44 -04:00
7cba85ea05
cc-4359: Fixed without breaking other problems.
2012-09-10 18:27:52 -04:00
160b28af5d
Added flag for two different list_all_db_files requests.
2012-09-10 17:42:59 -04:00
0dab4fa231
cc-4388: Fixed.
2012-09-10 17:40:03 -04:00
3fc60c741d
MM2: Normalize directory paths received from airtime once and for all.
2012-09-10 17:39:43 -04:00
fdc7245a15
Removed translation of dashes to slashes.
2012-09-10 16:30:18 -04:00
4fe8407659
Adde configurable value for list_all_files
2012-09-10 16:29:17 -04:00
c4f486e539
MM2: More detailed logging.
2012-09-10 16:08:33 -04:00
e85ea5c683
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 15:35:42 -04:00
3107286799
CC-4370: Transitioning between two webstreams a hiccup in the stream is audible
2012-09-10 15:35:32 -04:00
259a3eb792
cc-4359: normpath'd music dir before passing it to manager.py to remove
...
watch
2012-09-10 14:51:29 -04:00
b085f9ef67
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 14:15:07 -04:00
8d7a3a2042
removed unused code
2012-09-10 12:46:41 -04:00
e5de4f560d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 12:18:41 -04:00
ac8610ca06
CC-4385: Problem with mono streams for stream rebroadcasting
...
-fixed
2012-09-10 12:18:19 -04:00
a479a11c8f
Removed crazy handling of flac.
2012-09-07 18:23:14 -04:00
d20c450226
CC-4370: Transitioning between two webstreams a hiccup in the stream is audible
...
-some major refactoring before fixing this problem
2012-09-07 17:38:24 -04:00
989f040603
CC-4371: input.harbor for rebroadcasting webstreams has hardcoded password.
...
-fixed
2012-09-07 11:41:20 -04:00
8a5333fa7f
Removed supported for files that mutagen cannot read
2012-09-05 16:09:29 -04:00
0798d67b2d
cc-4350: Possible fix.
2012-09-05 16:04:59 -04:00
272840eb5a
Added logging for liquidsoap run command.
2012-09-05 16:04:28 -04:00
4fdf3c1b77
MM2: Removed assertion in favor of warning.
2012-09-05 16:04:11 -04:00
0538023e39
MM2: Removed python 2.7 style dictionary comprehnsions for backward compatibility
2012-09-05 15:27:23 -04:00
131fd2cce4
sexification of docstring
2012-09-05 11:56:31 -04:00
71d4462272
MM2: removed redundant kbps in filename
2012-09-05 11:15:31 -04:00
7d010e1e28
cc-4241: Changed date to time in filename for recorded shows
2012-09-05 11:06:33 -04:00
f4848a8306
cc-4241: Tweaked metadata handling again
2012-09-05 10:59:56 -04:00
d12833a71e
Pypo debugging
2012-09-05 10:36:32 -04:00
6c52a229b9
mm2: added back metadata handling. Added new "Enterprise Metadata
...
Framework"
2012-09-05 10:32:37 -04:00
ab9fbc48ae
MM2: Added docstrings
2012-09-05 10:24:10 -04:00
5c9d0b7db5
mm2: changed metadata handling
2012-09-05 10:20:10 -04:00
ed368b82c0
Removed unnecessary songs from media monitor.
2012-09-04 17:25:13 -04:00
b08874ad97
Changed pypo recordeder to output title metadata with media monitor compatible output. To avoid extra parsing.
2012-09-04 17:24:29 -04:00
cae2245936
MM2: Cleaned up pure.py a little
2012-09-04 16:52:22 -04:00
446d63a1d7
cc-4343: temporary workaround in action
2012-09-04 09:49:16 -04:00
5609530dfc
MM2: Removed debugging.
2012-09-04 09:35:44 -04:00
6b0b0bd4a4
MM2: Removed useless code.
2012-09-04 09:16:32 -04:00
970708bd23
MM2: Removed dead code path
2012-09-04 09:01:51 -04:00
7135fdbc3d
k
2012-09-04 09:00:11 -04:00
1c425eb17d
cc-4339: removed unnecessary file
2012-09-04 08:55:22 -04:00
b8d9861001
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-31 18:12:18 -04:00
fbea75e680
CC-4335: Timeline: Scheduling multiple webstreams, they can not be playing smoothly
...
-fixed
2012-08-31 18:12:11 -04:00
d54cf1c212
mm2: added some decent debuggin
2012-08-31 18:10:18 -04:00
69ac52973d
Replaygain: added better logging
2012-08-31 17:58:12 -04:00
77e1ecce7d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-31 17:48:58 -04:00
74e4425ead
cc-4329: Fixed this by adding liquid soap playability test from mm1
2012-08-31 17:22:25 -04:00
886888a958
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-31 17:21:48 -04:00
3ed15d565e
CC-4327: Timeline: Cancel a track, the following webscream does not get played
...
-fixed
2012-08-31 17:21:24 -04:00
4de8d32fad
cc-4332: Added nicu before command invocation
2012-08-31 15:50:02 -04:00
434bcf15ab
cc-4329: Fixed this by adding liquid soap playability test from mm1
2012-08-31 14:53:45 -04:00
1aa73c7347
CC-4321: NowPlaying: Cancelling Webstream has no effect and results in OnAir being grayed out
...
-syntax error :/
2012-08-31 12:52:07 -04:00
61537c550e
CC-4321: NowPlaying: Cancelling Webstream has no effect and results in OnAir being grayed out
...
-fix out of bounds error
2012-08-31 12:49:35 -04:00
0ceb0167fe
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-31 12:18:48 -04:00
c043053407
CC-4321: NowPlaying: Cancelling Webstream has no effect and results in OnAir being grayed out
...
-fixed
2012-08-31 12:18:37 -04:00
4ffbbfa164
Update the text sent to the console, since binary is no longer installed here
2012-08-31 14:36:05 +01:00
9318d069be
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-30 16:50:21 -04:00
3571e2c691
cc-1710: switched bwf to wav
2012-08-30 16:50:10 -04:00
f9dca67376
CC-4322: Prevent pypo-notify from hanging if server becomes unresponsive
...
-up timeout to 45 sec
2012-08-30 15:58:05 -04:00
796885594f
CC-4322: Prevent pypo-notify from hanging if server becomes unresponsive
...
-fixed
2012-08-30 15:56:34 -04:00
a56af856b8
CC-4322: Prevent pypo-notify from hanging if server becomes unresponsive
...
-fixed
2012-08-30 15:52:47 -04:00
c201473dbd
CC-4311: On Air button gets greyed out few seconds after show starts
...
-fixed
2012-08-30 12:02:26 -04:00
27dea9cfc1
cc-4241: removed broken code
2012-08-30 11:25:58 -04:00
b735d9c45c
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-29 18:29:18 -04:00
ef7c30b55e
cc-4241: Partially resolved issue. Added tests.
2012-08-29 18:29:01 -04:00
859445c766
CC-3301: Add ability to switch stereo/mono stream in stream settings
...
-fixed
2012-08-29 17:39:24 -04:00
8b5f94fa9f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-29 11:05:14 -04:00
ec4343deb0
CC-4313Make sure any service can re-create its log file if the file is removed
...
-fixed
2012-08-29 11:04:56 -04:00
2536c28a01
MM2: more robust handling of bit rate
2012-08-28 17:51:48 -04:00
416bb5fb2b
MM2: added some docstrings to Manager.py
2012-08-28 17:39:25 -04:00
21bad35c39
cc-4309: possible fix
2012-08-28 17:32:48 -04:00
drigato
Albert Santoni
cliffctwang
cliff.wang
Naomi Aro
Daniel James
cliff.wang
denise
Martin Konecny
James
martin
Martin Konecny
james
Rudi Grinberg
Rudi Grinberg
Martin Konecny