Commit Graph

592 Commits

Author SHA1 Message Date
martin 659e412eb7 CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder
-progress being made
2011-09-16 17:51:28 -04:00
James 7c94734277 CC-2810: More chmnod fixes for scripts
- removed shebang from .py files
- removed cron folder and its content as we don't use them
- .js files are from 3rd party(datatable) so we should leave them as they are
2011-09-16 14:01:23 -04:00
martin b5684bb5b1 Merge branch '1.9.1' into devel
Conflicts:
	install_full/ubuntu/airtime-full-install
	utils/airtime-update-db-settings.py
2011-09-15 17:44:07 -04:00
James c15d599dba CC-2827: Python shebangs should specify the version python2.6
- done
2011-09-15 12:28:31 -04:00
martin 583a5faf72 CC-2750: Ability to query health status for pypo, liquidsoap,
media monitor, and recorder
2011-09-13 18:43:16 -04:00
martin 1555c83668 CC-2750: Ability to query health status for pypo, liquidsoap,
media monitor, and recorder
-cleanup
2011-09-13 17:20:34 -04:00
martin 2c2bb86698 CC-2750: Ability to query health status for pypo,
liquidsoap, media monitor, and recorder

-fixed rabbitmq not delivering messages
2011-09-13 14:56:24 -04:00
martin 0546633ac7 CC-2750:Ability to query health status for pypo, liquidsoap, media monitor, and recorder 2011-09-12 17:15:46 -04:00
martin 1ba200441e CC-2792: installing Airtime 2.0 beta fails on ubuntu 10.04 64 bit
-possibly fixed
2011-09-09 15:38:14 -04:00
martin 9c7bab616d Merge branch '1.9.1' into devel
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/controllers/ScheduleController.php
	install_minimal/airtime-install
	install_minimal/include/AirtimeInstall.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py
2011-09-09 15:07:43 -04:00
martin f1c77845ea CC-2783: Investigate Pypo taking 100% CPU on production system
-fixed
2011-09-09 14:49:12 -04:00
martin ace98569ed CC-2783: Investigate Pypo taking 100% CPU on production system
-fixed
2011-09-09 14:11:56 -04:00
martin 53306dffa4 -update version string to 1.9.4 2011-09-08 15:18:54 -04:00
martin 611630d4eb CC-2788: Airtime uses both /bin/bash and /bin/sh in different scripts
-forgot notify.sh
2011-09-08 13:44:33 -04:00
martin 805e358d9c CC-2788: Airtime uses both /bin/bash and /bin/sh in different scripts
-fixed
2011-09-08 12:36:51 -04:00
martin 6dab211a12 CC-2784: Stopping rabbitmq-server causes pypo CPU usage to increase dramatically
-fixed
2011-09-08 12:17:42 -04:00
martin 03efb8f293 CC-2760: Remove shebangs from files that don't need them, fix chmod of files
-done
2011-09-06 19:06:13 -04:00
James abee16ba4a CC-2747: removing debug code
- fixed
2011-09-01 16:07:13 -04:00
James 610b7a6d2c CC-2747: removing debug code
- done
2011-09-01 16:06:01 -04:00
James 39b688c256 CC-2661: Uptrade script for stream config feature
- codes for conserving user's liquidsoap.cfg and porting into new stream
setting config.
- extra fix: fixed a bug with shoutcast(default value has to be set for
some variables)
2011-09-01 16:02:06 -04:00
James 17e7e9b80a CC-2089: create "cancel show" command for pypo
- removed comments
2011-08-31 16:33:40 -04:00
James fefbd9ac79 Merge branch '1.9.1' into devel 2011-08-31 16:23:32 -04:00
James 22c9416c31 CC-2747: When metadata contains non utf-8 encoding, we should handle it
- we cover some cases with cp1252 encoding for now.
- extra fix: Logging.php (copied from 2.0.0)
2011-08-31 14:46:21 -04:00
James c460519a88 Merge branch '1.9.1' into devel 2011-08-31 10:15:00 -04:00
James cab2a0f8f4 CC-2661: Upgrade script for steam config feature
- done
2011-08-29 17:44:28 -04:00
martin 8b0b5851f6 -fix typo in recorder.py 2011-08-29 14:43:30 -04:00
James 83bba9532e CC-2089: create "cancel show" command for pypo
- done
2011-08-29 11:54:44 -04:00
james 59a3076e42 CC-2726: monit monitor and unmonitor order change
- fixed
2011-08-26 15:44:19 -04:00
james d992457bd5 CC-2607: handling comment
- each line read is trimed now
- xtra bug fixed:
- bug on merging with 1.9.3
- state_change_restart array is filled with info for displaying
purpose
2011-08-26 13:13:02 -04:00
james 56ad8c6b3d Merge branch '1.9.1' into devel
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypofetch.py
2011-08-26 12:56:10 -04:00
James 2901a7a7eb - Version string change for 1.9.3 2011-08-25 17:02:56 -04:00
James 14e1e15830 CC-2733: Resume play is broken: mp3 files skipped
- killing old pypo and liquidsoap processes
- comparing mime type againt old type of mime
2011-08-25 16:32:57 -04:00
martin fd64c917d5 CC-2728: Liquidsoap doesn't play mono files
-fixed
2011-08-24 18:13:15 -04:00
James 95cb1858c7 CC-2726: create custom restart script for the Monit to use
- using Monit restart instead of start in full insatll script
- create new "monit-restart" function in pypo init.d
2011-08-24 17:17:28 -04:00
James 58837ff89b CC-2706: Streams should have a username field
- adding "User" field on stream setting form
- change key name from "output_s1" to "s1_output" format to be consistent
- changed order of inserting in default.sql file
- hiding username field on shoutcast selection
- liquidsoap and pypo takes care of user field input
2011-08-24 17:13:56 -04:00
James 9eb21cb327 Merge branch '1.9.1' into devel
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/models/Preference.php
	install_minimal/include/airtime-db-install.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
2011-08-24 10:30:59 -04:00
martin 4213b05a8d cc-2666: separate components
-virtualenv install file
2011-08-23 12:43:50 -04:00
martin 4689484cd2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-23 12:31:37 -04:00
martin 4fe3baf591 cc-2666: try separating compononents
-moved python-virtualenv install to separate install file,
 so each component can install virtualenv
2011-08-23 12:31:27 -04:00
James 88d3fa73be CC-2721: Pypo doesn't restart when it gets new stream setting
- fixed
2011-08-23 11:13:06 -04:00
James 078aa1d05d CC-2607: Handling comments
- It handles comment lines
- adding warning text telling not to edit liquidsoap.cfg file
2011-08-23 10:12:18 -04:00
martin d7830785df CC-2717: Media Monitor forgets about watched directories after being restarted 2011-08-22 20:41:34 -04:00
martin ca65c32e1c CC-2716: Moving Directory->Media Monitor exception
-fixed
2011-08-22 20:19:14 -04:00
James 376ae1370c CC-2693: Copy PHP files to /usr/shar/airtime instead of /var/www/airtime
- done for new install
- upgrade need some more work
2011-08-22 12:03:09 -04:00
James a73612afd2 CC-2607: Ability to adjust stream bitrate,type,etc from the UI interface
- Modified "Descriptioin" to "Name/Description"
- mount point is not append with extension anymore
- fix on auto generated stream url
- name is used in shoutcast
2011-08-19 16:35:23 -04:00
James 873f7e1dae CC-2698: upgrading fail from 1.8.2->1.9.0
- fixed version string
- deleting entries from cc_schedule before adding "ON CASCADE" constraint
2011-08-18 15:32:33 -04:00
James 38256de606 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-18 13:54:17 -04:00
James cf55e92aa3 CC-2607: Ability to adjust stream bitrate, type, etc from UI
- removed debug code from NowPlayingController
- New Form for streamsetting
- Action created in PreferenceController
2011-08-18 13:53:12 -04:00
martin 58c1eff283 CC-2689: Build latest liquidsoap version
-Done
2011-08-17 18:34:45 -04:00
martin 57834097e8 -remove unneeded -dev packages from install
-remove timezone check from pypo-fetch
2011-08-17 15:50:28 -04:00
martin 0cb9947980 cc-2683: not using utc time
-clean up recorder file
2011-08-16 16:49:35 -04:00
martin e392c8437a cc-2683: not using utc time
-clean up recorder file
2011-08-16 16:36:31 -04:00
martin 41fd5f2543 cc-2683: not using utc time
-context menu showing options display correctly
-edit show fills in correctly
-Now Playing view shows up correctly
2011-08-16 15:07:55 -04:00
martin 03f8163764 cc-2682: not using pypo time
-Remove messages being sent to pypo to change its timezone
-fix time conversion bug in pypo-push
2011-08-16 15:07:55 -04:00
martin 61e1c56244 cc-2683-not-using-utc-time
-pypo now works in UTC time
2011-08-16 15:07:54 -04:00
James 4f2b2dba6d CC-2607: Abilitiy to adjust stream bitrate, type, etc from the UI
interface

- dummy page "Stream Setting" page for the test
- StreamSetting model is added
- set owner and group as 'pypo' for liquidsoap.cfg
- pypofech handle 'update_stream_setting' command
2011-08-15 16:10:46 -04:00
James e18c0903cb -version string changes 2011-08-15 11:11:55 -04:00
James 75d0e64bdd Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-15 11:10:20 -04:00
James 9cad6fe766 -version string changes 2011-08-15 11:10:01 -04:00
martin b538f1cc82 CC-1942: Add ability to set timezone in preferences
-change timezone in python
2011-08-15 10:06:42 -04:00
James 13285fdd63 CC-2607: Ability to adjust stream bitrate, type, etc from UI interface
- created table cc_stream_setting and it's initial entries
- pypo installation will generate liquidsoap.cfg on install time
based on information on cc_stream_setting table
2011-08-12 15:19:30 -04:00
James 1c81d0d238 CC-2631: Convert pypo to accept commands from RabbitMQ
- initial commit
2011-08-11 16:20:20 -04:00
James 4125f83ae7 CC-2590: Make bitrate for liquidsoap adjustable, support multiple
stream

- done
2011-08-11 14:43:45 -04:00
james 3dca3fd800 CC-2590: support multiple stream on liquidsoap
- temp commit
2011-08-10 18:04:48 -04:00
James 968c0f96a2 CC-2651: import idicator
- Threshold is 10 seconds
- record timestamp once every 5 seconds
- "File import inprogress..." displays above search box
- pyinotify read_freq changed to 0.1 from 1
2011-08-09 10:40:10 -04:00
James 773f948d58 - some unintended changes were pushed to devel 2011-08-08 16:26:18 -04:00
James 3a2d736b1c CC-2633: removing to_unicode()
- removed to_unicode() function calls where it's not neccessary.
2011-08-08 10:41:11 -04:00
James 8995e828ff CC-2633: added new encode_to()
- added encode_to() to api_client
- replaced .encode() with new encode_to()
2011-08-05 15:12:55 -04:00
Naomi Aro a199585cb9 CC-2647 : Check MD will fit db constraints in Airtime 2011-08-05 15:12:55 -04:00
James 375cfb2c2d CC-2633: moving to_unicode() to api_client.py
- move to_unicode() to api_client.py
- fixed how it decodes path in airtime-import.py
2011-08-05 15:12:55 -04:00
Naomi Aro e2a5344e6e removing useless line 2011-08-05 15:12:55 -04:00
James 938c503e85 CC-2633: media monitor crashes on non-ascii files and metadata
- fixed bug for the case where mutagen return None for metadata
- fixed bug for non-ascii files and metadata
2011-08-05 15:12:55 -04:00
James c79fb81c37 - temp commit 2011-08-03 10:05:42 -04:00
Naomi Aro 7e64e1ba22 CC-2612 : Upgrade: Push DB metadata into the file before upgrade
testing saving non ascii characters to file.
2011-08-01 18:10:50 +02:00
Naomi Aro aa29afc438 CC-2612 : Upgrade: Push DB metadata into the file before upgrade 2011-08-01 16:29:41 +02:00
Naomi Aro 0fba75b9ad CC-2612 : Upgrade: Push DB metadata into the file before upgrade 2011-08-01 13:27:58 +02:00
Naomi Aro d606b4b173 CC-2612 : Upgrade: Push DB metadata into the file before upgrade 2011-08-01 12:22:20 +02:00
Naomi Aro 1e6d9efad2 CC-2612 : Upgrade: Push DB metadata into the file before upgrade
might have too much data to log it.
2011-07-29 11:57:06 +02:00
Naomi Aro 137ca79db8 CC-2600 : Upgrading from 1.8->1.9 wipe all shows content 2011-07-28 12:21:20 +02:00
Naomi Aro 1ef785a0fd CC-2602 : Live show record silence
adding pypo to groups pulse and pulse-access
2011-07-27 13:00:07 +02:00
James b46abe0234 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-26 12:42:56 -04:00
James 9da83197a1 CC-2552: removing liquidsoap.cfg from /usr/lib/...
-done
2011-07-26 12:42:39 -04:00
Naomi Aro 8f5e2a6739 CC-2590 : Make bitrate for liquidsoap and show-recorder adjustable from the config file 2011-07-26 18:39:26 +02:00
Naomi Aro f0bf7c00c3 CC-2590 : Make bitrate for liquidsoap and show-recorder adjustable from the config file 2011-07-26 16:21:20 +02:00
Naomi Aro 1366b159f2 CC-2594 : Set File permissions on organized/imported when moving stor dir to have www-data as owner etc 2011-07-26 12:38:19 +02:00
Naomi Aro 31ba80e07b CC-2589 : Create "organize" dir when upgrading
need to set correct permissions/owner for all files/dirs
2011-07-26 12:20:24 +02:00
Naomi Aro 533f218923 cc-2582 : track number parsing
making number an int type.
2011-07-26 11:54:30 +02:00
James 2b36e8193e CC-2588 :Use RabbitMQ to control the show recorder
- done
2011-07-25 16:24:00 -04:00
james 047a288c38 CC-2588: Use RabbitMQ to control the show recorder
- recording works now.
- further testing is needed
- still need to work on canceling the show
2011-07-23 12:30:36 -04: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 7074af447c CC-2582 : Files with a tracknumber that isn't actually a tracknumber don't get imported properly 2011-07-22 12:11:57 +02:00
Naomi Aro b302006100 CC-2571 : Media Monitor Bootstrap
fixing up character encoding issues.
2011-07-21 12:12:37 +02:00
Naomi Aro 216a166437 CC-2571 : Media Monitor Bootstrap
modifying files fix in bootstrap, fix functions to have parameters the same.
2011-07-20 16:15:58 +02:00
Naomi Aro c5c06eddc2 CC-2571 : Media Monitor Bootstrap
making sure files added to the organize folder while media monitor is down are imported to Airtime when it is started up again.
2011-07-20 14:38:32 +02:00
martin 6205b30152 CC-2566: Separate URL config out of config files and put them with API_CLIENT
-fixed
2011-07-19 19:42:23 -04:00
martin bbabdcda67 -remove CueFile imports. 2011-07-19 17:16:42 -04:00
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
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
Naomi Aro cd3b787c66 cc-1799 File System
only adding audio files when adding a watched directory.
2011-06-21 18:05:51 +02:00
Naomi Aro bb283e195a cc-1799 Readable Filesystem
check if md dictionary has any md.
2011-06-21 17:13:33 +02:00
Naomi Aro e803b76fcf CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
removing watch/adding new watch when changing stor directory.
2011-06-21 15:11:42 +02: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 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
martin 9e4b4a0e93 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-20 17:38:27 -04:00
martin aa56344a29 CC-2410: Clean up install process
-hiding a few more warnings.
2011-06-20 17:38:18 -04:00
Paul Baranowski 1bb2e79a78 CC-2397: Support output to Shoutcast
Simply added some config file variables and added the output type in
the liquidsoap script.
2011-06-20 17:34:16 -04:00
martin fe14113b58 CC-2410: Clean up install process
-reduced number of messages
-got rid of some warnings.
-moved airtime-install.php, airtime-upgrade.php, airtime-uninstall.php
2011-06-20 17:24:12 -04:00
martin 9744507078 -Remove unused logging statements 2011-06-20 16:31:53 -04:00
martin 4d790ac42a CC-2015: On reboot, resume at the current time in the show
-added new liquidsoap binaries with cue-in/cue-out support
-revision hash c3c118e
2011-06-17 16:27:04 -04:00
martin 2e4519f156 Merge branch 'cc-2015-on-reboot-resume-show' into devel
Conflicts:
	python_apps/media-monitor/airtime-media-monitor-init-d
2011-06-17 15:10:33 -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
martin 948a0e584d -added quotes to all paths in rm -rf statements 2011-06-17 11:16:27 -04:00
martin 2f5a1c4df6 cc-2055: switch to init.d
-monit is now temporarily disabled when intentionally stopped a service
2011-06-16 20:01:37 -04:00
martin ec6db96025 cc-2015: on reboot resume show
-use native capabilities of liquidsoap cue-in cue-out
 for song cue-in/cue-out
2011-06-16 18:59:15 -04:00
martin 662d0ebf85 -create-pypo-user scripts missing an "import sys"
-airtime-uninstall will now quit upon the first error
2011-06-16 17:30:16 -04:00
martin 4facadf521 -remove some symbolic links from /usr/bin. These are now
handled through init.d script
2011-06-16 17:29:05 -04:00
martin e90e6d7c12 cc-2015: on reboot resume show
-liquidsoap is having some problems with cue points right now
 need to check if this is my fault.
2011-06-16 13:26:37 -04:00
martin e5ed11ee51 cc-2015: on reboot resume show
-removed cue file from pypo responibility
2011-06-16 13:26:37 -04:00
martin 0d13b9013b cc-2015: on reboot resume show
-calculating the amount of seconds since track began complete
2011-06-16 13:26:36 -04:00
martin 12ae5a289f cc-2015: on reboot resume show 2011-06-16 13:26:36 -04:00
Naomi Aro 0d8a340924 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
changing class structure.
2011-06-16 11:53:36 +02:00
Naomi Aro 6dc3d4d29a CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 2011-06-15 16:49:05 +02:00
Naomi Aro b4b12449ff CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
can mave a dir in stor and sort files from gui/command line.
2011-06-15 16:41:13 +02: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 c06b15b964 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
about to merge, need to test more with blank metadata/change paths according to spec. Should test case about moving to trash from UI.
2011-06-15 09:19:41 +02:00
martin 9cfec2c8ef -reorganized/cleaned up python_apps/pypo directory. 2011-06-14 14:37:09 -04:00
Naomi Aro ff61972e82 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
changing ftype calculation to the python script.
2011-06-14 18:52:43 +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
martin f66305e3d3 cc-2055: switch to init.d
-added monit config file
2011-06-14 12:21:25 -04: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
Naomi Aro 51b1f00ac9 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
starting to better work with renamed files.
2011-06-13 18:38:11 +02:00
martin b6262438bd Merge branch '1.8.2' into devel
Conflicts:
	python_apps/pypo/airtime-liquidsoap
	python_apps/pypo/pypopush.py

-merged RC5/final 1.8.2 to devel
2011-06-13 10:51:09 -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 8a15144dc8 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
experimenting with plupload.
2011-06-13 12:41:30 +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 79049315c7 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
adding way to change user to pypo
2011-06-09 17:50:51 +02:00
Naomi Aro 2900ef4bb1 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
change for proper file permissions on directories created.
2011-06-09 15:17:17 +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
martin 8d3b99e440 cc-2055: switch to init.d
-fixed pypo hanging if it was started before rabbitmq.
2011-06-08 14:26:19 -04:00
martin 8a2930b996 -fixed indentation python error in media-monitor 2011-06-08 13:45:58 -04:00
Naomi Aro 16cfae10ed CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
working on proper length saving. need to fix substring method to ensure all get same number of subseconds to be consistent.
2011-06-08 19:33:16 +02:00
martin 50ff1984f2 -python interpreter exceptions are now redirected to a file so
we can see messages related to indentation errors etc. File should
 be useful for devel purposes only.
-a merge with the 1.8.2 branch incorrectly changed the version string. Fixed.
2011-06-08 12:33:38 -04: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
Naomi Aro 69b4847df3 Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' of dev.sourcefabric.org:airtime into cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention
Conflicts:
	python_apps/media-monitor/MediaMonitor.py
2011-06-08 10:23:52 +02:00