Commit Graph

296 Commits

Author SHA1 Message Date
James cef2361bc2 - removed cue_file because it's handled by liquidsoap itself. 2011-07-19 16:31:02 -04:00
James 107c100cc4 Merge branch 'devel' of dev.sourcefabric.org:airtime into cc-2528-use-virtualenv-for-installing
Conflicts:
	python_apps/media-monitor/airtime-media-monitor
2011-07-19 15:09:55 -04:00
James b4e887eb2d temp comit 2011-07-19 15:06:35 -04:00
martin 0e3bae4b5c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-19 12:07:41 -04:00
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