Commit Graph

2233 Commits

Author SHA1 Message Date
Naomi Aro a199585cb9 CC-2647 : Check MD will fit db constraints in Airtime 2011-08-05 15:12:55 -04:00
James 5124fa67d3 CC-2626: long numbers after the dot should be truncated
- fixed
2011-08-05 15:09:04 -04:00
James 83432e1996 CC-2634: Downloading a file with a non-ASCI name, doesn't
show up those chars

- removed pathinfo() call and manually parsing the basefile name.
2011-08-05 15:09:03 -04:00
James ce0396961d CC-2473: plupload: Cannot upload a 250Mb+ file
- fixed
- we now use chuck to uploade files
2011-07-29 16:45:13 -04:00
Naomi Aro 96284a2a44 CC-2562 : Allow users to convert linked files into watched directories 2011-07-25 16:21:42 +02:00
Naomi Aro d3776f4ea9 CC-2582 : Files with a tracknumber that isn't actually a tracknumber don't get imported properly
adding more metadata checks so it won't have a database insertion issue.
2011-07-22 12:54:42 +02:00
Naomi Aro 7d79fa7b63 CC-2572 : Set Proper Metadata for a recorded show 2011-07-19 19:02:23 +02:00
Naomi Aro 9aa7b7f403 CC-2572 : Set Proper Metadata for a recorded show 2011-07-19 18:36:10 +02:00
Naomi Aro ba0458c442 CC-2558 : Delete all files from disk, only allow admins to delete. 2011-07-19 11:00:32 +02:00
Naomi Aro 7edacd89cc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-18 19:48:34 +02:00
Naomi Aro c7279f74ca CC-2558 : Only delete files from disk that are in stor directory and not scheduled etc. 2011-07-18 19:48:20 +02:00
martin d28c662056 CC-2555: Now Playing page takes roughly 1.4 seconds to load on localhost
-fixed
2011-07-18 11:18:38 -04:00
Naomi Aro 4588ebd105 CC-2558 : Only delete files from disk that are in stor directory and not scheduled etc. 2011-07-18 15:28:17 +02:00
martin cc8ec59f89 -updated comments 2011-07-15 19:32:17 -04:00
James 8f1e0a0767 CC-2553: Exception thrown
- fixed
2011-07-15 17:35:16 -04:00
James 2b1a0b4f72 CC-2551:airtime-import:Script doesnot send msg to media monitor
- move all error checking and RabitMq calls into MusicDir
functions
- fix in PreferenceController.php so it works with new functions
from MusicDir
2011-07-14 15:43:38 -04:00
james 4acf835fe1 CC-2536:Should set realpath of directory in MusicDir
- fixed
2011-07-13 09:49:51 -04:00
james be7af45c66 CC-2524:Manage Media Folders:No error msg
- fixed
- changed error msg text
2011-07-13 09:01:48 -04:00
martin 1411987b01 CC-2534: When copy files into storage folder it says wrong path name
filter all functions via realpath which will make directories consistent
2011-07-12 17:05:40 -04:00
martin 1416274882 CC-2529: Create download file API key
-users who are authenticed via ZEND_AUTH can now preview files
 without using api-key
2011-07-12 14:09:40 -04:00
martin 2c4e2afb8b -removed airtime-clean-storage.php + airtime-import.php
-default created stor dir now has www-data:www-data permission
-created airtime-install.ini file for specifying install defaults
-removed all references to storDir in /etc/airtime/airtime.conf,
 and get value from database instead.
2011-07-11 16:14:34 -04:00
james e47f80802e CC-2524:MusicDir.php: adding error handling
- following functions now handle error and return code and
error message if there is an error:
addDir(), setStorDir(), removeWatchedDir()
- fixed airtime-importy.py to work with new MusicDir functions
2011-07-11 14:00:31 -04:00
james ece84a04c5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-08 17:46:50 -04:00
james 9bbd350a3a Merge branch 'cc-2514-new-airtime-import-script' into devel 2011-07-08 17:46:32 -04:00
james c0a68e20c2 CC-2514:New airtime-import script
- initial commit.
2011-07-08 17:14:01 -04:00
martin 8574eb7063 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-07 16:05:47 -04:00
martin 73da294089 CC-2505: Media monitor doesn't delete some tracks
from the Airtime server due character encoding

-fixed
2011-07-07 16:05:34 -04:00
james 25725c5ce2 CC-2520:Phone Home stat:Popup doesn't get disapeared
- fixed
2011-07-07 14:09:55 -04:00
james ba4733ceb6 CC-2460:Popup shouldn't show after X is pressed
- changed name to "donotshowregistrationpopup"
2011-07-06 17:02:58 -04:00
martin 6b9066466b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-06 14:43:01 -04:00
martin 67df619c90 CC-2272: Ability to change storage directory location
-done
2011-07-06 14:42:43 -04:00
james f8b8a6bada Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-06 13:56:51 -04:00
james a8546e289e CC-2068:Now playing should use Title/Creator, not Song/Artist
- fixed
- removed some unnecessary code.
2011-07-06 13:56:27 -04:00
martin 3d52db5211 CC-2494: Uploading songs getting a 500 error (shows as yellow ! in the UI)
-fixed
-also made it so that files deleted via the UI are deleted on the FS as well.
2011-07-06 13:54:52 -04:00
james daf6f9963f CC-2511:Phone Home Metric: add error display on popup
- refactoring was needed to solve this problem.
- javascript error check is not necessary anymore.
- The form is preloaded to nowplaying page, only when
it's needed, hence ajax call to pull up the form is not
needed anymore.
2011-07-05 15:53:50 -04:00
james 883cacd220 CC-2509:Phone Home stat: not able to upload logo via popup
- fixed
2011-07-05 14:21:32 -04:00
martin df1dec2078 cc-2419: media monitor import on startup
-fixed support for watched dirs
2011-07-04 17:37:05 -04:00
martin c67e711a05 cc-2419: media monitor import on startup
-fixed syntax errors, added more logging.
2011-07-04 15:40:09 -04:00
martin d260c66abc cc-2419: media monitor import on startup
-added multiple dir support
2011-07-04 15:08:02 -04:00
martin ae156c85b4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-04 14:29:19 -04:00
martin 429d8b234c cc-2419: media monitor import on startup
-new method of querying db on startup.
2011-07-04 14:29:09 -04:00
james cb72db4a31 CC-2460:Popup shouldn't show after X is pressed
- changed function name to "donotshowpopup"
2011-07-04 13:11:35 -04:00
james 75ea77e6a6 CC-2503: replacing UI_MDATA_KEY_TITLE with MDATA_KEY_TITLE
-fixed
2011-07-04 10:00:37 -04:00
james 6de8b09184 CC-2460: popup doesn't popup again after press X
- fixed
2011-07-04 09:54:44 -04:00
martin dc457e79a0 added logging to ApiController::getMediaAction
-Will help us see why files are not sometimes downloaded by pypo.
2011-06-28 23:06:59 -04:00
james 5f9dd83c38 CC-2377:Upload to soundcloud no show name
- fixed
- additional fix: getRealFilePath() doesn't exsist anymore.
Places where it calls getRealFilePath(), replaced with getFilePath()
2011-06-27 11:43:59 -04:00
james 629c3fb1d9 CC-2240:Fix up recorded show function
- fixed
- added getName() function agagin to StoredFile
2011-06-27 11:23:48 -04:00
Naomi Aro 4a478117c6 CC-2411 : Interface for Music Folders Preferences
applying html/css changes to music folder preference page.
2011-06-27 11:46:23 +02:00
James c5ec6b5a53 CC-2425:Tweak phone home
- privacy check box is uncheck by defalut
- 'Yes' button is disabled on popup form by default
- custom error msg is added for privacy checkbox on preference
form
- promote form is hidden by default
2011-06-26 23:13:49 -04:00
James 195588ecc4 CC-2451: Not storing data
- fixed
- additional fix: promote data will not be stored if promote
checkbox is not checked
2011-06-26 01:47:21 -04:00
martin 7607bce6c8 CC-2403: Downloading a file via the web UI returns an absolute path, not relative
-fixed to take into account the base URL.
2011-06-24 16:04:57 -04:00
James db7b996288 CC-2415:subsecod-offset-in-playlist
- Displays 1 decimal place on all length and offset in playlist
builder
- secondsToPlaylistTime() function returns time with 1 decimal
millisecond
2011-06-24 15:51:21 -04:00
James e05645f523 CC-2415:Subsecond offset
- temp commit. not sure what needs to be done yet
2011-06-24 12:29:55 -04:00
James 7aca2e25d0 CC-2432:After choosing to register from still pops up
- fixed
2011-06-24 10:15:18 -04:00
Naomi Aro fbf5f85509 CC-2423 Undefined property in StoredFile::$md
uses the new file metadata access now.
2011-06-24 10:40:31 +02:00
Naomi Aro bae771790a cc-1799 Human Filesystem
editing recording shows so they work with the new filesystem/file upload.
2011-06-23 21:14:09 +02:00
Naomi Aro e725e4fbe4 cc-1799 Human Filesystem
storage dir should be created first so then it's realpath can be inserted into the database.
2011-06-23 17:51:38 +02:00
Naomi Aro 7876552b38 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-23 17:35:01 +02:00
Naomi Aro 65e647263f cc-1799 Human Readable File System
refactoring media monitor, separate process for file event processing.
2011-06-23 17:33:05 +02:00
martin 8f0b965ea0 CC-2403: Downloading a file via the web UI returns an absolute path, not relative
-fixed
2011-06-22 16:50:58 -04:00
martin 50cde2f8b0 CC-2418: Show add: end time shown in display is not the time committed to DB 2011-06-22 11:21:26 -04:00
james ea78991d57 - removing one line from PreferenceController.php(the function
doesn't exist anymore)
2011-06-21 10:26:34 -04:00
james bcfc5507c6 CC-1724: Phone home statistics
- Email is not required field in Preference
- removed duplicate line from PreferenceController.php
2011-06-21 10:19:39 -04:00
Naomi Aro 6adce1ba45 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
adding ability to move stor directory.
2011-06-21 14:58:38 +02:00
Naomi Aro f1893cebe6 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
making separate js file for music dirs page.
2011-06-21 11:57:56 +02:00
Naomi Aro 253eb811c7 Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/Preference.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
2011-06-21 11:20:35 +02:00
Naomi Aro b6888489e0 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
adding music dirs concept to Airtime. New cc_music_dirs table/class.
2011-06-21 10:24:02 +02:00
james 05dc48fa71 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/Preference.php
2011-06-20 18:09:37 -04:00
james e762633405 CC-1724:Phone home statistics
- Final commit for client side.
2011-06-20 17:58:38 -04:00
martin 141002eb49 CC-2404: Downloading a file via the web UI shouldn't guide user away from page.
-fixed
2011-06-20 14:10:33 -04:00
martin adae3e21d6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-17 14:42:08 -04:00
martin b802ba9a42 cc-2381: slow library searching speed
-implemented 350ms keystroke delay before searching
2011-06-17 14:41:57 -04:00
Naomi Aro ea21da6b61 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
recursively copying the audio_samples directory.
2011-06-17 17:54:36 +02:00
james 1fbaa7d5fb CC-1724:Phone home statistics
- Popup form validation is added( javascript )
2011-06-16 14:26:24 -04:00
Naomi Aro 35cbeffd4a CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
fixing a couple playlist things to work with the new storedfile class.
2011-06-16 12:39:17 +02:00
james 5adfb79981 CC-1724:Phone home statistics
Temp commit
2011-06-15 17:51:44 -04:00
james cf654f1a45 CC-1724:phone-home-statistics
Rebase from devel into this branch
2011-06-15 12:06:50 -04:00
james 11b601308e CC-1724:Phone home statistics
Temp commit
2011-06-15 11:17:03 -04:00
Naomi Aro 5b26f34033 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
seems mutagen needs everything cast as a string, or one field. Was throwing an exception with no message not sure.
2011-06-15 14:20:14 +02:00
Naomi Aro d5a3aaf3d0 Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel
Conflicts:
	python_apps/media-monitor/MediaMonitor.py
2011-06-15 11:02:23 +02:00
Naomi Aro af4ec7b872 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
plupload is now working how I want with moving files.
stub files are added then their metadata updated as the web receives info.
2011-06-14 18:35:07 +02:00
Naomi Aro 17d895861d CC-1799 Put Airtime Storage into a Human Readable File Naming ConventionPut Airtime Storage into a Human Readable File Naming Convention
put initial stub file in when a user uploads via plupload so they aren't wondering why they don't see anything in their playlist builder. Metadata will be updated when the file event completes.
2011-06-14 12:07:21 +02:00
james 1dabbacca2 CC-2289:Differentiate between time and duration
- End date and time is added
- duration field is readonly now and is autocalculated
- now playing duration field format is changed( 0h 0m 0s )
- removed millisecond from start and end time in now playing
2011-06-13 12:59:43 -04:00
Naomi Aro 84dd5dac62 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
delete is working, can upload from plupload.
2011-06-13 16:41:57 +02:00
Naomi Aro 8d9c0dab1a CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
adding setup to get stor folder etc.
2011-06-13 12:10:25 +02:00
Naomi Aro 71d853567e CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
selecting a mode to prevent some cases where a duplicate could be entered for only 1 file.
2011-06-10 16:43:30 +02:00
Naomi Aro 9da314979e CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
fixing problem with StoredFile::Insert()
2011-06-09 12:57:30 +02:00
Naomi Aro a4b92fe72d CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
regression testing with refactored storedfile, having permission problems unlinking a file.
2011-06-09 11:50:03 +02:00
Naomi Aro 1f9a39f22d CC-1799Put Airtime Storage into a Human Readable File Naming Convention
new API method to check media status.
2011-06-09 10:28:56 +02:00
Naomi Aro 11d18ad8e8 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
can drag a bunch of songs into stor, and they are organized and imported to airtime. Need to fix length property.
2011-06-08 18:24:17 +02:00
james ad3ef3ec30 CC-2255: Separate user types admin and program manager
- New user type 'Program Manager' added
- 'Program Manager' gets same previlage as Admin but doesn't
have access to Configure menu
- Changed user type name 'Host' to 'DJ'
2011-06-07 14:31:39 -04:00
Naomi Aro 3c689efe06 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
check if file is new or exists
2011-06-07 10:39:57 +02:00
Naomi Aro f46cdd3888 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-07 10:00:22 +02:00
james 80c17f6c38 Merge branch '1.8.2' of dev.sourcefabric.org:airtime into 1.8.2 2011-06-06 16:47:45 -04:00
james 93562d2319 CC-2362:Recorded show wrong file name
Fixed bug on sending wrong file name to soundcloud
2011-06-06 16:46:32 -04:00
martin c921348f36 cc-2364: past non-recorded shows have "upload to soundcloud" context menu option
-fixed
2011-06-06 15:15:47 -04:00
james ff031cde76 CC-2362:Recorded show wrong file name
- removed logging
2011-06-06 14:25:46 -04:00
james 4247f8c7a7 CC-2362:Recorded show wrong file name
- not finished yet. Temp commit
2011-06-06 14:10:12 -04:00
Naomi c30eeaf5bd CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
searching database by filename to retrieve file.
Checking if is supported audio file/temp audio file.
2011-06-06 11:26:15 +02:00
martin e969baee1c cc-2359: record check box is disabled after update show
-fixed
2011-06-03 14:01:58 -04:00
Naomi Aro f7de484461 CC-2336 Some Show Editing Features Seem to have been lost
recovered everything that original worked I think will keep looking,
still problems with editing a show which has already started.
2011-05-30 18:41:31 -04:00
Naomi 8d59c18bef CC-2326 Can't edit a show more than once (End Date problems)
show editing assumed inclusive end dates while show creating assumed non inclusive.
2011-05-26 15:41:47 -04:00
Martin Konecny 28a609c4dd CC-2317: Once uploaded, file size is different than original. 2011-05-24 16:33:26 -04:00
martin ebd93cd55a CC-2287: Files greater than 100MB are not being played
-increased chunk read size
2011-05-20 16:03:31 -04:00
martin 73877b222c CC-2287: Files greater than 100MB are not being played.
-fixed
2011-05-20 14:29:22 -04:00
Naomi b84854c13c CC-2271 1.8.2 code cleanup tasks
changing 1.8.1 upgrade script to using raw source first.
2011-05-19 09:59:13 -04:00
martin 3416ba20d9 cc-2263: unable to cancel recording show
-made cancelled recorded shows still upload.
2011-05-18 14:33:42 -04:00
Naomi d4a4c4be2a CC-1939 Ability to edit name & description of a playlist, display the description somewhere
now can edit title/description of a playlist without leaving the main playlist builder screen
2011-05-18 14:33:41 -04:00
martin a48f467de7 cc-2263: unable to cancel recording show.
-almost final check-in. Everything looks good right now...
2011-05-18 14:33:41 -04:00
martin a937dcb5ac -cc-2126: user should not be able to delete himself
added server side check
2011-05-16 22:37:54 -04:00
naomiaro a3d7c5e70b CC-1799 : Live Studio Playout from media library (pytagsfs)
metadata almost working from airtime form -> python daemon. Just need to look into permissions for some stor folders.
2011-05-13 13:25:55 -04:00
Naomi 5be039d349 CC-1799 : Live Studio Playout from media library (pytagsfs)
if a tag is edited by easytag, the change is now reflected in airtime database.
2011-05-13 13:25:55 -04:00
Naomi 15a2022418 CC-1799 : Live Studio Playout from media library (pytagsfs)
sending a file's metadata to airtime when it is modified
2011-05-13 13:25:53 -04:00
Naomi 52efc79f8c CC-1799 : Live Studio Playout from media library (pytagsfs)
set up daemontools process for the media monitor script.
2011-05-13 13:25:53 -04:00
martin bc640d38f2 cc-2167-top-panel-doesn't-list-recording-shows 2011-05-10 19:06:35 -04:00
James Moon 48af794cfa CC-2188: Download action for all media file
Fixed. The issue was due to change in getFileUrl() in
StoredFile.php.
2011-05-05 17:01:22 -04:00
James Moon 6bbbdd5404 CC-2238: Deleting a playlist from right list
Fixed.

1. It only clears the left window form if 'delete' action is
clickced on the opened playlist.
2. similar functionality was implemented when 'edit meatadata'
form is opened in the left window.
2011-05-05 16:52:38 -04:00
mkonecny 9638f6dd3e cc-2167: now playing view with recording shows a gap
-implemented
2011-05-05 16:45:13 -04:00
mkonecny 7010f2156e cc-2229-refactor-now-playing-code
-further refactoring...
2011-05-05 14:08:52 -04:00
mkonecny 48ed126703 CC-2229-refactor-now-playing-code
-server side done.
2011-05-05 13:24:21 -04:00
James Moon 95613f40f1 cc-2188: Download action for all media file.
Download action were added in two placese.

1. Playlist Builder. jjmenu now showing 'Download'.
2. Calendar-> Show Content. Click on the file, you will see
Downlaod menu.

Limitation:

File name is set to original file name.
On the ticket it said, file format should be like
"show_name-12012011-2130.mp3". However, in my opinion,
this is only possible, if a user downloads it from
calender->show content. We know what the show names and etc,
but, if the user downloads it from Playlist Builder, we cannot
retrive such information. To be consistent in both area, I just
set the file name to original file name. This can be easily
modified in the future.
2011-05-04 19:05:14 -04:00
martin 8e2019a935 cc-2182: Convert back to restful design
-done
2011-05-02 16:33:37 -04:00
martin 50c649dc59 Merge branch 'cc-2211-changes-to-playlist-not-shown' into devel 2011-04-29 15:31:18 -04:00
James Moon d9ecb965bb cc-2211:changes-to-playlist-not-shown
- removing some codes that aren't used.
- it deletes pl from the right list if the 'delete' button on
the left window is clicked.
2011-04-27 14:41:47 -07:00
James Moon c322b8fb7f cc-2238:deleting-a-playlist-from-right-list
fixed.
2011-04-27 14:22:50 -07:00
James Moon 44d599a00b CC-2211:Changes to playlist not shown
Everything works fine except when adding new playlist.
When the new playlist gets created, it doesn't display
the page which contains the playlist.
2011-04-27 12:14:24 -07:00
James Moon bf34170f29 Temp commit.
It's not done, need to work more later.
2011-04-25 10:11:12 -07:00
martin fab68dfad1 CC-2203: Search results: "Delete" should be at the bottom of the list and should have a confirmation
-Fixed
2011-04-18 12:43:04 -04:00
martin d7bb00dc20 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-18 12:01:22 -04:00
martin 7a3fbe9ac7 CC-2196: Update a Live show with invalid data, uncheck the Record checkbox
-fixed
2011-04-18 12:01:02 -04:00
Naomi 23105b9d67 CC-2184 : Hardcoded CSS path should be relative path instead
using baseURL zend provides in path.
2011-04-18 11:02:09 -04:00
Paul Baranowski 03ab7edea0 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-14 18:55:15 -04:00
Paul Baranowski b11cbd8159 CC-2166: Packaging Improvements. Moved the Zend app into airtime_mvc. It is now installed to /var/www/airtime. Storage is now set to /srv/airtime/stor. Utils are now installed to /usr/lib/airtime/utils/. Added install/airtime-dircheck.php as a simple test to see if everything is install/uninstalled correctly. 2011-04-14 18:55:04 -04:00