Commit Graph

342 Commits

Author SHA1 Message Date
martin ff2fcde7c0 CC-2567: Install api_client separately from pypo 2011-07-19 12:07:31 -04:00
Naomi Aro 152c87f099 changes to bootstrip for filename. 2011-07-19 17:45:23 +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
martin e397db972d CC-2567: Install api_client separately from pypo
-initial commit...
2011-07-18 23:25:33 -04:00
martin bd183125da CC-2279: Upgrade script for converting stor directory to new format
-move media-monitor python upgrade script to upgrade dir
2011-07-18 17:21:14 -04:00
James e19bf33f51 temp comit 2011-07-18 17:04:46 -04:00
martin 0e82f2a606 CC-2560: Make sure new watched dirs do not contain existing
watched dirs (and stor dir) and vice-versa.

-fixed
2011-07-18 15:27:22 -04: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
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
Naomi Aro 91feeaf84d CC-2557 : Need to keep tmp file dictionary to change ogg metadata on the server side 2011-07-18 12:49:45 +02:00
Naomi Aro e369ab8dee CC-2505 : Media monitor doesn't delete some tracks from the Airtime server due to weird characters in file names
seems to fix unicode problems I was having.
2011-07-18 12:05:16 +02:00
mkonecny 460989e6bc -cleanup old process code 2011-07-15 20:28:00 -04:00
martin 187d3a5e92 -using threads instead of processes. 2011-07-15 19:49:35 -04:00
James 3e6ca78253 CC-2490: Recorded show file is missing
- fixed.
2011-07-15 16:15:09 -04:00
martin ec75af194b CC-2279: Upgrade script for converting stor directory to new format
-escape strings before inserting into database
2011-07-14 21:31:02 -04:00
martin 07b1686643 CC-2279: Upgrade script for converting stor directory to new format
-even more fixes..
2011-07-14 21:06:35 -04:00
martin d52857ea8b CC-2279: Upgrade script for converting stor directory to new format
-further fixes..
2011-07-14 17:13:11 -04:00
martin 9f3218b8d9 CC-2279: Upgrade script for converting stor directory to new format
-further fixes
2011-07-14 16:39:18 -04:00
martin 621c85b1df CC-2279: Upgrade script for converting stor directory to new format
-in progress...
2011-07-14 15:31:19 -04:00
martin 75e56034e4 CC-2279: Upgrade script for converting stor directory to new format
-refactoring...
2011-07-14 12:06:46 -04:00
martin 29869c175a CC-2279: Upgrade script for converting stor directory to new format
-refactor media-monitor
2011-07-14 12:06:46 -04:00
martin 83f253dffe -fixed "mported" bug in media-monitor-bootstrap 2011-07-13 15:16:27 -04:00
martin 49c399b7a8 -small code cleanup.. 2011-07-12 17:39:15 -04:00
martin 6972150b19 -fixed bug with moving from stor to stor/organize, and having
duplicate files appear.
2011-07-12 16:10:54 -04:00
martin 7c98d90e5e CC-2530: Media monitor:Dont use hidden files
-addressed issues raised.
2011-07-12 15:06:49 -04:00
martin ed8d247b17 CC-2514: new airtime-import
-airtime-import for install and upgrade scripts
2011-07-12 12:18:29 -04:00
martin 0c1f75f01e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-11 16:14:53 -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 5095cae0f3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-11 15:45:26 -04:00
james dc2dd3eb97 CC-2514:New airtime-import script
- on -c, -copy, -l, -link, following msg will be displayed

james@james-P35-DS3L:~/src/airtime/python_apps$ python airtime-import.py -l sdfdf
usage: airtime-import.py [-h] [-c] [-l] {move,storage-dir,copy,watch} ...

This script let you do following operations
- import files
- add/remove/list watch folders
- set default storage folder

positional arguments:
  {move,storage-dir,copy,watch}
                        sub-command help
    copy                copy file
    move                move file
    watch               operations on watch directory
    storage-dir         operations on storage directory

optional arguments:
  -h, --help            show this help message and exit
  -c, --copy            copy file(deprecated. Use "copy" sub-command)
  -l, --link            link file(deprecated. Use "watch" sub-command)
james@james-P35-DS3L:~/src/airtime/python_apps$
2011-07-11 15:45:07 -04:00
martin 2659932cfb -added new exception for when apache isn't responding 2011-07-11 14:44:23 -04:00
martin 8bfb7c1afe Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-11 14:24:23 -04:00
martin a8b3745bf4 -found another unicode encoding error
-code cleanup
2011-07-11 14:24:08 -04:00
james e5baf19c71 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-11 14:01:12 -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
martin 66115de5ea Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-11 12:21:52 -04:00
martin ed41969f0e -touch index file after each inotify event
-make sure to normalize all paths, since we are string comparing them
-remove all empty dirs after moving files out of them
2011-07-11 12:21:30 -04:00
james ece84a04c5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-08 17:46:50 -04:00
james 6ad3bb306e CC-2514:new-airtime-import-script
- changing set-storage-dir command to storage-dir
- adding sub command 'set' and 'get'
2011-07-08 17:46:07 -04:00
james c0a68e20c2 CC-2514:New airtime-import script
- initial commit.
2011-07-08 17:14:01 -04:00
martin 98173d5e53 CC-2480: media-monitor needs to ensure permissions before importing
-fixed
2011-07-08 17:03:49 -04:00
martin 04e4eb7fc1 CC-2523: Media monitor doesn't import audio tracks hidden in folders
which were copied to

-fixed
2011-07-08 16:01:11 -04:00
martin 80115856ba -use alsa as default output for liquidsoap 2011-07-08 12:21:36 -04:00
martin 012aa51f3a CC-2272: Ability to change storage directory location
-fix SQL syntax error
2011-07-08 10:12:33 -04:00
martin 9d994aa225 -compare relative paths instead of full paths on bootup 2011-07-07 17:41:08 -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
martin 75e9ecf985 CC-2272: Ability to change storage directory location
make sure imported and organize dirs are created
2011-07-06 15:58:49 -04:00
martin 67df619c90 CC-2272: Ability to change storage directory location
-done
2011-07-06 14:42:43 -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
martin d23a6ef0fe -liquidsoap beta2 binaries 2011-07-06 11:40:30 -04:00
martin 3dc1380fab -updated liquidsoap scripts + library to be liquidsoap-beta2 compliant 2011-07-06 11:14:51 -04:00
martin 022b013dd2 CC-2421: Filename formatting tweaks
-cleaned up
2011-07-06 10:29:08 -04:00
martin 7a4fce1167 CC-2497: Media Monitor: doesn't detect some file change
-properly handle changing file extensions in the stor dir.
2011-07-05 19:06:12 -04:00
martin a44a7d71f2 CC-1799 : Live Studio Playout from media library (pytagsfs)
-dont send delete event if file was deleted from "organize" dir.
2011-07-05 18:48:00 -04:00
martin 66b1924968 CC-1799 : Live Studio Playout from media library (pytagsfs)
-things are starting to work nicely...
2011-07-05 18:43:22 -04:00
martin 3424dcc12d CC-1799 : Live Studio Playout from media library (pytagsfs)
-code cleanup
2011-07-05 17:45:56 -04:00
martin 2be05a8004 CC-1799 : Live Studio Playout from media library (pytagsfs)
-code cleanup, refactoring, and files moved from a watched-dir
 to a non-watched dir are now properly handled
2011-07-05 15:48:50 -04:00
martin 275dfd0cd0 -clean up comments.. 2011-07-04 19:01:06 -04:00
martin 0757fda479 cc-2419: media monitor import on startup
-fixed bug related due to pair not being returned (only scalar value returned)
2011-07-04 18:38:16 -04:00
martin 805d3616fe cc-2419: media monitor import on startup
-fixed support for watched dirs #2
2011-07-04 17:59:02 -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 429d8b234c cc-2419: media monitor import on startup
-new method of querying db on startup.
2011-07-04 14:29:09 -04:00
martin d4e4090429 cc-2419: media monitor import on start
-send removed file list before added file list
2011-06-30 18:07:12 -04:00
martin 0f67db9ed7 cc-2419 media monitor import on start 2011-06-30 18:07:12 -04:00
martin 851d5c12b2 cc-2419: media monitor import on start
-files importing working...
2011-06-30 18:07:12 -04:00
martin 778b645a69 CC-2419: Media monitor does not import files that already existed in /srv/airtime/stor
-work in progress
2011-06-30 18:06:43 -04:00
martin 397007efee cc-2419: media monitor import on start
-initial check-in
2011-06-30 18:06:07 -04:00
martin 4f804b17c7 cc-2419: media monitor import on start
-initial check-in
2011-06-30 18:05:19 -04:00
martin 4ab7523a84 CC-2419: Media monitor does not import files that already existed in /srv/airtime/stor
-work in progress
2011-06-30 18:03:44 -04:00
martin 3335ff703a cc-2419: media monitor import on start
-initial check-in
2011-06-30 18:03:43 -04:00
martin 89dd251782 cc-2419: media monitor import on start
-initial check-in
2011-06-30 18:02:58 -04:00
Naomi Aro ee92c5cfb4 cc-1799 : Filesystem
notifier doesn't need to be made a daemon.
2011-06-29 10:46:46 +02:00
martin 7e1dbf8085 -fix exception when rabbitmq wasnt started before media-monitor 2011-06-28 22:09:25 -04:00
martin 3b6723246f -make main thread not exit after spawning new processes 2011-06-28 13:38:34 -04:00
martin e8c36be242 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-28 12:50:15 -04:00
martin 00910ae346 -clean up imports in MediaMonitor.py 2011-06-28 12:50:05 -04:00
Naomi Aro 33a247c4de cc-1799 : Filesystem
handling replacing of files in gui, need to handle closing down processes on exit.
2011-06-28 18:40:38 +02:00
Naomi Aro 0111fd5725 cc-1799 : Filesystem
incorrect variable.
2011-06-28 15:04:03 +02:00
Naomi Aro 164c06a5e5 CC-2441 : media-monitor exception on import, cancels all importing
checking if file md fails.
2011-06-28 14:34:16 +02:00
Naomi Aro 4eff714f32 cc-1799 : Filesystem
huge speed increase with multi processes.
2011-06-28 12:42:06 +02:00
Naomi Aro 4c8e6a04ac cc-1799 : Filesystem
running Notifier as a daemon, allows parallel processing of event queue at all times.
2011-06-28 11:39:54 +02:00
martin 1b2800564b CC-2459: Multiple instances of media-monitor running after it is shutdown.
-fixed
2011-06-27 16:56:20 -04:00
Naomi Aro f3746ff197 cc-1799 : filesystem 2011-06-27 18:30:52 +02:00
martin 10c7c0b5fd CC-2419: Media monitor does not import files that already existed in /srv/airtime/stor
-problem where media-monitor froze on startup if rabbitmq
 wasn't running is fixed (now consistent with pypo)
2011-06-24 15:13:47 -04:00
Naomi Aro 0a78605633 cc-1799 : Filesystem
fixing track formatting if there's no track number.
2011-06-24 18:47:27 +02:00
Naomi Aro b2e52a76c9 CC-2421 : Filename formatting tweaks 2011-06-24 17:41:31 +02:00
Naomi Aro 7e5c514638 CC-2272 : Ability to change storage directory location
copying each thing from the direcotyr separately to avoid overwriting anything that already exists in the new stor.
2011-06-24 16:47:43 +02:00
Naomi Aro a27924451d cc-1799 : Filesystem
fix for watched folders
2011-06-24 15:49:56 +02:00
Naomi Aro 4c3af0b44d cc-1799 : Filesystem
putting in up to 6 subsecond precision
2011-06-24 15:15:53 +02:00
Naomi Aro a376413737 cc-1799 : Filesystem
adding timing, finding request to localhost taking 250-500ms too slow.
2011-06-24 14:50:32 +02:00
Naomi Aro 59a11663cf cc-1799 : Filesystem
avoiding useless calls to airtime about renamed files.
2011-06-24 12:47:26 +02:00
Naomi Aro 3f739458cd CC-2421 : Filename formatting tweaks
padding track numbers with 1 leading zero if 0-9

formatting bitrate 128000 as 128kbps
2011-06-24 11:20:42 +02:00
martin cf54434f5e CC-2435: Recorded show gets manually cancelled
-added 3 second delay before actually cancelling
2011-06-23 16:54:59 -04:00
Naomi Aro 66e73b930d Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel 2011-06-23 21:22:20 +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
martin ecddb33b09 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-23 14:06:10 -04:00
martin 95b69b403b CC-2429: Liquidsoap should be run with higher priority
-On a range of -20 to 20, where -20 gives the highest
 priority, set Liquidsoap nice to -15.
2011-06-23 14:06:02 -04: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