drigato
9fe0830dfd
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/LoginController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
2014-08-28 11:59:41 -04:00
drigato
ead4a3c565
Corrected false comment about how pypo fetches the schedule
2014-08-14 12:48:31 -04:00
drigato
e5881f2530
Corrected false comment about how pypo fetches the schedule
2014-08-14 12:29:52 -04:00
drigato
ca62086e16
Removed cloud file deletion from Airtime Analyzer. Deletion is done from PHP now.
2014-08-12 12:59:50 -04:00
drigato
879e776c8d
CC-5888: Handle file deletion if the file is stored in the cloud
2014-08-12 12:32:49 -04:00
drigato
6545828dc7
Removed exiting pypo if error occurs during cloud storage downloads
2014-08-11 12:25:30 -04:00
drigato
dd37ffbdd7
CC-5888: Handle file deletion if the file is stored in the cloud
...
Execute a python script that deletes a file from the cloud
2014-07-31 23:11:49 -04:00
drigato
8c2754972e
CC-5896: Store cloud files in separate table, inherited from cc_files
...
Refactored storedfile->delete()
Added a deletePhysicalFile function to CcFile and CloudFile
Cleaned up schedule events that get passed to Pypo
2014-07-29 15:07:51 -04:00
drigato
ecb072b84c
CC-5896: Store cloud files in separate table, inherited from cc_files
...
Fixed broken metadata display on Library page
Fixed broken download/preview option from Library page
2014-07-28 15:17:46 -04:00
drigato
f1ea100411
CC-5896: Store cloud files in separate table, inherited from cc_files
2014-07-24 16:56:15 -04:00
Albert Santoni
46542d2b2b
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage
2014-07-16 18:09:38 -04:00
Albert Santoni
c09457ce7c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-07-16 15:03:39 -04:00
drigato
3f676be66c
Use a different libcloud function for uploading files
2014-07-16 14:43:55 -04:00
drigato
7ca6b91cdf
CC-5888: Handle file deletion if the file is stored in the cloud
2014-07-16 12:03:22 -04:00
drigato
aaee522ec6
CC-5888: Handle file deletion if the file is stored in the cloud
2014-07-15 17:20:04 -04:00
Albert Santoni
490a9c0d06
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-07-15 16:46:20 -04:00
Albert Santoni
7438ecd2b4
Use track metadata from Airtime in playout engine
...
* Resolves CC-5893: Metadata not updated on Airtime Pro
* Report track metadata in the schedule API, and make pypo pass that
along to Liquidsoap via annotations.
* Move HTTP response sanitization for file metadata out of the REST module and into CcFiles
* Slightly improved the terrible exception handling in pypo
2014-07-15 16:41:55 -04:00
drigato
8e714bcb64
CC-5888: Handle file deletion if the file is stored in the cloud
2014-07-15 07:26:39 -04:00
drigato
039a51121b
CC-5885: Factor out cloud storage code into separate class
2014-07-11 16:16:30 -04:00
drigato
6f119b006f
CC-5884: Modify Pypo -> Download files from cloud storage
2014-07-10 17:58:00 -04:00
drigato
e6bbf8e84c
CC-5884: Modify Pypo -> Download files from cloud storage
2014-07-10 17:57:38 -04:00
drigato
c2411b6f41
CC-5884: Modify Pypo -> Download files from cloud storage
2014-07-10 17:56:41 -04:00
drigato
d2e8325258
CC-5891: Install apache-libcloud under virtualenv
2014-07-10 17:31:27 -04:00
Albert Santoni
bbade8401c
FTP upload hook bugfix for files with commas in their names (CURL
...
restriction)
2014-07-10 16:43:13 -04:00
Albert Santoni
08f4610aec
Fix CURL error handling in FTP upload hook
2014-07-10 12:12:16 -04:00
Albert Santoni
fc2f68cb51
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-07-07 15:54:02 -04:00
Albert Santoni
e84f765696
Better FileMover permissions unit test (passes as root)
2014-07-07 15:53:25 -04:00
drigato
1393bad014
Modified config file variables to describe not only rabbitmq settings
...
Removed filemover_analyzer functionality and replaced with an uploader function into Amazon s3
2014-07-04 16:38:58 -04:00
Albert Santoni
72ef576f03
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-23 15:28:50 -04:00
Albert Santoni
24d842c4a6
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/controllers/LoginController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
2014-06-23 15:26:53 -04:00
Albert Santoni
a7a7df4236
CC-5668: Weekly recordings get overwritten
2014-06-09 15:04:35 -04:00
Albert Santoni
1468ff0f7c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-04 13:47:07 -04:00
Albert Santoni
5e7fdb9606
Don't retry Analyzer HTTP requests if the web app is broken
2014-06-04 13:46:25 -04:00
Albert Santoni
65ea0e6d6f
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-03 12:44:35 -04:00
Albert Santoni
a969f8fc44
CC-5856: Analyzer metadata exception
...
* Fixed parsing of metadata when there's empty lists returned (mutagen's
API is awful)
* Return HTTP 422 if there's any exception in validating the metadata
2014-06-03 12:43:01 -04:00
Albert Santoni
0beaf5dcaf
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-03 11:42:26 -04:00
Albert Santoni
4548123ad9
CC-5861: Long file paths will cause analyzer error
...
* Fixed it
2014-06-03 11:41:45 -04:00
Albert Santoni
8ae1be265b
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-30 13:04:08 -04:00
Albert Santoni
1373d4984f
CC-5862: Invalid UTF-8 chars cause DB error
...
* Strip and validate UTF-8 strings in the Media API
* Also properly parse track numbers containing "-"
2014-05-30 13:02:19 -04:00
Albert Santoni
01fc9e6ffc
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-26 19:11:47 -04:00
Albert Santoni
d21cb596cd
CC-5860: Analyzer HTTP requests can hang indefinitely
...
* Log a backtrace when sent the USR2 signal (kill -SIGUSR2 <pid>)
* Rigged up up something to strace and restart when we see a request hanging
2014-05-26 18:59:28 -04:00
drigato
c9ddcc28e0
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-08 13:02:22 -04:00
drigato
0040965222
CC-5840: Add Media -> Endless retries if there is a validation error
...
Fixed by not adding message to retry queue if request returns a
validation specific error code (422)
2014-05-08 13:01:49 -04:00
drigato
c291439483
Adding back analyzer deadlock workaround.
...
Removing command to delete empty sub folders inside organize.
2014-05-07 15:01:31 -04:00
drigato
cf0aa3556f
Adding back airtime analyzer deadlock workaround
2014-05-07 14:07:49 -04:00
drigato
8a342f7ef5
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-07 13:12:40 -04:00
drigato
81dd1deba3
Removing something for testing
2014-05-07 13:12:18 -04:00
Albert Santoni
e4e97e9c32
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-06 15:03:14 -04:00
Albert Santoni
56c3d8070b
Alternate bugfix for logging deadlock in airtime_analyzer
2014-05-06 15:01:25 -04:00
Albert Santoni
bc5c5a3fb5
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-05 18:27:14 -04:00
Albert Santoni
ed494ac587
Some defensive code against multiprocess related deadlocks
...
* Reinitialize logging in child processes so we don't inherit locks.
Might be causing a deadlock we're seeing on Pro right now.
2014-05-05 18:25:47 -04:00
Albert Santoni
7073c31531
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-05 14:56:59 -04:00
Albert Santoni
d063700254
CC-5834: Airtime Analyzer: Bitrate is missing
...
* Fixed
2014-05-05 14:56:32 -04:00
Albert Santoni
13b6591dc1
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-05 14:39:55 -04:00
Albert Santoni
22343ed99c
Fixed bitrate import in airtime_analyzer
2014-05-05 14:39:36 -04:00
Albert Santoni
5160063f70
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-30 18:46:50 -04:00
Albert Santoni
c11e39f933
Fixed python-magic dependency
2014-04-30 18:46:37 -04:00
Albert Santoni
0183e2282f
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-30 18:44:17 -04:00
Albert Santoni
abcdf5ea6a
CC-5824: Airtime Analyzer: Flac file was uploaded but AA says it's
...
failed
* Fixed
2014-04-30 18:42:13 -04:00
Albert Santoni
ace03edd2e
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-04-30 18:32:42 -04:00
Albert Santoni
26a39ed2db
CC-5823: Airtime Analyzer: Wav file uploading fails with zero length and
...
empty mime
* Fixed
2014-04-30 18:32:17 -04:00
Albert Santoni
c2f6032c8b
Fixed the upstart config
2014-04-30 17:56:02 -04:00
drigato
0c0c65f69b
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-04-28 14:46:03 -04:00
drigato
f9f9e2458e
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-04-28 14:45:05 -04:00
drigato
fae5b15a9f
CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
...
$_FILES does not store the original file path so we were losing the folder name.
Fixed by explicitly passing the full filepath in via the ftp-upload-hook.sh script
2014-04-28 14:44:52 -04:00
Albert Santoni
2b341117fc
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-28 11:56:09 -04:00
Albert Santoni
375ec54778
CC-5820: Airtime Analyzer: Length and MIME parsing skipped if file has
...
no audio metadata tags.
2014-04-28 11:54:59 -04:00
Albert Santoni
446eca057c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
airtime_mvc/locale/fr_FR/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/it_IT/LC_MESSAGES/airtime.po
airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
airtime_mvc/locale/template/airtime.po
airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
2014-04-25 00:43:22 -04:00
Albert Santoni
e503c952d2
CC-5816: Publisher column
...
* Kanye West support. Surely
2014-04-24 17:05:38 -04:00
Albert Santoni
bc72a6626e
CC-5709: Airtime Analyzer
...
* Fixed some unit tests that broken when I dropped python-magic in
favour of mutagen for MIME type detection
2014-04-23 18:20:50 -04:00
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
denise
694e3101a8
Merge branch '2.4.x' into 2.4.x-saas
2013-07-22 11:02:35 -04:00
denise
de76b3a12f
CC-5278: Exception in Pypo
2013-07-17 15:29:21 -04:00
denise
18bb477845
Merge branch '2.4.x' into 2.4.x-saas
2013-07-10 11:32:51 -04:00
denise
f9a1cae72e
CC-5260: Liquidsoap: Fail to play mono file
...
Fixed thanks to Bill Burton
2013-07-10 10:35:24 -04:00
Naomi Aro
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
Martin Konecny
c11021af0f
remove commented code
2013-06-14 16:36:47 -04:00
Martin Konecny
caa3b420c4
Liquidsoap restart shouldn't timeout
2013-06-13 14:59:23 -04:00
Martin Konecny
b929cc0ce5
CC-5232: During playback, a reinstall may push some tracks twice
2013-06-13 14:06:07 -04:00
Martin Konecny
bc1c8129a9
CC-5232 - During playback, a reinstall may push some tracks twice
2013-06-13 12:08:25 -04:00
Martin Konecny
c365373aab
remove useless code and imports
2013-06-12 17:36:24 -04:00
Martin Konecny
fb80530069
CC-5229: map_metadata in Liquidsoap is applied twice
...
fixed
2013-06-12 16:04:57 -04:00
Martin Konecny
6961ba0a00
use he-aac v2 for fdk-aac
2013-06-12 15:31:36 -04:00
Martin Konecny
949ae9667b
CC-5226: Metadata isn't correct during playing
...
-fixed using "insert_metadata" and callbacks instead.
2013-06-12 14:04:52 -04:00
Martin Konecny
4e71345a61
CC-5226: Metadata isn't correct during playing
...
-fix incorrect metadata formatting
2013-06-12 12:49:28 -04:00
Martin Konecny
0e560d89ad
CC-5226:
...
Metadata isn't correct during playing
-should be fixed
2013-06-12 12:43:27 -04:00
Martin Konecny
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
Martin Konecny
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
Martin Konecny
622a7e6ff3
CC-5212
...
Lucid: Installation is blocked because monit "restart" fails
fixed
2013-06-06 17:13:30 -04:00
Martin Konecny
f7a6fec5eb
CC-5195: Media Folder: Update media folder will block media uploader
...
-fixed
2013-06-06 12:54:48 -04:00
Martin Konecny
f61eeaf18c
CC-5195:
...
Media Folder: Update media folder will block media uploader
-fixed
2013-06-06 12:44:20 -04:00
Martin Konecny
c7d0b6df92
CC-5204
...
Pypo: Updating stream settings will cause redundant pypopush
-fixed
2013-06-04 15:36:25 -04:00
Martin Konecny
905dd08ed5
Use proper unit conventions for Kilo
2013-05-31 15:59:20 -04:00
Martin Konecny
82a71fdb61
CC-5199
...
aacencplus encoder is very low quality
2013-05-31 15:59:04 -04:00
Martin Konecny
bc22a8a871
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-30 14:02:13 -04:00
Martin Konecny
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
Martin Konecny
1e9829e85c
CC-5182
...
Liquidsoap: Sometime the tracks in schedule cannot be played
2013-05-28 18:06:23 -04:00
Martin Konecny
73a908055a
Revert "CC-5123 Pypo: Redundant Pypopush happens after restart pypo service"
...
This reverts commit 4c3d2b20db
.
2013-05-28 16:38:15 -04:00
Martin Konecny
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
Martin Konecny
3247c7288d
use proper parameters for earlier versions of 'timeout' command
...
-small typo
2013-05-28 16:21:45 -04:00
Martin Konecny
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
Martin Konecny
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
Martin Konecny
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
Martin Konecny
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
Martin Konecny
1130cf961c
CC-5049: Error messages on Liquidsoap start up/shut down after Airtime install
...
-fixed
2013-05-27 13:41:36 -04:00
Martin Konecny
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
Martin Konecny
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
Martin Konecny
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
Martin Konecny
4e1dc6a86e
make operators more local to each queue source
2013-05-22 18:07:12 -04:00
Martin Konecny
45e5d339a1
make more operators local to each source
2013-05-22 18:03:56 -04:00
Martin Konecny
dc19d3f0b0
Merge branch '2.4.x' into 2.4.x-saas
2013-05-22 17:39:33 -04:00
Martin Konecny
36567c85cd
create on_metadata callback for each source instead of once on unified source
2013-05-22 17:39:18 -04:00
Martin Konecny
ab89b80b85
remove unnecessary install code for saas
2013-05-21 17:36:57 -04:00
Martin Konecny
ab5639ef79
remove unnecessary install code for saas
2013-05-21 17:27:34 -04:00
Martin Konecny
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
Martin Konecny
8e617b33de
add ability to use id's with mksafe operator
2013-05-21 16:31:32 -04:00
Martin Konecny
76a02796b7
implement method stub
2013-05-17 12:16:04 -04:00
Martin Konecny
d205b0dbd3
remove string literal
2013-05-17 12:14:33 -04:00
Martin Konecny
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
Martin Konecny
d2f29b1f88
more informative message to user about new init.d script behaviour
2013-05-16 12:08:32 -04:00
Martin Konecny
1ab27e3cf8
be more idiomatic
2013-05-15 17:18:42 -04:00
Martin Konecny
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
Martin Konecny
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
Martin Konecny
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
Martin Konecny
ba3703b556
Revert "CC-5126:"
...
This reverts commit a2b500729c
.
2013-05-15 13:10:56 -04:00
Martin Konecny
80686b7063
add parameter parsing to airtime-liquidsoap script.
...
-Allow us to prevent running as daemon
2013-05-15 13:06:16 -04:00
Martin Konecny
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
Martin Konecny
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
Martin Konecny
c693c4b015
remoe id's for mksafe (they aren't supported params)
2013-05-14 15:14:57 -04:00
Martin Konecny
a59fc69d17
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 15:10:13 -04:00
Martin Konecny
b3f0a2fcdd
CC-5144:
...
SHOUTcast listener stats auth not working
2013-05-14 15:10:04 -04:00
Martin Konecny
298e5a9b77
better idenfication of which mksafe is being applied
2013-05-13 17:52:43 -04:00
Martin Konecny
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
Martin Konecny
be465be9b2
CC-5133: Make sure Liquidsoap 1.1.1 is used
...
add missing file
2013-05-13 16:10:21 -04:00
Martin Konecny
85afe53c89
CC-5133: Make sure Liquidsoap 1.1.1 is used
...
fixed
2013-05-13 15:45:56 -04:00
Martin Konecny
28576adf42
disable liquidsoap's add operator normalizing audio
2013-05-10 23:19:54 -04:00
Martin Konecny
d06b2f3f94
CC-5116:
...
Please add opus into the file name filter
-fixed
2013-05-08 17:06:50 -04:00
Martin Konecny
4dba722272
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-08 16:53:42 -04:00
Martin Konecny
56b9d0580f
CC-5071:
...
Better RabbitMQ passwords
-fixed
2013-05-08 15:25:30 -04:00
Martin Konecny
f0e846db75
CC-5049: Error messages on Liquidsoap start up/shut down after Airtime install
...
fixed
2013-05-08 13:47:24 -04:00
Martin Konecny
3ae3c7e802
sanity check to warn if cue_out - cue_in != end - start
2013-05-07 15:05:14 -04:00
Martin Konecny
81b2012a45
remove some overly-verbose logging
2013-05-07 13:25:21 -04:00
Martin Konecny
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
Martin Konecny
2fc4afef68
ensure a proper environment everytime we restart liquidsoap
2013-05-06 12:11:19 -04:00
Martin Konecny
2eaf81d366
ensure a proper environment everytime we restart liquidsoap
2013-05-06 12:08:57 -04:00
Martin Konecny
3a1048bdec
ensure pypo registers with server before doing Liquidsoap check
2013-05-06 11:42:39 -04:00
Martin Konecny
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
Martin Konecny
fdcfc4d06c
CC-5094
...
Liquidsoap crash if unsupported encoder in the liq script
2013-05-04 10:57:22 -04:00
Martin Konecny
6c42064c14
refactor methods into appropriate locations
2013-05-02 18:46:16 -04:00
Martin Konecny
84efb4a9b7
work around to work with annoying static methods - should remove these later..
2013-05-02 17:59:03 -04:00
Martin Konecny
1e25d786ee
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-02 17:31:42 -04:00