8ffd70781b
Remove clearAction from the media REST API for security
2014-11-20 16:46:21 -05:00
c627342e28
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2014-11-19 15:21:14 -05:00
4f7f64af7a
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-11-18 17:45:08 -05:00
11a31375df
Slightly more robust fix for the last issue
2014-11-18 17:41:44 -05:00
6460854fda
Fixed 'clear' button not working when files failed to import
2014-11-18 17:13:48 -05:00
34453b5548
Removed setting the directory for cloud files
2014-11-18 10:57:21 -05:00
4d8b32556b
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-11-18 09:24:38 -05:00
91e7f7053d
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-18 09:16:25 -05:00
51274920e1
Cosmetic updates
2014-11-13 10:20:58 -05:00
7d86ea3115
Better error handling on media PUT request
2014-11-13 09:41:46 -05:00
2827db8ba3
Fix bad merge
2014-11-13 09:05:02 -05:00
864352c6a7
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/status_reporter.py
2014-11-12 17:04:00 -05:00
97b74a0997
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/models/Schedule.php
2014-11-12 15:08:35 -05:00
f1fa4929ae
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
python_apps/airtime_analyzer/setup.py
2014-11-12 14:51:18 -05:00
95517cac87
Fix exception thrown when the analyzer doesn't return filesize with the metadata
2014-11-12 14:45:50 -05:00
769e0e1d82
Fixed 'clear' button not working when files failed to import
2014-11-10 16:07:51 -05:00
6cda01fba9
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-03 13:15:21 -05:00
27b8f0ac13
Removed delete-success view script because action no longer exists.
2014-11-03 13:15:04 -05:00
87d5d3cb02
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/modules/rest/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-11-03 13:11:22 -05:00
5f98151009
Removed unused route from rest Media Controller
2014-11-03 12:57:41 -05:00
0a45de7fba
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
.gitignore
airtime_mvc/application/configs/airtime-conf.php
airtime_mvc/application/configs/classmap-airtime-conf.php
airtime_mvc/application/models/RabbitMq.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php
airtime_mvc/application/models/airtime/map/CcShowTableMap.php
airtime_mvc/application/models/airtime/om/BaseCcShow.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php
airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php
airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php
airtime_mvc/application/modules/rest/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/build/sql/schema.sql
airtime_mvc/public/index.php
2014-11-03 12:29:58 -05:00
b871b32175
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-10-30 12:17:34 -04:00
359727fc66
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-10-29 18:01:31 -04:00
ceb51100ec
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-10-29 17:58:56 -04:00
fd39db2e24
Merge pull request #75 - Saas relder csrf delete file
2014-10-29 17:55:42 -04:00
c02ed026f4
Support for tokens in multipart file upload using API.
2014-10-24 03:57:35 +00:00
544d20ebc2
Replaced spaces with dashes in resource_id generation
...
Fixed track preview and download signed urls
Removed cloud_storage_deleter.py file
Changed cloud_storage settings in airtime.conf
2014-10-17 17:16:53 -04:00
a10e287368
Fixed a fresh install bug that wasn't using composer installs.
...
Fixed a cloud file download bug where it was downloading the wrong track.
Working on amazon s3 signed urls for private objects.
Added cloud storage configuration to install script.
2014-10-14 16:54:58 -04:00
a84e0761ca
Updated file deletion to remove cc_files rows properly when deleting from the Library
2014-10-08 18:01:06 -04:00
2423ea6787
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-10-08 11:46:30 -04:00
05a8fdf091
Removed disk quota check from image upload, updated doc for processUploadedImage function
2014-09-18 18:23:13 -04:00
28824219f8
Added delete images endpoint to ShowController
2014-09-18 16:30:03 -04:00
b525638829
Changed extension check to MIME-type checking
2014-09-18 10:36:40 -04:00
080b2581b6
Changed RestAuth functions to static for ease-of-access
2014-09-18 10:35:26 -04:00
1cf3a5ca3a
Fixed always deleting file tree for show image even if directory was non-existant
2014-09-17 19:53:23 -04:00
f724d86b6a
Updated mkdir call to allow for creation of nested directories
2014-09-17 12:16:35 -04:00
d6476fffcd
Added Logging to image upload
2014-09-17 12:05:39 -04:00
6e1244ca33
Added Logging to imag upload
2014-09-17 12:02:55 -04:00
f64b7d0813
Updated show edit functionality to accommodate uploading new show image
2014-09-17 10:27:14 -04:00
3655c261ac
Shifted Auth functions into separate class to avoid code duplication (not moved from MediaController yet)
2014-09-16 18:11:41 -04:00
e31eb17cfa
Added ShowController to handle show image uploads
2014-09-16 18:10:29 -04:00
da293f610f
Added setNoRender call to MediaController and removed unnecessary views
2014-09-16 18:06:45 -04:00
ace883c975
Merge branch 'cc-5709-airtime-analyzer' into saas-fix-modules-bootstrap-14-04
...
Conflicts:
airtime_mvc/application/configs/application.ini
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/application/models/Cache.php
2014-08-28 17:01:03 -04:00
0ccc7e7dc9
SAAS-470: Zend Rest module doesn't work on Ubuntu 14.04
...
The Bootstrap.php in the modules directory didn't like
short php tags.
2014-08-28 16:52:47 -04:00
ca62086e16
Removed cloud file deletion from Airtime Analyzer. Deletion is done from PHP now.
2014-08-12 12:59:50 -04:00
02ea553f43
Removed media api delete-success callback because it's no longer in use
2014-07-31 23:21:39 -04:00
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
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
f1ea100411
CC-5896: Store cloud files in separate table, inherited from cc_files
2014-07-24 16:56:15 -04:00
c09457ce7c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-07-16 15:03:39 -04:00
82d7f09382
Small code cleanup
2014-07-16 12:44:09 -04:00
7ca6b91cdf
CC-5888: Handle file deletion if the file is stored in the cloud
2014-07-16 12:03:22 -04:00
aaee522ec6
CC-5888: Handle file deletion if the file is stored in the cloud
2014-07-15 17:20:04 -04:00
490a9c0d06
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-07-15 16:46:20 -04:00
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
8e714bcb64
CC-5888: Handle file deletion if the file is stored in the cloud
2014-07-15 07:26:39 -04:00
9d0f564190
Prevent analyzer from crashing if it is reporting a failure to Airtime
2014-07-11 16:17:13 -04:00
c2411b6f41
CC-5884: Modify Pypo -> Download files from cloud storage
2014-07-10 17:56:41 -04:00
2b704178ea
Set resource_id and directory to 'cloud' type on PUT request
2014-07-04 16:35:01 -04:00
a731f94f70
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-11 13:35:34 -04:00
e5a74e7285
Fix error due to bad exception throwing
2014-06-11 13:35:10 -04:00
65ea0e6d6f
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-03 12:44:35 -04:00
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
8ae1be265b
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-30 13:04:08 -04:00
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
01fc9e6ffc
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-26 19:11:47 -04:00
9eb0f2f3b3
CC-5859: Airtime Analyzer: format fields before writing to db
2014-05-26 17:13:45 -04:00
f8b7accc4a
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-22 19:17:15 -04:00
e1a0429939
Handle error case that could cause invalid disk usage reading
2014-05-22 19:16:42 -04:00
1db308330b
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-22 18:47:21 -04:00
091be8cea3
SAAS-439: Genres longer than 64 characters cause Media API exception
...
* Truncate the genre field in the Media API
2014-05-22 18:40:05 -04:00
d312c844bc
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-12 11:30:26 -04:00
691841eba4
CC-5844: Airtime Analyzer: Auto format the 'year' tag.
2014-05-12 11:29:58 -04:00
c9ddcc28e0
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-08 13:02:22 -04:00
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
fe8226e549
Removing logging statements
2014-05-08 11:02:50 -04:00
9cfdb04c89
Logging statements
2014-05-08 10:57:35 -04:00
8ea8226299
Removed some logging statements
2014-05-08 10:55:47 -04:00
f5e7c7e796
Logging statements
2014-05-08 10:51:55 -04:00
4c0d3a9d04
More logging statements for debugging
2014-05-08 10:50:49 -04:00
82ef08ad1e
Logging statements
2014-05-08 10:45:22 -04:00
c291439483
Adding back analyzer deadlock workaround.
...
Removing command to delete empty sub folders inside organize.
2014-05-07 15:01:31 -04:00
83d9ec413d
Commenting out where we delete empty sub folders inside organize folder
2014-05-07 13:58:39 -04:00
250d5d083e
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-02 16:06:15 -04:00
721e4e1a4a
CC-5806: Airtime Analyzer: Please implement "remove all files"
2014-05-01 10:58:51 -04:00
cb20c30723
CC-5806: Airtime Analyzer: Please implement "remove all files"
...
saas-specific changes for updating disk_usage
2014-04-29 16:08:03 -04:00
b0a711d918
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-29 16:06:43 -04:00
a5eb5e9901
CC-5806: Airtime Analyzer: Please implement "remove all files"
2014-04-29 16:06:25 -04:00
88b6b28c62
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-29 11:09:55 -04:00
04da9b3d61
CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
...
Imported file path had album name twice - fixed
2014-04-29 11:09:31 -04:00
f0fdf85524
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-29 10:35:58 -04:00
94375ee441
CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
...
Cleaner way of removing empty sub folders after ftp uploads
2014-04-29 10:35:39 -04:00
6adb7c53ae
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-29 10:05:35 -04:00
6f1dd7987f
CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
2014-04-29 10:05:17 -04:00
c3c5720dac
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-28 16:25:13 -04:00
79687499aa
Logging statement. To remove later.
2014-04-28 16:24:59 -04:00
48742abd6b
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-28 16:20:44 -04:00
f428a2d960
CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
...
Delete the empty folder after files have been copied into imported
2014-04-28 16:20:26 -04:00
9a0abb29b3
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-28 15:52:49 -04:00
c586e3e2b8
CC-5821: Airtime Analyzer: Ftp-uploaded folder doesn't get removed from organize
...
Was using wrong position when using substr()
2014-04-28 15:52:08 -04:00
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
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
5045d3ab7c
Remove logging statements
2014-04-16 12:11:46 -04:00
51af3ba36e
Undo-ing imported filepath change
2014-04-16 11:56:14 -04:00
368be9002e
Changing imported path for ftp script
2014-04-16 11:54:20 -04:00
a4b1db91b1
Logging for ftp
2014-04-16 11:41:29 -04:00
9cea1f079b
Logging for ftp script
2014-04-16 11:31:42 -04:00
0c2092b33f
Logging for ftp script
2014-04-16 11:04:46 -04:00
cf13952b45
Logging messages for debugging the ftp script
2014-04-16 11:01:02 -04:00
acf91bc627
CC-5786: Quota Enforcement in the File Upload API
...
Small refactor
2014-04-14 12:13:48 -04:00
63e2eda64b
CC-5786: Quota Enforcement in the File Upload API
...
Tweaked this so it will work on self-hosted instances
2014-04-14 12:09:15 -04:00
4add0f0b7b
CC-5786: Quota Enforcement in the File Upload API
2014-04-14 11:24:39 -04:00
1e62908e66
CC-5709: Airtime Analyzer
...
* Bounce files with file extensions we don't support in MediaController
* Added translation stuff for Recent Uploads
2014-04-09 11:28:41 -04:00
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
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
2ca911616f
Setting hidden flag to true on post request
2014-04-03 10:12:20 -04:00
3c5b7b5853
CC-5733: RESTful API data sanitization and validation
...
small fix - was setting the hidden flag twice
2014-04-02 11:33:47 -04:00
5ddbb4ddd1
CC-5733: RESTful API data sanitization and validation
...
Validate field types on post/put requests using the EditAudioMD form
2014-04-02 11:22:56 -04:00
9eda78f8f9
CC-5733: RESTful API data sanitization and validation
...
Added more fields to the black list
Using the "Edit Metadata" form for field validation on put requests
2014-03-31 17:57:32 -04:00
db2b52a1bf
CC-5709: Airtime Analyzer
...
* Some cleanup and refactoring for file deletion in the Media REST API
* Fix the refresh timer on the Add Media page when there's pending
imports.
2014-03-24 17:14:04 -04:00
6952902b22
CC-5709: Airtime Analyzer
...
* Unbreak stuff
2014-03-24 16:05:53 -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
f120caa093
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-03-21 13:26:47 -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
7800cb1e15
SAAS-382: Reimplement Storage Quota
...
Storing disk usage in cc_pref
Add/subtract filesize to/from disk usage total when a file is uploaded or deleted
TODO: Hook this into the ftp server
2014-03-21 09:50:03 -04:00
2b696dbee5
CC-5741: Create a download action for the File API
2014-03-18 13:04:06 -04:00
16c56e6aff
CC-5709: Airtime Analyzer
...
* Fixed error in media API authentication
* Improved documentation
2014-03-17 14:43:50 -04:00
86a34635bb
CC-5701: Airtime File API
...
Fixed saving filepath and directory
2014-03-17 10:56:49 -04:00
f7cb923ceb
CC-5709: Airtime Analyzer
...
* Fixed breakage
2014-03-17 10:25:26 -04:00
e1f69b26af
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-03-17 10:22:54 -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
65ab49baee
CC-5733: RESTful API data sanitization and validation
...
Renamed sanitize function to sanitizeResponse
2014-03-14 17:53:03 -04:00
820f7f257a
CC-5733: RESTful API data sanitization and validation
...
Stripped out fields that are readonly to the RESTful API from the request data for POST and PUT.
Stripped out fields that should never be visible outside of Airtime in response data.
Set uploaded and modified timestamp on POST request.
Set modified timestamp on PUT request.
2014-03-14 17:34:56 -04:00
6a68967f81
CC-5734: RESTful API media ownership
2014-03-13 17:00:15 -04:00
9b390518b7
CC-5709: Airtime Analyzer
...
* Fix the callback URL
* Imports files successfully now!
2014-03-13 14:59:48 -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
e6cbbdff33
CC-5709: Airtime Analyzer
...
* Added session auth to the Media API (if you're logged in)
* Started reworking our Plupload interaction with the server to be less
awkward.
* Basic uploading works with the Add Media page again, but messages
aren't dispatched to airtime_analyzer yet (coming next...)
2014-03-13 11:14:30 -04:00
c0818682af
CC-5709: Airtime Analyzer
...
* Fixed the /rest/media endpoint
2014-03-06 17:38:57 -05: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
b6dd2e3152
CC-5701: Airtime File API
2014-03-03 16:04:34 -05:00
f33f49259d
CC-5701: Airtime File API
...
Fixed http response code for delete
2014-03-03 11:28:18 -05:00
aba2fb44d1
CC-5701: Airtime File API
...
-put and delete actions working
2014-03-03 11:21:25 -05:00
64c1dd2c1e
CC-5701: Airtime File API
...
Beginnings of fil rest api
index, get, post actions working without authentication
2014-02-27 17:11:17 -05:00
Albert Santoni
Duncan Sommerville
drigato
Robert Elder