Commit Graph

361 Commits

Author SHA1 Message Date
Rudi Grinberg a22ba39de1 formatting 2012-09-18 12:26:07 -04:00
Rudi Grinberg d2f43058c2 fixed comment 2012-09-18 12:09:28 -04:00
Rudi Grinberg f9319b869a Corrected comments 2012-09-18 12:08:30 -04:00
Rudi Grinberg bc873a3ece Added extension handling for file path 2012-09-18 12:04:54 -04:00
Rudi Grinberg 8657a80459 removed return '' 2012-09-18 11:51:13 -04:00
Martin Konecny c310cecf40 CC-4463: do we need getFileExtension()? 2012-09-17 16:40:27 -04:00
Rudi Grinberg 2337078dd8 Cleaned up unused variables. Formatted some lines. 2012-09-17 12:35:12 -04:00
Martin Konecny 6e239d08e9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 14:43:15 -04:00
Martin Konecny e3c1a3ac0e CC-4434: Make Application_Model_Preference::getValue and setValue private methods
-initial commit
2012-09-14 12:09:40 -04:00
denise c7f4ede766 -implemented UI changes for library page 2012-09-14 12:08:51 -04:00
Rudi Grinberg e0286b112f cc-4292: Removed unnecessary code related to md5. 2012-09-12 11:10:25 -04:00
Rudi Grinberg faa04a2f5c Refactored RecallByX 2012-09-11 18:22:46 -04:00
denise c6ab540120 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 17:19:12 -04:00
denise 58d39d74d4 CC-4355: Smart block criteria do not match library columns or metadata editor
-fixed
2012-09-11 17:18:17 -04:00
Rudi Grinberg 72a424bb7e Added todo to fix crust 2012-09-11 16:25:45 -04:00
Rudi Grinberg 0dd38920a3 Cosmetic changes. 2012-09-11 16:20:59 -04:00
Rudi Grinberg 51d4f35c55 Removed unused global variable 2012-09-11 16:15:15 -04:00
Rudi Grinberg d95731f2f3 Reformatted sql to use heredoc 2012-09-11 16:13:39 -04:00
Martin Konecny 0fec175681 CC-1710: FLAC, BWF, AAC support
-context menu for mp4's having a problem
2012-09-11 14:04:45 -04:00
James 585ee579d6 CC-4005: Tag files with Last Played date and number of times played
- fixed CRLF
2012-09-10 18:07:12 -04:00
James 645593f954 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/Webstream.php
2012-09-10 18:04:35 -04:00
James ba37bb4327 CC-4005: Tag files with Last Played date and number of times played
- done for files and webstreams
2012-09-10 18:01:36 -04:00
Rudi Grinberg af225418c4 Removed empty constructor. 2012-09-10 16:08:21 -04:00
James 0ab08af48f CC-4380: Show ReplayGain value in the Library page
- done
2012-09-10 14:37:38 -04:00
James 4d3c624607 CC-4380: Show ReplayGain value in the Library page
- temp commit
2012-09-10 12:35:32 -04:00
Rudi Grinberg a479a11c8f Removed crazy handling of flac. 2012-09-07 18:23:14 -04:00
denise 8125d6b553 CC-4344: Conductor column not available in library view
-done
2012-09-06 14:30:09 -04:00
Rudi Grinberg ab6ae1ce8e cc-4336: Fixed the issue. But this whole chunk of code could probably be removed. 2012-09-05 14:33:49 -04:00
Martin Konecny 982dd1e2a7 CC-4348: Prepared statements - part 4
-StoredFile.php
2012-09-04 17:21:59 -04:00
Rudi Grinberg d7aad93e4f cc-4288. Added owner to query. 2012-08-31 13:34:21 -04:00
Martin Konecny 8b5f94fa9f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-29 11:05:14 -04:00
Martin Konecny 4848717d4d CC-4090: Make code style PSR compliant - part 4
-models dir
2012-08-29 10:58:03 -04:00
Rudi Grinberg 05908d121f cc-4274: Fixed bad table name. 2012-08-28 16:23:16 -04:00
Rudi Grinberg 33bb4e600c cc-4274: implemented james' hack to fix this issue. 2012-08-28 16:23:16 -04:00
Rudi Grinberg 7f66bdbb66 cc-4301: Fixed bug where owner_id would be null whenever show is recorded. 2012-08-27 17:58:09 -04:00
Rudi Grinberg c28025ecfb hotfix for bad class name 2012-08-27 16:49:45 -04:00
Rudi Grinberg 8d7f3817ec cc-3936: Fixed bug where setDbColMetadata to use airtime metadata key names. 2012-08-27 15:11:28 -04:00
Rudi Grinberg 7aba1dcebd Added warning method. Changed some code to use it. 2012-08-27 14:51:35 -04:00
Rudi Grinberg cab7a6c930 cc-3936: added comment documenting metadata translation 2012-08-27 14:07:05 -04:00
Rudi Grinberg dea764b8fd cc-3936: added warning for metadata attributes that are not defined in constants.php 2012-08-27 14:03:22 -04:00
Rudi Grinberg 687a6d3c5a cc-3936: removed intrusive logging 2012-08-27 11:49:36 -04:00
Rudi Grinberg fcc853b732 cc-3936: Renamed metadata key for owner id. 2012-08-27 11:06:06 -04:00
Rudi Grinberg 7284770226 cc-3936: Changed setting of owner when modifying/inserting metadata. 2012-08-24 12:38:33 -04:00
Rudi Grinberg 5841cb7066 cc-3936:
Made it so that identifer file is written before the file itself so that media monitor always
has the identifier file before the song itself.
2012-08-24 12:37:16 -04:00
Rudi Grinberg 857be6b702 cc-3936: Removed manual path concatenation. Fixed setting owner of file. 2012-08-24 11:09:38 -04:00
Rudi Grinberg 19a5a8f992 cc-3936: fixed wrong argument order bug. 2012-08-24 10:20:59 -04:00
Rudi Grinberg 4ad983f63c cc-3936: applied schema changes 2012-08-24 10:20:59 -04:00
Rudi Grinberg c83fad2546 cc-3936: added owner to every file insert 2012-08-24 10:20:59 -04:00
Rudi Grinberg b0a61fc291 cc-3936: Added setting default owner_id for inserted files. 2012-08-24 10:20:59 -04:00
Rudi Grinberg 43ca0d21e6 cc-3936: removed unnecessary object creation 2012-08-24 10:20:59 -04:00
Rudi Grinberg 996dcfd35f cc-3936: Ran propgen to generate schema changes 2012-08-24 10:20:59 -04:00
Rudi Grinberg f940c20701 cc-3936:
Added success logging when identifier file has been written.
2012-08-24 10:20:58 -04:00
Rudi Grinberg 23e3f6137d cc-3936:
Sexified code. Added section for user handling.
2012-08-24 10:20:58 -04:00
Rudi Grinberg d1e7341046 cc-3936: Refactored php code to upload files 2012-08-22 16:08:46 -04:00
Martin Konecny 462542bf68 change Logging::log to Logging::info 2012-08-21 18:41:56 -04:00
James a24da9e324 CC-4256: Smart Playlist: change name to smart block and etc
- done
2012-08-20 17:17:48 -04:00
Martin Konecny 69f150ac7f more detailed error message 2012-08-20 14:41:43 -04:00
denise ea621fd9dc CC-4223: Smart playlists: BPM criteria should have numeric modifiers
-done
2012-08-15 16:40:04 -04:00
Rudi Grinberg e98eda144a cc-4105: removed naive replaygain again. added micro optimization to Insert into cc_files 2012-08-14 14:50:41 -04:00
Rudi Grinberg 7abe882455 cc-4105-2: added retries on failed requests. added ignored files set like in the old media monitor 2012-08-14 14:50:39 -04:00
Martin Konecny b53bc36f4f CC-1665: Scheduled stream rebroadcasting and recording
-ability to preview webstreams
2012-08-09 14:39:31 -04:00
Martin Konecny 18ca6b22cb CC-1665: Scheduled stream rebroadcasting and recording
-add placeholder icons for smart playlists/webstreams
2012-08-07 23:44:21 -04:00
Martin Konecny f901e13a84 CC-1665: Scheduled stream rebroadcasting and recording
-Make playlist builder show creator name instead of creator id
2012-08-03 18:06:47 -04:00
Martin Konecny b23b9a0cbd CC-1665: Scheduled stream rebroadcasting and recording
-allow to filter by webstream only
2012-08-03 16:33:58 -04:00
Martin Konecny 7e433b61fb CC-1665: Scheduled stream rebroadcasting and recording
-improve working with "webstreams"
2012-07-30 21:48:04 -04:00
James 8755500d30 CC-84: Smart Playlists
- some minor fix
2012-07-26 15:30:49 -04:00
Martin Konecny 3735579378 -remove cc_access table and gunid usage 2012-07-26 14:49:32 -04:00
Martin Konecny b283b5b55e CC-1665: Scheduled stream rebroadcasting and recording
-remove unused function
2012-07-26 14:49:32 -04:00
Martin Konecny a16a1f5033 CC-1665: Scheduled stream rebroadcasting and recording
-Webstreams now appearing in the library
2012-07-26 14:49:31 -04:00
denise bef9ba1eea CC-84: Smart Playlists
- added 'Smart Block' filter in datatable
- added block files to library datatable
2012-07-25 17:08:22 -04:00
denise d801139a12 CC-84: Smart Playlists
- utime and mtime in library were displaying in UTC
2012-07-19 19:11:42 -04:00
denise 624986e973 - removed unnecessary logging line 2012-07-19 18:11:31 -04:00
denise 647de9ed39 CC-84: Smart Playlists
- started storing last played time in cc_files
- db column (lptime) already existed but was not being used before this
- will use this as a criteria for smart playlists
2012-07-19 18:07:39 -04:00
Martin Konecny 583695f98c CC-430: Audio normalization (Replaygain Support)
-values are now written through to database
2012-07-15 22:22:42 -04:00
Martin Konecny b4f1cc13c0 CC-430: Audio normalization (Replaygain Support)
make code simpler (don't download database to file)
2012-07-15 22:19:16 -04:00
Martin Konecny 794cf2c845 CC-4090: Make code style PSR compliant
-run psr-cs-fixer
2012-07-15 21:17:13 -04:00
Martin Konecny f0f033b4fb CC-430: Audio normalization (Replaygain Support) 2012-07-12 17:58:29 -04:00
Martin Konecny ee3447f903 CC-4090: Make code style PSR compliant
-User.php
-removed all trailing whitespace
2012-07-10 18:51:32 -04:00
Martin Konecny ce698d4123 CC-430: Audio normalization (Replaygain Support)
-Added support on server side
2012-07-05 22:37:40 -04:00
denise 335dd1516b Merge branch '2.1.x' into devel
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
2012-06-29 10:57:14 -04:00
James d13ade977a CC-4034: Files on Watched folder shouldn't be deleted physically.
- fixed
2012-06-28 13:28:45 -04:00
Martin Konecny a63b765621 CC-4011: System -> Media Folders: Changing page will stop removing a watched folder with lots of files (50,000)
-Changed doing 50,000 database calls to 1.
2012-06-25 23:40:07 -04:00
denise 8005049bdc CC-3996: Undefined offset: 0 in StoredFile.php (Apache error)
-fixed
2012-06-25 12:22:34 -04:00
denise f029124447 Merge branch '2.1.x' into devel 2012-06-19 17:57:27 -04:00
denise b742033647 - Add Media: fix to accept audio files with ID3 tags liquidsoap complains about 2012-06-18 12:24:13 -04:00
denise f3d0f06397 - Add Media: reverted change to testing audo file with liquidsoap (will fix in 2.1.x) 2012-06-18 12:00:54 -04:00
denise 186b8ef1c2 CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
-fixed
2012-06-15 16:48:51 -04:00
denise 55634ddd46 CC-3928: Use liquidsoap to test whether file is playable on upload.
-done
-tests return value and output
2012-06-12 15:41:10 -04:00
Martin Konecny d4b1fc711e CC-3928: Use liquidsoap to test whether file is playable on upload.
-change to wording
2012-06-05 22:30:17 -04:00
denise 74e9f70506 CC-3928: Use liquidsoap to test whether file is playable on upload.
-done
2012-06-05 11:24:40 -04:00
Martin Konecny b6446442ba CC-3917: record_date field in recorded shows causing problem
-fixed
2012-06-04 11:43:41 -04:00
Martin Konecny 1921b26943 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-15 15:17:58 -04:00
Martin Konecny 1245d1e860 CC-3826: Couldn't find constant MDATA_KEY_RECORD_DATE
-fixed in a better way
2012-05-15 15:17:19 -04:00
denise b96f0590b1 CC-3808: No tooltip for preview playlist
-done
2012-05-15 15:10:56 -04:00
Naomi Aro 5620c2b85e CC-3772: On upgrade, make sure values in cc_files year have correct format
removed to_date postgresql function, bad metadata will cause this to fail.
2012-05-10 17:01:22 +02:00
Martin Konecny 80861bc643 CC-3771: year column in cc_files sometimes has values greater than 2^31-1, which causes postgresql to fail when trying to convert this to a year.
-better way to do this...
2012-05-09 01:18:58 -04:00
Martin Konecny 1d245ed79d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-07 14:26:00 -04:00
Martin Konecny c466b946a0 CC-3770: Make sure files in /srv/airtime/stor have world-readable permissions.
-change read permissions on files right after they're uploaded
2012-05-07 13:12:20 -04:00
denise bdf314b93a SAAS-157: Automated metrics: gather info about soundcloud usage
- put DB query inside try-catch
2012-05-07 12:12:08 -04:00
denise 678e573e7a SAAS-157: Automated metrics: gather info about soundcloud usage
-done
2012-05-07 11:24:40 -04:00
Martin Konecny bd6686a243 CC-3771: year column in cc_files sometimes has values greater than 2^31-1, which causes postgresql to fail when trying to convert this to a year.
fixed
2012-05-06 20:45:52 -04:00
Martin Konecny 6135660d0f CC-3771: year column in cc_files sometimes has values greater than 2^31-1, which causes postgresql to fail when trying to convert this to a year. 2012-05-06 20:05:14 -04:00
Martin Konecny 9092b7f725 CC-3764: Media Library->Edit Metadata: Throw exception when trying to edit metadata
-fixed
2012-05-04 12:47:29 -04:00
Martin Konecny 65e771d189 CC-3756: Cannot download/preview tracks in Media Library
-Fixed
2012-05-04 12:02:42 -04:00
denise ff6e2a2e5a CC-3747: Metadata popup should also show the filepath of the track
-fixed
2012-05-02 16:52:49 -04:00
denise 0c337fe430 CC-3747: Metadata popup should also show the filepath of the track
-done
2012-05-01 12:39:56 -04:00
denise 4477ac02e7 CC-3677: Tooltips improvements
-done
2012-04-30 16:20:23 -04:00
Martin Konecny 6e755b000b CC-3707: copy files to stor, extra forwardslash
-fixed
2012-04-24 16:15:22 -04:00
paul.baranowski 235997c616 CC-1927 Remove PEAR DB
* Removed the DEB package "php-db" from the full install script as it is
  no longer needed.
* Missed one call to PEAR::isError()
2012-04-19 16:35:19 -04:00
paul.baranowski 96b010e7f0 CC-1927 Remove PEAR DB
* Removed all traces of PEAR functions.
* Fixed AirtimeInstall::GetVersionInstalled() to return the correct answer
  even when it cant connect to the database.  Also fixed return value to
  be consistent on failure.
* Fixed phone_home_stat.php and soundcloud-uploader.php
2012-04-19 16:35:19 -04:00
paul.baranowski 7f78a7f663 CC-1927: Remove PEAR DB
First pass through the model classes to remove use of $CC_DBC.
Web application is working.
There are still other parts of the app that use PEAR DB.
2012-04-19 16:33:05 -04:00
James 3ae8eb9105 CC-3622: When changing location of the stor directory, the "organize"
subfolder is not being created

- fixed
2012-04-13 15:09:59 -04:00
James fd700c225c CC-3607: MediaFolder->deattaching the MediaFolder does not trigger the files
be remover from server

- RecallByMd5() was checking against all cc_files entries which includes
 deleted files
2012-04-12 17:37:14 -04:00
James c6ad9462af CC-3634: Media Folder: if file was deleted from file system, and the file
was scheduled in the future, it wasn't getting deleted from Airtime

- fixed a bug
2012-04-12 17:18:45 -04:00
James 53e37ee826 CC-3634: Media Folder: if file was deleted from file system, and the file was
scheduled in the future, it wasn't getting deleted from AIrtime

- fixed
2012-04-12 16:17:19 -04:00
James c90a8006cc CC-3622: When changing location of the stor directory, the "organize"
ubfolder is not being created.

- I confirmed that Airtime was creating organize folder upon chaning stor dir
but, still added a code which make sure it create organize folder if it's
missing somehow.
2012-04-12 12:22:20 -04:00
James 4cb64b0eb1 CC-3569: Update total track metric to only report tracks that exist
- fixed
2012-04-03 15:53:55 -04:00
Martin Konecny 3f713ca8dc CC-3426: apache log errors from plupload
-fixed
2012-03-26 19:00:40 -04:00
Daniel f399c7adab CC-3426: apache log errors from plupload
- Updated code so the errors in the log are fixed.
- Performed sanity test on large file size that exceed disk space
  and normal uploads that are small enough to be copied
2012-03-14 11:14:22 -04:00
Naomi Aro 3145c24ba2 CC-3174 : showbuilder
changing queries for datatables to use the Datatables model class.
2012-03-12 15:32:24 +01:00
Naomi Aro fe3c340a90 CC-3174 : showbuilder
making library table only scroll on the table part.
2012-03-07 18:27:32 +01:00
Daniel 709e117f41 CC-3391: Audio Preview cannot play tracks with commas in their filename
- The content distribution header filename attribute, wasn't properly quoted for inline content. This causes a bug for files with comma names.
- changed the play button in library back to the speaker icon
- removed some dead code preview_player.js
- removed the file name attribute, will need better approch to presenting the user with audio information.
2012-03-06 13:50:07 -05:00
Daniel a09b63b8d0 CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
- removed javascript from php files
- removed preview.js
- fixed small problems with editor
2012-03-05 19:00:14 -05:00
Daniel a246f85a5b CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
- Merged with devel, removed js from StoredFile.php
2012-03-05 19:00:14 -05:00
Daniel 51f004933b CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
- updated icon in library
2012-03-05 19:00:14 -05:00
Daniel 2de81c6027 CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
- updated logic removed when doing a rebase with devel
2012-03-05 19:00:14 -05:00
Daniel b8452928da CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
- updated player ui so it matches demo code
- can play any song from the library or playlist builder, but not very usable
2012-03-05 19:00:14 -05:00
Daniel 1aab682104 CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
- updates to audio preview on library and playlist
2012-03-05 19:00:14 -05:00
Daniel 0b9ed43e50 Updated library functionality and started with playlist work. 2012-03-05 19:00:14 -05:00
Daniel 15552319aa CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
- updated formating of file, removed tabs in favour of four spaces for some lines.
2012-02-28 13:47:57 -05:00
Naomi Aro f01a872bea CC-3174 : showbuilder
remove extra ;
2012-02-27 14:59:48 +01:00
Naomi Aro 318a0345bb CC-3174 : showbuilder
make sure recorded files only display year in the table.
2012-02-27 14:59:16 +01:00
Naomi Aro 36cf8ded18 CC-3174 : showbuilder
change columns sample rate and bitrate to be integers so they sort properly in the library.
2012-02-27 12:07:46 +01:00
Naomi Aro 4286de7b42 CC-3174 : showbuilder
bit rate & sample rate formatters
2012-02-24 18:22:07 +01:00
Naomi Aro c6edfc3208 CC-3174 : showbuilder
removing columns that no longer should be in cc_schedule.

changing cc_files length column to be of type interval.

adding length formatter to showbuilder.
2012-02-24 16:05:01 +01:00
Naomi Aro 19d13889af CC-3351 : Track length should only show to tenths of a second in the library
created a length formatter to use in multiple places.
2012-02-24 15:07:04 +01:00
Naomi Aro 28bb97acfa CC-3174 : showbuilder
allow user to filter library by

files/playlists or all.
2012-02-24 00:55:20 +01:00
Naomi Aro bb49914294 CC-3174 : showbuilder
bug fixed in datatables - thanks Allan!
2012-02-22 21:09:24 +01:00
Naomi Aro d4c7b832c9 CC-3174 : showbuilder
fixing up library table to include all interesting columns if a user would like to choose to see them.
query is done with propel.
2012-02-22 18:38:33 +01:00
Naomi Aro 0ba3049528 CC-3174 : showbuilder
removing old scheduling method code to avoid confusion.
2012-02-22 13:19:49 +01:00
Naomi Aro 17c3cdcfb2 CC-3174 : showbuilder
fix ordering problem with track column.
2012-02-20 11:41:44 +01:00
Naomi Aro ac11d8bcf6 Merge branch 'CC-3174' into devel
Conflicts:
	airtime_mvc/application/models/StoredFile.php
2012-02-17 11:50:49 +01:00
Naomi Aro b2d0565ec4 CC-3174 : showbuilder
checking to make sure UI is up to date with db
2012-02-16 19:46:14 +01:00
Daniel 190490d6f4 CC-3329: Library: Add "track number" to the list of available columns to show (was in 1.9, disappeared in 2.0)
- updated the view columns to include track_number from db as track
- updated sql query to include track_number from db
2012-02-15 11:21:21 -05:00
Daniel 14cd9ed0e9 CC-323: Show appropriate error message if disk is full when attempting to upload files via the web UI
- Updated the StoreFile logic so it won't die while trying to copy a file, and instead pass error messages to the controller which can decide if it wants to die, which 	I've set ApiController and PluploadController todo on receipt of error code.
2012-02-14 18:12:29 -05:00
Daniel 9fc0ed198e CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
- moved the logic used to test that the destination folder has enought space to copy the given audio file into.
2012-02-09 12:45:39 -05:00
Daniel cdc72beb6b CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
- Updated the code to get the remaining free disk space and compare it to the size of the file to be uploaded and notify the user if the file is larger then diskspace.
2012-02-08 17:56:26 -05:00
Naomi Aro 251f3a3e5b CC-3174 : showbuilder
testing newly returned times, fixing the secondsToPlaylistTime method
to not drop subsecond precision for the calculations.
2012-02-07 14:58:16 +01:00
Naomi Aro 42452b8ea9 Merge branch 'CC-3174' into devel
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Playlist.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/airtime/library/spl.js
2012-02-06 11:07:10 +01:00
Naomi Aro 6c2475bf1f CC-3174 : showbuilder
mostly done with new context menu, need to finish
add/delete button actions on lib table for both screens.
2012-02-05 18:19:22 +01:00