From ae6352a057ea7a27840b99c98e80b75fe268546f Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Fri, 19 Dec 2014 12:26:41 -0500 Subject: [PATCH] Initial work on switching media-monitor to use setuptools --- installer/bin/requirements-ubuntu-saucy.apt | 1 - installer/bin/requirements-ubuntu-trusty.apt | 1 - installer/install | 8 +++- .../{ => bin}/airtime-media-monitor | 0 .../install/airtime-media-monitor.conf | 15 ++++++ python_apps/media-monitor/media-monitor.cfg | 31 ------------ .../media-monitor/airtime-media-monitor | 30 ++++++++++++ .../airtime-media-monitor-init-d | 0 .../airtimefilemonitor/__init__.py | 0 .../airtimemediamonitorbootstrap.py | 0 .../airtimefilemonitor/airtimemetadata.py | 0 .../airtimefilemonitor/airtimenotifier.py | 0 .../airtimefilemonitor/airtimeprocessevent.py | 0 .../airtimefilemonitor/mediaconfig.py | 0 .../airtimefilemonitor/mediamonitorcommon.py | 0 .../airtimefilemonitor/replaygain.py | 0 .../airtimefilemonitor/workerprocess.py | 0 .../{ => media-monitor}/logging.cfg | 0 .../{ => media-monitor}/media_monitor.py | 0 .../media-monitor/{ => media-monitor}/mm1.py | 0 .../media-monitor2/__init__.py | 0 .../media-monitor2/baby.py | 0 .../media-monitor2/configs/logging.cfg | 0 .../media-monitor2/media/__init__.py | 0 .../media-monitor2/media/metadata/__init__.py | 0 .../media/metadata/definitions.py | 0 .../media-monitor2/media/metadata/process.py | 0 .../media-monitor2/media/monitor/__init__.py | 0 .../media-monitor2/media/monitor/airtime.py | 0 .../media-monitor2/media/monitor/bootstrap.py | 0 .../media-monitor2/media/monitor/config.py | 0 .../media/monitor/eventcontractor.py | 0 .../media/monitor/eventdrainer.py | 0 .../media-monitor2/media/monitor/events.py | 0 .../media/monitor/exceptions.py | 0 .../media-monitor2/media/monitor/handler.py | 0 .../media-monitor2/media/monitor/listeners.py | 0 .../media-monitor2/media/monitor/log.py | 0 .../media-monitor2/media/monitor/manager.py | 0 .../media-monitor2/media/monitor/metadata.py | 0 .../media-monitor2/media/monitor/organizer.py | 0 .../media-monitor2/media/monitor/owners.py | 0 .../media-monitor2/media/monitor/pure.py | 0 .../media-monitor2/media/monitor/request.py | 0 .../media-monitor2/media/monitor/syncdb.py | 0 .../media-monitor2/media/monitor/toucher.py | 0 .../media/monitor/watchersyncer.py | 0 .../media-monitor2/media/saas/__init__.py | 0 .../media/saas/airtimeinstance.py | 0 .../media-monitor2/media/saas/launcher.py | 0 .../media-monitor2/media/saas/thread.py | 0 .../{ => media-monitor}/media-monitor2/mm2.py | 0 .../media-monitor2/pyitest.py | 0 .../media-monitor2/tests/__init__.py | 0 .../media-monitor2/tests/api_client.cfg | 0 .../media-monitor2/tests/live_client.cfg | 0 .../media-monitor2/tests/prepare_tests.py | 0 .../media-monitor2/tests/run_tests.pl | 0 .../media-monitor2/tests/test_api_client.py | 0 .../media-monitor2/tests/test_config.cfg | 0 .../media-monitor2/tests/test_config.py | 0 .../media-monitor2/tests/test_emf.py | 0 .../tests/test_eventcontractor.py | 0 .../media-monitor2/tests/test_instance.py | 0 .../media-monitor2/tests/test_listeners.py | 0 .../media-monitor2/tests/test_manager.py | 0 .../media-monitor2/tests/test_metadata.py | 0 .../media-monitor2/tests/test_metadata_def.py | 0 .../media-monitor2/tests/test_notifier.py | 0 .../media-monitor2/tests/test_owners.py | 0 .../media-monitor2/tests/test_pure.py | 0 .../media-monitor2/tests/test_requestsync.py | 0 .../media-monitor2/tests/test_syncdb.py | 0 .../media-monitor2/tests/test_thread.py | 0 .../media-monitor2/tests/test_toucher.py | 0 python_apps/media-monitor/setup.py | 47 +++++++++++++++++++ 76 files changed, 98 insertions(+), 35 deletions(-) rename python_apps/media-monitor/{ => bin}/airtime-media-monitor (100%) create mode 100644 python_apps/media-monitor/install/airtime-media-monitor.conf delete mode 100644 python_apps/media-monitor/media-monitor.cfg create mode 100755 python_apps/media-monitor/media-monitor/airtime-media-monitor rename python_apps/media-monitor/{ => media-monitor}/airtime-media-monitor-init-d (100%) rename python_apps/media-monitor/{ => media-monitor}/airtimefilemonitor/__init__.py (100%) rename python_apps/media-monitor/{ => media-monitor}/airtimefilemonitor/airtimemediamonitorbootstrap.py (100%) rename python_apps/media-monitor/{ => media-monitor}/airtimefilemonitor/airtimemetadata.py (100%) rename python_apps/media-monitor/{ => media-monitor}/airtimefilemonitor/airtimenotifier.py (100%) rename python_apps/media-monitor/{ => media-monitor}/airtimefilemonitor/airtimeprocessevent.py (100%) rename python_apps/media-monitor/{ => media-monitor}/airtimefilemonitor/mediaconfig.py (100%) rename python_apps/media-monitor/{ => media-monitor}/airtimefilemonitor/mediamonitorcommon.py (100%) rename python_apps/media-monitor/{ => media-monitor}/airtimefilemonitor/replaygain.py (100%) rename python_apps/media-monitor/{ => media-monitor}/airtimefilemonitor/workerprocess.py (100%) rename python_apps/media-monitor/{ => media-monitor}/logging.cfg (100%) rename python_apps/media-monitor/{ => media-monitor}/media_monitor.py (100%) rename python_apps/media-monitor/{ => media-monitor}/mm1.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/__init__.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/baby.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/configs/logging.cfg (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/__init__.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/metadata/__init__.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/metadata/definitions.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/metadata/process.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/monitor/__init__.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/monitor/airtime.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/monitor/bootstrap.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/monitor/config.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/monitor/eventcontractor.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/monitor/eventdrainer.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/monitor/events.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/monitor/exceptions.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/monitor/handler.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/monitor/listeners.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/monitor/log.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/monitor/manager.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/monitor/metadata.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/monitor/organizer.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/monitor/owners.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/monitor/pure.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/monitor/request.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/monitor/syncdb.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/monitor/toucher.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/monitor/watchersyncer.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/saas/__init__.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/saas/airtimeinstance.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/saas/launcher.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/media/saas/thread.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/mm2.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/pyitest.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/tests/__init__.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/tests/api_client.cfg (100%) rename python_apps/{ => media-monitor}/media-monitor2/tests/live_client.cfg (100%) rename python_apps/{ => media-monitor}/media-monitor2/tests/prepare_tests.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/tests/run_tests.pl (100%) rename python_apps/{ => media-monitor}/media-monitor2/tests/test_api_client.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/tests/test_config.cfg (100%) rename python_apps/{ => media-monitor}/media-monitor2/tests/test_config.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/tests/test_emf.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/tests/test_eventcontractor.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/tests/test_instance.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/tests/test_listeners.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/tests/test_manager.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/tests/test_metadata.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/tests/test_metadata_def.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/tests/test_notifier.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/tests/test_owners.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/tests/test_pure.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/tests/test_requestsync.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/tests/test_syncdb.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/tests/test_thread.py (100%) rename python_apps/{ => media-monitor}/media-monitor2/tests/test_toucher.py (100%) create mode 100644 python_apps/media-monitor/setup.py diff --git a/installer/bin/requirements-ubuntu-saucy.apt b/installer/bin/requirements-ubuntu-saucy.apt index 157e0d177..e7c7442d9 100644 --- a/installer/bin/requirements-ubuntu-saucy.apt +++ b/installer/bin/requirements-ubuntu-saucy.apt @@ -19,7 +19,6 @@ patch php5-curl mpg123 -monit libcamomile-ocaml-data libpulse0 diff --git a/installer/bin/requirements-ubuntu-trusty.apt b/installer/bin/requirements-ubuntu-trusty.apt index 7ece49ce4..e02f588a7 100644 --- a/installer/bin/requirements-ubuntu-trusty.apt +++ b/installer/bin/requirements-ubuntu-trusty.apt @@ -19,7 +19,6 @@ patch php5-curl mpg123 -monit libcamomile-ocaml-data libpulse0 diff --git a/installer/install b/installer/install index 506ec8cbb..ae64b954f 100755 --- a/installer/install +++ b/installer/install @@ -348,8 +348,12 @@ cp -R ${AIRTIMEROOT}/python_apps/api_clients /usr/lib/airtime/api_clients verbose "...Done" verbose "\n * Copying media-monitor files..." -cp -R ${AIRTIMEROOT}/python_apps/media-monitor /usr/lib/airtime/media-monitor -cp -R ${AIRTIMEROOT}/python_apps/media-monitor2 /usr/lib/airtime/media-monitor/mm2 +cp -R ${AIRTIMEROOT}/python_apps/media-monitor/media-monitor /usr/lib/airtime/media-monitor +cp -R ${AIRTIMEROOT}/python_apps/media-monitor/media-monitor2 /usr/lib/airtime/media-monitor/mm2 +verbose "...Done" + +verbose "\n * Installing media-monitor..." +python ${AIRTIMEROOT}/python_apps/media-monitor/setup.py install verbose "...Done" verbose "\n * Copying pypo files..." diff --git a/python_apps/media-monitor/airtime-media-monitor b/python_apps/media-monitor/bin/airtime-media-monitor similarity index 100% rename from python_apps/media-monitor/airtime-media-monitor rename to python_apps/media-monitor/bin/airtime-media-monitor diff --git a/python_apps/media-monitor/install/airtime-media-monitor.conf b/python_apps/media-monitor/install/airtime-media-monitor.conf new file mode 100644 index 000000000..f1cc6be8b --- /dev/null +++ b/python_apps/media-monitor/install/airtime-media-monitor.conf @@ -0,0 +1,15 @@ +description "Airtime Media Monitor" +author "help@sourcefabric.org" + +start on runlevel [2345] +stop on runlevel [!2345] + +respawn + +setuid www-data +setgid www-data + +env LANG='en_US.UTF-8' +env LC_ALL='en_US.UTF-8' + +exec airtime-media-monitor diff --git a/python_apps/media-monitor/media-monitor.cfg b/python_apps/media-monitor/media-monitor.cfg deleted file mode 100644 index b1167f56b..000000000 --- a/python_apps/media-monitor/media-monitor.cfg +++ /dev/null @@ -1,31 +0,0 @@ -api_client = "airtime" - -# where the binary files live -bin_dir = '/usr/lib/airtime/media-monitor' - -# where the logging files live -log_dir = '/var/log/airtime/media-monitor' - - -############################################ -# RabbitMQ settings # -############################################ -rabbitmq_host = 'localhost' -rabbitmq_user = 'guest' -rabbitmq_password = 'guest' -rabbitmq_vhost = '/' - -############################################ -# Media-Monitor preferences # -############################################ -check_filesystem_events = 5 #how long to queue up events performed on the files themselves. -check_airtime_events = 30 #how long to queue metadata input from airtime. - -# MM2 only: -touch_interval = 5 -chunking_number = 450 -request_max_wait = 3.0 -rmq_event_wait = 0.1 -logpath = '/var/log/airtime/media-monitor/media-monitor.log' -index_path = '/var/tmp/airtime/media-monitor/last_index' - diff --git a/python_apps/media-monitor/media-monitor/airtime-media-monitor b/python_apps/media-monitor/media-monitor/airtime-media-monitor new file mode 100755 index 000000000..5997e8db4 --- /dev/null +++ b/python_apps/media-monitor/media-monitor/airtime-media-monitor @@ -0,0 +1,30 @@ +#!/bin/bash + +# Location of pypo_cli.py Python script + +virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/" +. ${virtualenv_bin}activate + +media_monitor_path="/usr/lib/airtime/media-monitor/" +media_monitor_script="media_monitor.py" + +api_client_path="/usr/lib/airtime/:/usr/lib/airtime/media-monitor/mm2/" + +cd ${media_monitor_path} + +exec 2>&1 + +set +e +cat /etc/default/locale | grep -i "LANG=.*UTF-\?8" +set -e +if [ "$?" != "0" ]; then + echo "non UTF-8 default locale found in /etc/default/locale." > /var/log/airtime/media-monitor/error.log + exit 1 +fi + +export PYTHONPATH=${api_client_path} +export LC_ALL=`cat /etc/default/locale | grep "LANG=" | cut -d= -f2 | tr -d "\n\""` + +exec python ${media_monitor_path}${media_monitor_script} > /var/log/airtime/media-monitor/py-interpreter.log 2>&1 + +# EOF diff --git a/python_apps/media-monitor/airtime-media-monitor-init-d b/python_apps/media-monitor/media-monitor/airtime-media-monitor-init-d similarity index 100% rename from python_apps/media-monitor/airtime-media-monitor-init-d rename to python_apps/media-monitor/media-monitor/airtime-media-monitor-init-d diff --git a/python_apps/media-monitor/airtimefilemonitor/__init__.py b/python_apps/media-monitor/media-monitor/airtimefilemonitor/__init__.py similarity index 100% rename from python_apps/media-monitor/airtimefilemonitor/__init__.py rename to python_apps/media-monitor/media-monitor/airtimefilemonitor/__init__.py diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py b/python_apps/media-monitor/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py similarity index 100% rename from python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py rename to python_apps/media-monitor/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py b/python_apps/media-monitor/media-monitor/airtimefilemonitor/airtimemetadata.py similarity index 100% rename from python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py rename to python_apps/media-monitor/media-monitor/airtimefilemonitor/airtimemetadata.py diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py b/python_apps/media-monitor/media-monitor/airtimefilemonitor/airtimenotifier.py similarity index 100% rename from python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py rename to python_apps/media-monitor/media-monitor/airtimefilemonitor/airtimenotifier.py diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py b/python_apps/media-monitor/media-monitor/airtimefilemonitor/airtimeprocessevent.py similarity index 100% rename from python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py rename to python_apps/media-monitor/media-monitor/airtimefilemonitor/airtimeprocessevent.py diff --git a/python_apps/media-monitor/airtimefilemonitor/mediaconfig.py b/python_apps/media-monitor/media-monitor/airtimefilemonitor/mediaconfig.py similarity index 100% rename from python_apps/media-monitor/airtimefilemonitor/mediaconfig.py rename to python_apps/media-monitor/media-monitor/airtimefilemonitor/mediaconfig.py diff --git a/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py b/python_apps/media-monitor/media-monitor/airtimefilemonitor/mediamonitorcommon.py similarity index 100% rename from python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py rename to python_apps/media-monitor/media-monitor/airtimefilemonitor/mediamonitorcommon.py diff --git a/python_apps/media-monitor/airtimefilemonitor/replaygain.py b/python_apps/media-monitor/media-monitor/airtimefilemonitor/replaygain.py similarity index 100% rename from python_apps/media-monitor/airtimefilemonitor/replaygain.py rename to python_apps/media-monitor/media-monitor/airtimefilemonitor/replaygain.py diff --git a/python_apps/media-monitor/airtimefilemonitor/workerprocess.py b/python_apps/media-monitor/media-monitor/airtimefilemonitor/workerprocess.py similarity index 100% rename from python_apps/media-monitor/airtimefilemonitor/workerprocess.py rename to python_apps/media-monitor/media-monitor/airtimefilemonitor/workerprocess.py diff --git a/python_apps/media-monitor/logging.cfg b/python_apps/media-monitor/media-monitor/logging.cfg similarity index 100% rename from python_apps/media-monitor/logging.cfg rename to python_apps/media-monitor/media-monitor/logging.cfg diff --git a/python_apps/media-monitor/media_monitor.py b/python_apps/media-monitor/media-monitor/media_monitor.py similarity index 100% rename from python_apps/media-monitor/media_monitor.py rename to python_apps/media-monitor/media-monitor/media_monitor.py diff --git a/python_apps/media-monitor/mm1.py b/python_apps/media-monitor/media-monitor/mm1.py similarity index 100% rename from python_apps/media-monitor/mm1.py rename to python_apps/media-monitor/media-monitor/mm1.py diff --git a/python_apps/media-monitor2/__init__.py b/python_apps/media-monitor/media-monitor2/__init__.py similarity index 100% rename from python_apps/media-monitor2/__init__.py rename to python_apps/media-monitor/media-monitor2/__init__.py diff --git a/python_apps/media-monitor2/baby.py b/python_apps/media-monitor/media-monitor2/baby.py similarity index 100% rename from python_apps/media-monitor2/baby.py rename to python_apps/media-monitor/media-monitor2/baby.py diff --git a/python_apps/media-monitor2/configs/logging.cfg b/python_apps/media-monitor/media-monitor2/configs/logging.cfg similarity index 100% rename from python_apps/media-monitor2/configs/logging.cfg rename to python_apps/media-monitor/media-monitor2/configs/logging.cfg diff --git a/python_apps/media-monitor2/media/__init__.py b/python_apps/media-monitor/media-monitor2/media/__init__.py similarity index 100% rename from python_apps/media-monitor2/media/__init__.py rename to python_apps/media-monitor/media-monitor2/media/__init__.py diff --git a/python_apps/media-monitor2/media/metadata/__init__.py b/python_apps/media-monitor/media-monitor2/media/metadata/__init__.py similarity index 100% rename from python_apps/media-monitor2/media/metadata/__init__.py rename to python_apps/media-monitor/media-monitor2/media/metadata/__init__.py diff --git a/python_apps/media-monitor2/media/metadata/definitions.py b/python_apps/media-monitor/media-monitor2/media/metadata/definitions.py similarity index 100% rename from python_apps/media-monitor2/media/metadata/definitions.py rename to python_apps/media-monitor/media-monitor2/media/metadata/definitions.py diff --git a/python_apps/media-monitor2/media/metadata/process.py b/python_apps/media-monitor/media-monitor2/media/metadata/process.py similarity index 100% rename from python_apps/media-monitor2/media/metadata/process.py rename to python_apps/media-monitor/media-monitor2/media/metadata/process.py diff --git a/python_apps/media-monitor2/media/monitor/__init__.py b/python_apps/media-monitor/media-monitor2/media/monitor/__init__.py similarity index 100% rename from python_apps/media-monitor2/media/monitor/__init__.py rename to python_apps/media-monitor/media-monitor2/media/monitor/__init__.py diff --git a/python_apps/media-monitor2/media/monitor/airtime.py b/python_apps/media-monitor/media-monitor2/media/monitor/airtime.py similarity index 100% rename from python_apps/media-monitor2/media/monitor/airtime.py rename to python_apps/media-monitor/media-monitor2/media/monitor/airtime.py diff --git a/python_apps/media-monitor2/media/monitor/bootstrap.py b/python_apps/media-monitor/media-monitor2/media/monitor/bootstrap.py similarity index 100% rename from python_apps/media-monitor2/media/monitor/bootstrap.py rename to python_apps/media-monitor/media-monitor2/media/monitor/bootstrap.py diff --git a/python_apps/media-monitor2/media/monitor/config.py b/python_apps/media-monitor/media-monitor2/media/monitor/config.py similarity index 100% rename from python_apps/media-monitor2/media/monitor/config.py rename to python_apps/media-monitor/media-monitor2/media/monitor/config.py diff --git a/python_apps/media-monitor2/media/monitor/eventcontractor.py b/python_apps/media-monitor/media-monitor2/media/monitor/eventcontractor.py similarity index 100% rename from python_apps/media-monitor2/media/monitor/eventcontractor.py rename to python_apps/media-monitor/media-monitor2/media/monitor/eventcontractor.py diff --git a/python_apps/media-monitor2/media/monitor/eventdrainer.py b/python_apps/media-monitor/media-monitor2/media/monitor/eventdrainer.py similarity index 100% rename from python_apps/media-monitor2/media/monitor/eventdrainer.py rename to python_apps/media-monitor/media-monitor2/media/monitor/eventdrainer.py diff --git a/python_apps/media-monitor2/media/monitor/events.py b/python_apps/media-monitor/media-monitor2/media/monitor/events.py similarity index 100% rename from python_apps/media-monitor2/media/monitor/events.py rename to python_apps/media-monitor/media-monitor2/media/monitor/events.py diff --git a/python_apps/media-monitor2/media/monitor/exceptions.py b/python_apps/media-monitor/media-monitor2/media/monitor/exceptions.py similarity index 100% rename from python_apps/media-monitor2/media/monitor/exceptions.py rename to python_apps/media-monitor/media-monitor2/media/monitor/exceptions.py diff --git a/python_apps/media-monitor2/media/monitor/handler.py b/python_apps/media-monitor/media-monitor2/media/monitor/handler.py similarity index 100% rename from python_apps/media-monitor2/media/monitor/handler.py rename to python_apps/media-monitor/media-monitor2/media/monitor/handler.py diff --git a/python_apps/media-monitor2/media/monitor/listeners.py b/python_apps/media-monitor/media-monitor2/media/monitor/listeners.py similarity index 100% rename from python_apps/media-monitor2/media/monitor/listeners.py rename to python_apps/media-monitor/media-monitor2/media/monitor/listeners.py diff --git a/python_apps/media-monitor2/media/monitor/log.py b/python_apps/media-monitor/media-monitor2/media/monitor/log.py similarity index 100% rename from python_apps/media-monitor2/media/monitor/log.py rename to python_apps/media-monitor/media-monitor2/media/monitor/log.py diff --git a/python_apps/media-monitor2/media/monitor/manager.py b/python_apps/media-monitor/media-monitor2/media/monitor/manager.py similarity index 100% rename from python_apps/media-monitor2/media/monitor/manager.py rename to python_apps/media-monitor/media-monitor2/media/monitor/manager.py diff --git a/python_apps/media-monitor2/media/monitor/metadata.py b/python_apps/media-monitor/media-monitor2/media/monitor/metadata.py similarity index 100% rename from python_apps/media-monitor2/media/monitor/metadata.py rename to python_apps/media-monitor/media-monitor2/media/monitor/metadata.py diff --git a/python_apps/media-monitor2/media/monitor/organizer.py b/python_apps/media-monitor/media-monitor2/media/monitor/organizer.py similarity index 100% rename from python_apps/media-monitor2/media/monitor/organizer.py rename to python_apps/media-monitor/media-monitor2/media/monitor/organizer.py diff --git a/python_apps/media-monitor2/media/monitor/owners.py b/python_apps/media-monitor/media-monitor2/media/monitor/owners.py similarity index 100% rename from python_apps/media-monitor2/media/monitor/owners.py rename to python_apps/media-monitor/media-monitor2/media/monitor/owners.py diff --git a/python_apps/media-monitor2/media/monitor/pure.py b/python_apps/media-monitor/media-monitor2/media/monitor/pure.py similarity index 100% rename from python_apps/media-monitor2/media/monitor/pure.py rename to python_apps/media-monitor/media-monitor2/media/monitor/pure.py diff --git a/python_apps/media-monitor2/media/monitor/request.py b/python_apps/media-monitor/media-monitor2/media/monitor/request.py similarity index 100% rename from python_apps/media-monitor2/media/monitor/request.py rename to python_apps/media-monitor/media-monitor2/media/monitor/request.py diff --git a/python_apps/media-monitor2/media/monitor/syncdb.py b/python_apps/media-monitor/media-monitor2/media/monitor/syncdb.py similarity index 100% rename from python_apps/media-monitor2/media/monitor/syncdb.py rename to python_apps/media-monitor/media-monitor2/media/monitor/syncdb.py diff --git a/python_apps/media-monitor2/media/monitor/toucher.py b/python_apps/media-monitor/media-monitor2/media/monitor/toucher.py similarity index 100% rename from python_apps/media-monitor2/media/monitor/toucher.py rename to python_apps/media-monitor/media-monitor2/media/monitor/toucher.py diff --git a/python_apps/media-monitor2/media/monitor/watchersyncer.py b/python_apps/media-monitor/media-monitor2/media/monitor/watchersyncer.py similarity index 100% rename from python_apps/media-monitor2/media/monitor/watchersyncer.py rename to python_apps/media-monitor/media-monitor2/media/monitor/watchersyncer.py diff --git a/python_apps/media-monitor2/media/saas/__init__.py b/python_apps/media-monitor/media-monitor2/media/saas/__init__.py similarity index 100% rename from python_apps/media-monitor2/media/saas/__init__.py rename to python_apps/media-monitor/media-monitor2/media/saas/__init__.py diff --git a/python_apps/media-monitor2/media/saas/airtimeinstance.py b/python_apps/media-monitor/media-monitor2/media/saas/airtimeinstance.py similarity index 100% rename from python_apps/media-monitor2/media/saas/airtimeinstance.py rename to python_apps/media-monitor/media-monitor2/media/saas/airtimeinstance.py diff --git a/python_apps/media-monitor2/media/saas/launcher.py b/python_apps/media-monitor/media-monitor2/media/saas/launcher.py similarity index 100% rename from python_apps/media-monitor2/media/saas/launcher.py rename to python_apps/media-monitor/media-monitor2/media/saas/launcher.py diff --git a/python_apps/media-monitor2/media/saas/thread.py b/python_apps/media-monitor/media-monitor2/media/saas/thread.py similarity index 100% rename from python_apps/media-monitor2/media/saas/thread.py rename to python_apps/media-monitor/media-monitor2/media/saas/thread.py diff --git a/python_apps/media-monitor2/mm2.py b/python_apps/media-monitor/media-monitor2/mm2.py similarity index 100% rename from python_apps/media-monitor2/mm2.py rename to python_apps/media-monitor/media-monitor2/mm2.py diff --git a/python_apps/media-monitor2/pyitest.py b/python_apps/media-monitor/media-monitor2/pyitest.py similarity index 100% rename from python_apps/media-monitor2/pyitest.py rename to python_apps/media-monitor/media-monitor2/pyitest.py diff --git a/python_apps/media-monitor2/tests/__init__.py b/python_apps/media-monitor/media-monitor2/tests/__init__.py similarity index 100% rename from python_apps/media-monitor2/tests/__init__.py rename to python_apps/media-monitor/media-monitor2/tests/__init__.py diff --git a/python_apps/media-monitor2/tests/api_client.cfg b/python_apps/media-monitor/media-monitor2/tests/api_client.cfg similarity index 100% rename from python_apps/media-monitor2/tests/api_client.cfg rename to python_apps/media-monitor/media-monitor2/tests/api_client.cfg diff --git a/python_apps/media-monitor2/tests/live_client.cfg b/python_apps/media-monitor/media-monitor2/tests/live_client.cfg similarity index 100% rename from python_apps/media-monitor2/tests/live_client.cfg rename to python_apps/media-monitor/media-monitor2/tests/live_client.cfg diff --git a/python_apps/media-monitor2/tests/prepare_tests.py b/python_apps/media-monitor/media-monitor2/tests/prepare_tests.py similarity index 100% rename from python_apps/media-monitor2/tests/prepare_tests.py rename to python_apps/media-monitor/media-monitor2/tests/prepare_tests.py diff --git a/python_apps/media-monitor2/tests/run_tests.pl b/python_apps/media-monitor/media-monitor2/tests/run_tests.pl similarity index 100% rename from python_apps/media-monitor2/tests/run_tests.pl rename to python_apps/media-monitor/media-monitor2/tests/run_tests.pl diff --git a/python_apps/media-monitor2/tests/test_api_client.py b/python_apps/media-monitor/media-monitor2/tests/test_api_client.py similarity index 100% rename from python_apps/media-monitor2/tests/test_api_client.py rename to python_apps/media-monitor/media-monitor2/tests/test_api_client.py diff --git a/python_apps/media-monitor2/tests/test_config.cfg b/python_apps/media-monitor/media-monitor2/tests/test_config.cfg similarity index 100% rename from python_apps/media-monitor2/tests/test_config.cfg rename to python_apps/media-monitor/media-monitor2/tests/test_config.cfg diff --git a/python_apps/media-monitor2/tests/test_config.py b/python_apps/media-monitor/media-monitor2/tests/test_config.py similarity index 100% rename from python_apps/media-monitor2/tests/test_config.py rename to python_apps/media-monitor/media-monitor2/tests/test_config.py diff --git a/python_apps/media-monitor2/tests/test_emf.py b/python_apps/media-monitor/media-monitor2/tests/test_emf.py similarity index 100% rename from python_apps/media-monitor2/tests/test_emf.py rename to python_apps/media-monitor/media-monitor2/tests/test_emf.py diff --git a/python_apps/media-monitor2/tests/test_eventcontractor.py b/python_apps/media-monitor/media-monitor2/tests/test_eventcontractor.py similarity index 100% rename from python_apps/media-monitor2/tests/test_eventcontractor.py rename to python_apps/media-monitor/media-monitor2/tests/test_eventcontractor.py diff --git a/python_apps/media-monitor2/tests/test_instance.py b/python_apps/media-monitor/media-monitor2/tests/test_instance.py similarity index 100% rename from python_apps/media-monitor2/tests/test_instance.py rename to python_apps/media-monitor/media-monitor2/tests/test_instance.py diff --git a/python_apps/media-monitor2/tests/test_listeners.py b/python_apps/media-monitor/media-monitor2/tests/test_listeners.py similarity index 100% rename from python_apps/media-monitor2/tests/test_listeners.py rename to python_apps/media-monitor/media-monitor2/tests/test_listeners.py diff --git a/python_apps/media-monitor2/tests/test_manager.py b/python_apps/media-monitor/media-monitor2/tests/test_manager.py similarity index 100% rename from python_apps/media-monitor2/tests/test_manager.py rename to python_apps/media-monitor/media-monitor2/tests/test_manager.py diff --git a/python_apps/media-monitor2/tests/test_metadata.py b/python_apps/media-monitor/media-monitor2/tests/test_metadata.py similarity index 100% rename from python_apps/media-monitor2/tests/test_metadata.py rename to python_apps/media-monitor/media-monitor2/tests/test_metadata.py diff --git a/python_apps/media-monitor2/tests/test_metadata_def.py b/python_apps/media-monitor/media-monitor2/tests/test_metadata_def.py similarity index 100% rename from python_apps/media-monitor2/tests/test_metadata_def.py rename to python_apps/media-monitor/media-monitor2/tests/test_metadata_def.py diff --git a/python_apps/media-monitor2/tests/test_notifier.py b/python_apps/media-monitor/media-monitor2/tests/test_notifier.py similarity index 100% rename from python_apps/media-monitor2/tests/test_notifier.py rename to python_apps/media-monitor/media-monitor2/tests/test_notifier.py diff --git a/python_apps/media-monitor2/tests/test_owners.py b/python_apps/media-monitor/media-monitor2/tests/test_owners.py similarity index 100% rename from python_apps/media-monitor2/tests/test_owners.py rename to python_apps/media-monitor/media-monitor2/tests/test_owners.py diff --git a/python_apps/media-monitor2/tests/test_pure.py b/python_apps/media-monitor/media-monitor2/tests/test_pure.py similarity index 100% rename from python_apps/media-monitor2/tests/test_pure.py rename to python_apps/media-monitor/media-monitor2/tests/test_pure.py diff --git a/python_apps/media-monitor2/tests/test_requestsync.py b/python_apps/media-monitor/media-monitor2/tests/test_requestsync.py similarity index 100% rename from python_apps/media-monitor2/tests/test_requestsync.py rename to python_apps/media-monitor/media-monitor2/tests/test_requestsync.py diff --git a/python_apps/media-monitor2/tests/test_syncdb.py b/python_apps/media-monitor/media-monitor2/tests/test_syncdb.py similarity index 100% rename from python_apps/media-monitor2/tests/test_syncdb.py rename to python_apps/media-monitor/media-monitor2/tests/test_syncdb.py diff --git a/python_apps/media-monitor2/tests/test_thread.py b/python_apps/media-monitor/media-monitor2/tests/test_thread.py similarity index 100% rename from python_apps/media-monitor2/tests/test_thread.py rename to python_apps/media-monitor/media-monitor2/tests/test_thread.py diff --git a/python_apps/media-monitor2/tests/test_toucher.py b/python_apps/media-monitor/media-monitor2/tests/test_toucher.py similarity index 100% rename from python_apps/media-monitor2/tests/test_toucher.py rename to python_apps/media-monitor/media-monitor2/tests/test_toucher.py diff --git a/python_apps/media-monitor/setup.py b/python_apps/media-monitor/setup.py new file mode 100644 index 000000000..639577ec6 --- /dev/null +++ b/python_apps/media-monitor/setup.py @@ -0,0 +1,47 @@ +from setuptools import setup +from subprocess import call +import sys +import os + +script_path = os.path.dirname(os.path.realpath(__file__)) +print script_path +os.chdir(script_path) + +# Allows us to avoid installing the upstart init script when deploying on Airtime Pro: +if '--no-init-script' in sys.argv: + data_files = [] + sys.argv.remove('--no-init-script') # super hax +else: + data_files = [('/etc/init', ['install/airtime-media.conf'])] + print data_files + +setup(name='airtime-media-monitor', + version='1.0', + description='Airtime Media Monitor', + url='http://github.com/sourcefabric/Airtime', + author='sourcefabric', + license='AGPLv3', + packages=['media-monitor', 'media-monitor2'], + scripts=['bin/airtime-media-monitor'], + install_requires=[ + 'amqplib', + 'anyjson', + 'argparse', + 'configobj', + 'docopt', + 'kombu', + 'mutagen', + 'poster', + 'PyDispatcher', + 'pyinotify', + 'pytz', + 'wsgiref' + ], + zip_safe=False, + data_files=data_files) + +# Reload the initctl config so that playout services works +if data_files: + print "Reloading initctl configuration" + call(['initctl', 'reload-configuration']) + print "Run \"sudo service airtime-media-monitor start\""