Albert Santoni
0a906ba6ec
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-04-23 17:42:52 -04:00
Albert Santoni
9fdfc0a957
CC-5709: Airtime Analyzer
...
* Catch exceptions related to unpickling the HTTP request queue
2014-04-23 17:42:09 -04:00
Naomi
fe20cc7f63
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
2014-04-23 15:58:39 -04:00
Albert Santoni
2f8461b2a6
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-23 14:58:36 -04:00
Albert Santoni
f2ce77fecb
Remove python-magic
2014-04-23 14:20:48 -04:00
Albert Santoni
d01f5a4ffe
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-22 15:04:17 -04:00
Albert Santoni
d77f107df5
CC-5808: Fixed breakage at shutdown
2014-04-22 15:03:46 -04:00
Albert Santoni
c9411d4301
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-21 17:50:53 -04:00
Albert Santoni
6a86a75cee
CC-5709: Airtime Analyzer
...
* Fixed CC-5799: Incorrect Mime on import
2014-04-21 17:50:10 -04:00
drigato
cd6c4f7ede
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-16 17:24:56 -04:00
Albert Santoni
cdce4ca104
CC-5709: Airtime Analyzer
...
* Fixed the unit tests
* Improved length testing because it seems to fluctuate a bit with
your mutagen version (great, eh?)
2014-04-16 16:42:37 -04:00
Albert Santoni
9a3c88f009
CC-5709: Airtime Analyzer
...
* Explicitly set the locale in upstart conf to avoid UTF-8/unicode
errors from python. Fixes CC-5794.
2014-04-16 15:33:02 -04:00
Albert Santoni
de189f91ec
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-16 13:05:41 -04:00
Albert Santoni
b0670f5f47
CC-5709: Airtime Analyzer
...
* Log tracebacks from child process
2014-04-16 13:05:02 -04:00
Albert Santoni
0431044ee2
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-16 11:11:47 -04:00
Albert Santoni
4d1843ca1f
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-04-16 11:11:24 -04:00
Albert Santoni
f491211167
CC-5709: Airtime Analyzer
...
* Retry HTTP requests (kinda crappy, should find a better design pattern to
solve this) - CC-5775
* Persist failed HTTP requests at shutdown
2014-04-16 11:10:06 -04:00
drigato
8ae172b0bb
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-16 10:55:25 -04:00
drigato
7aba416c3b
Small fix to ftp hook script.
...
Removed space that was getting added to the api key
2014-04-16 10:54:55 -04:00
Albert Santoni
8fb95316f2
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
2014-04-09 15:01:11 -04:00
Albert Santoni
e4af3a5a0e
CC-5709: Airtime Analyzer
...
* Better SIGTERM handling for airtime_analyzer
* Nuke the .identifier files saved by Airtime
2014-04-08 17:28:50 -04:00
Albert Santoni
5948dc41da
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-08 14:29:34 -04:00
Albert Santoni
84ee3d26cb
CC-5709: Airtime Analyzer
...
* Fixed metadata import, whoops
2014-04-08 14:16:07 -04:00
drigato
bbc81be1d3
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-08 12:09:32 -04:00
Albert Santoni
b8b913ff68
CC-5709: Airtime Analyzer
...
* Fixed daemonization stuff for upstart
* Adding missing unit test files
2014-04-07 16:19:44 -04:00
Albert Santoni
e044187aed
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
python_apps/airtime_analyzer/setup.py
2014-04-04 19:48:22 -04:00
Albert Santoni
b02dc45a53
CC-5709: Airtime Analyzer
...
* Fixed airtime_analyzer setup script
2014-04-04 19:46:59 -04:00
Albert Santoni
20b056c9f0
CC-5709: Airtime Analyzer
...
* Added upstart script for starting on bootup
2014-04-04 19:09:46 -04:00
Albert Santoni
b7db432cf6
CC-5709: Airtime Analyzer
...
* Added upstart script for starting on bootup
2014-04-04 19:08:57 -04:00
Albert Santoni
cf492045cc
CC-5709: Airtime Analyzer
...
* A bunch of cleanup and fix for metadata extraction on files mutagen can't read
2014-04-04 12:35:50 -04:00
Albert Santoni
95b369c54d
CC-5709: Airtime Analyzer
...
* Remove awful StoredFile::uploadFile() function
* Massive airtime_analyzer commenting and cleanup
* Cleaned up the upload code
* Temporarily disabled the liquidsoap playability test.
2014-04-03 16:13:26 -04:00
Albert Santoni
0398072d45
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-03 11:35:37 -04:00
Albert Santoni
86b94b970f
CC-5709: Airtime Analyzer
...
* Fix for incorrect length sometimes happening (VBR MP3?)
2014-04-03 11:34:57 -04:00
Albert Santoni
9c0314eaa0
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-02 16:52:01 -04:00
Albert Santoni
2a172afe3e
CC-5709: Even more slightly better exception handling
2014-04-02 16:51:38 -04:00
Albert Santoni
aabb8ec01f
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-02 16:48:04 -04:00
Albert Santoni
f6369c02ee
CC-5709: Airtime Analyzer
...
* Catch bad callback_url
2014-04-02 16:47:24 -04:00
Albert Santoni
a6e80e2789
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-01 12:29:20 -04:00
Albert Santoni
12c16bc120
CC-5709: Airtime Analyzer
...
* Make the airtime_analyzer config path a runtime param
2014-04-01 12:28:40 -04:00
drigato
82958a10ae
CC-5708: proftpd hook for new File API
...
small fix for testing script
2014-03-28 12:26:40 -04:00
drigato
49996a9986
CC-5708: proftpd hook for new File API
...
encased var in {}
2014-03-28 11:15:28 -04:00
drigato
2fdc4291e3
CC-5708: proftpd hook for new File API
...
testing ftp hook script
2014-03-27 16:48:57 -04:00
drigato
cc4e43a8b5
CC-5708: proftpd hook for new File API
...
variable escaping?
2014-03-27 16:48:27 -04:00
Albert Santoni
1c5e2d6205
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/public/index.php
* Reverted some SaaS-only thing Martin did a year ago. Looks benign but
only one way to find out...
2014-03-27 16:38:03 -04:00
drigato
2bc37b9fea
CC-5708: proftpd hook for new File API
...
added handling for if the web server is down
2014-03-27 15:46:42 -04:00
drigato
eb72f25151
CC-5708: proftpd hook for new File API
...
uncomment curl command
2014-03-27 11:11:10 -04:00
drigato
700b28ae38
CC-5708: proftpd hook for new File API
...
removed testing lines
2014-03-27 11:09:18 -04:00
drigato
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
drigato
ead1ec4795
CC-5708: proftpd hook for new File API
2014-03-27 11:05:23 -04:00
Albert Santoni
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
Albert Santoni
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
drigato
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
Albert Santoni
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
Albert Santoni
f8c221a610
CC-5709: Airtime Analyzer
...
* Fixed and updated the unit tests
2014-03-25 14:34:50 -04:00
drigato
3bffb02bc0
CC-5708: proftpd hook for new File API
2014-03-24 18:22:34 -04:00
Albert Santoni
6952902b22
CC-5709: Airtime Analyzer
...
* Unbreak stuff
2014-03-24 16:05:53 -04:00
Albert Santoni
eb37b39406
CC-5709: Airtime Analyzer
...
* Added missing FileMoverAnalyzer file that I forgot to commit
2014-03-24 13:03:20 -04:00
Albert Santoni
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
Albert Santoni
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
Albert Santoni
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
cliffctwang
3c40c6d627
Merge branch '2.5.x' into 2.5.x-saas
2014-03-21 09:46:30 -04:00
cliff.wang
b827321093
cc-5747 Replaygain: doesnt work for aac tracks
2014-03-20 13:02:37 -04:00
Albert Santoni
2a783f3825
Merge branch '2.5.x' into 2.5.x-saas
2014-03-17 15:41:14 -04:00
Albert Santoni
16c56e6aff
CC-5709: Airtime Analyzer
...
* Fixed error in media API authentication
* Improved documentation
2014-03-17 14:43:50 -04:00
Albert Santoni
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
Albert Santoni
259edebadc
CC-5709: Airtime Analyzer
...
* Fixed import of length, MIME type, and bitrate into Airtime
2014-03-13 16:52:11 -04:00
Albert Santoni
c0aee37e37
CC-5709: Airtime Analyzer
...
* Fixed the RabbitMQ setup instructions in the README
2014-03-13 14:38:01 -04:00
Albert Santoni
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
Albert Santoni
f4ea417b83
CC-5709: Airtime Analyzer
...
* Renamed a function in MediaController for clarity
* Updated airtime_analyzer README
2014-03-13 12:12:12 -04:00
Albert Santoni
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
Albert Santoni
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
Albert Santoni
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
Albert Santoni
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
Albert Santoni
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
Albert Santoni
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
Albert Santoni
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
Albert Santoni
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
Albert Santoni
dfc4c2f308
SAAS-387: Hunt playout freezes
...
* Really kill hung pyponotify processes.
2014-02-05 12:20:04 -05:00
Albert Santoni
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
Albert Santoni
c7c2d37b30
Merge branch '2.5.x' into 2.5.x-saas
2014-01-31 13:21:33 -05:00
Albert Santoni
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
Albert Santoni
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
Naomi Aro
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
drigato
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
Naomi
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
Naomi
f91cb39e46
CC-5363 : pushing a file twice, noticeable replaygain switch
2013-10-11 17:05:42 -04:00
Albert Santoni
f34a6d201a
Double the pypo->liquidsoap timeout on second attempt if first attempt failed
2013-10-07 15:39:14 -04:00
Albert Santoni
02101db088
Raise timeout for pypo->liquidsoap communication to improve reliability under load
2013-10-07 15:37:34 -04:00
Naomi
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
Naomi
9f38e5a9c6
CC-5342 : Pypo: Webstream disconnection happens when any changes on Now playing page
2013-09-26 17:03:18 -04:00
Daniel James
58ad52f93f
CC-5328 Fix virtualenv version check for newer distros
2013-09-25 13:03:35 +01:00
Daniel James
577bbf14b6
Remove swear words from source code
2013-09-23 16:16:51 +01:00
Naomi Aro
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
Naomi Aro
60bf334aeb
Merge branch '2.4.x' into 2.4.x-saas
2013-09-02 15:46:25 -04:00
Naomi Aro
71ee72015b
release version updates and changelog edits.
2013-09-01 00:56:47 -04:00
Naomi
186e438ccb
adding upgrades to 2.4.1 for version.
2013-08-28 11:54:34 -04:00
cliff.wang
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
cliff.wang
ceba84d1f7
CC-5308 Liquidsoap input habor will block schedule contents sometime
...
Remove makesafe wrapper
2013-08-22 15:03:25 -04:00
denise
9cbdd06af2
Removed ugly comment
2013-08-12 16:05:44 -04:00
denise
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