From 9cfec2c8ef12f6154bb3617322295064e13fa5f8 Mon Sep 17 00:00:00 2001 From: martin Date: Tue, 14 Jun 2011 14:37:09 -0400 Subject: [PATCH] -reorganized/cleaned up python_apps/pypo directory. --- .gitignore | 2 +- install/include/AirtimeIni.php | 2 +- .../airtime-1.8.1/airtime-upgrade.php | 2 +- .../airtime-1.8.2/airtime-upgrade.php | 2 +- python_apps/pypo/airtime-liquidsoap | 8 +- python_apps/pypo/config.cfg.dist | 40 ---- python_apps/pypo/dls/__init__.py | 3 - python_apps/pypo/dls/dls_client.py | 88 -------- python_apps/pypo/install/pypo-install.py | 8 +- .../liquidsoap-amd64 | Bin .../liquidsoap-amd64-natty | Bin .../liquidsoap-i386 | Bin .../liquidsoap-i386-natty | Bin .../library/Makefile | 0 .../library/ask-liquidsoap.pl | 0 .../library/ask-liquidsoap.rb | 0 .../library/external-todo.liq | 0 .../library/externals.liq | 0 .../library/extract-replaygain | 0 .../library/interactive.screen | 0 .../library/lastfm.liq | 0 .../library/liquidsoap.gentoo.initd | 0 .../library/liquidsoap.gentoo.initd.in | 0 .../library/liquidsoap.initd | 0 .../library/liquidsoap.initd.in | 0 .../library/liquidsoap.logrotate | 0 .../library/liquidsoap.logrotate.in | 0 .../library/liquidtts | 0 .../library/liquidtts.in | 0 .../library/pervasives.liq | 0 .../library/shoutcast.liq | 0 .../library/test.liq | 0 .../library/typing.liq | 0 .../library/utils.liq | 0 .../liquidsoap.cfg | 0 .../ls_lib.liq | 4 +- .../ls_script.liq | 0 .../{scripts => liquidsoap_scripts}/notify.sh | 0 python_apps/pypo/pypo-dls.py | 193 ------------------ .../pypo/{ => test}/logging-api-validator.cfg | 0 .../pypo/{ => test}/pypo-api-validator.py | 0 .../pypo/{ => test}/pypo-cue-in-validator.py | 0 42 files changed, 14 insertions(+), 338 deletions(-) delete mode 100644 python_apps/pypo/config.cfg.dist delete mode 100755 python_apps/pypo/dls/__init__.py delete mode 100755 python_apps/pypo/dls/dls_client.py rename python_apps/pypo/{liquidsoap => liquidsoap_bin}/liquidsoap-amd64 (100%) rename python_apps/pypo/{liquidsoap => liquidsoap_bin}/liquidsoap-amd64-natty (100%) rename python_apps/pypo/{liquidsoap => liquidsoap_bin}/liquidsoap-i386 (100%) rename python_apps/pypo/{liquidsoap => liquidsoap_bin}/liquidsoap-i386-natty (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/library/Makefile (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/library/ask-liquidsoap.pl (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/library/ask-liquidsoap.rb (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/library/external-todo.liq (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/library/externals.liq (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/library/extract-replaygain (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/library/interactive.screen (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/library/lastfm.liq (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/library/liquidsoap.gentoo.initd (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/library/liquidsoap.gentoo.initd.in (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/library/liquidsoap.initd (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/library/liquidsoap.initd.in (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/library/liquidsoap.logrotate (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/library/liquidsoap.logrotate.in (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/library/liquidtts (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/library/liquidtts.in (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/library/pervasives.liq (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/library/shoutcast.liq (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/library/test.liq (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/library/typing.liq (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/library/utils.liq (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/liquidsoap.cfg (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/ls_lib.liq (86%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/ls_script.liq (100%) rename python_apps/pypo/{scripts => liquidsoap_scripts}/notify.sh (100%) delete mode 100755 python_apps/pypo/pypo-dls.py rename python_apps/pypo/{ => test}/logging-api-validator.cfg (100%) rename python_apps/pypo/{ => test}/pypo-api-validator.py (100%) rename python_apps/pypo/{ => test}/pypo-cue-in-validator.py (100%) diff --git a/.gitignore b/.gitignore index 2db593e69..3f52a5722 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ .* *.pyc /files -python_apps/pypo/liquidsoap/liquidsoap +python_apps/pypo/liquidsoap_bin/liquidsoap build/build.properties diff --git a/install/include/AirtimeIni.php b/install/include/AirtimeIni.php index df4a0e5ac..dd228f997 100644 --- a/install/include/AirtimeIni.php +++ b/install/include/AirtimeIni.php @@ -70,7 +70,7 @@ class AirtimeIni echo "Could not copy recorder.cfg to /etc/airtime/. Exiting."; exit(1); } - if (!copy(__DIR__."/../../python_apps/pypo/scripts/liquidsoap.cfg", AirtimeIni::CONF_FILE_LIQUIDSOAP)){ + if (!copy(__DIR__."/../../python_apps/pypo/liquidsoap_scripts/liquidsoap.cfg", AirtimeIni::CONF_FILE_LIQUIDSOAP)){ echo "Could not copy liquidsoap.cfg to /etc/airtime/. Exiting."; exit(1); } diff --git a/install/upgrades/airtime-1.8.1/airtime-upgrade.php b/install/upgrades/airtime-1.8.1/airtime-upgrade.php index a5ca163e7..a282aefcb 100644 --- a/install/upgrades/airtime-1.8.1/airtime-upgrade.php +++ b/install/upgrades/airtime-1.8.1/airtime-upgrade.php @@ -138,7 +138,7 @@ function CreateIniFiles() echo "Could not copy recorder.cfg to /etc/airtime/. Exiting."; exit(1); } - if (!copy($AIRTIME_PYTHON_APPS."/pypo/scripts/liquidsoap.cfg", CONF_FILE_LIQUIDSOAP)){ + if (!copy($AIRTIME_PYTHON_APPS."/pypo/liquidsoap_scripts/liquidsoap.cfg", CONF_FILE_LIQUIDSOAP)){ echo "Could not copy liquidsoap.cfg to /etc/airtime/. Exiting."; exit(1); } diff --git a/install/upgrades/airtime-1.8.2/airtime-upgrade.php b/install/upgrades/airtime-1.8.2/airtime-upgrade.php index fc6786847..abfbe3868 100644 --- a/install/upgrades/airtime-1.8.2/airtime-upgrade.php +++ b/install/upgrades/airtime-1.8.2/airtime-upgrade.php @@ -138,7 +138,7 @@ function CreateIniFiles() echo "Could not copy recorder.cfg to /etc/airtime/. Exiting."; exit(1); } - if (!copy($AIRTIME_PYTHON_APPS."/pypo/scripts/liquidsoap.cfg", CONF_FILE_LIQUIDSOAP)){ + if (!copy($AIRTIME_PYTHON_APPS."/pypo/liquidsoap_scripts/liquidsoap.cfg", CONF_FILE_LIQUIDSOAP)){ echo "Could not copy liquidsoap.cfg to /etc/airtime/. Exiting."; exit(1); } diff --git a/python_apps/pypo/airtime-liquidsoap b/python_apps/pypo/airtime-liquidsoap index 377ae9a3c..d7fd805f7 100755 --- a/python_apps/pypo/airtime-liquidsoap +++ b/python_apps/pypo/airtime-liquidsoap @@ -2,12 +2,12 @@ ls_user="pypo" export HOME="/var/tmp/airtime/pypo/" api_client_path="/usr/lib/airtime/pypo/" -ls_path="/usr/lib/airtime/pypo/bin/liquidsoap/liquidsoap" -ls_param="/usr/lib/airtime/pypo/bin/scripts/ls_script.liq" -echo "*** Daemontools: starting liquidsoap" +ls_path="/usr/lib/airtime/pypo/bin/liquidsoap_bin/liquidsoap" +ls_param="/usr/lib/airtime/pypo/bin/liquidsoap_scripts/ls_script.liq" + exec 2>&1 -cd /usr/lib/airtime/pypo/bin/scripts +cd /usr/lib/airtime/pypo/bin/liquidsoap_scripts export PYTHONPATH=${api_client_path} exec ${ls_path} ${ls_param} diff --git a/python_apps/pypo/config.cfg.dist b/python_apps/pypo/config.cfg.dist deleted file mode 100644 index 65b2e8733..000000000 --- a/python_apps/pypo/config.cfg.dist +++ /dev/null @@ -1,40 +0,0 @@ -############################################ -# pypo - configuration # -############################################ - -############################################ -# Directories / Hosts # -# _include_ trailing slash !! # -############################################ -cache_dir = '/storage/pypo/cache/' -file_dir = '/storage/pypo/files/' -tmp_dir = '/var/tmp/obp/' - -############################################ -# API path & co # -############################################ -base_url = 'http://test.local.obp.ch/' -obp_api_key = 'AAA-BBB-CCC-EEE' - -export_path = 'api/pypo/export_range/' # YYYY-MM-DD-hh-mm will be added in script, exports json -export_source = 'scheduler' # choose "dayparts" or "scheduler" - -############################################ -# Liquidsoap settings # -############################################ -ls_host = '127.0.0.1' -ls_port = '1234' - -############################################ -# pypo preferences # -############################################ -prepare_ahead = 12 #in hours -cache_for = 12 #how long to hold the cache, in hours - -poll_interval = 10 # in seconds -push_interval = 1 # in seconds - -# 'pre' or 'otf'. 'pre' cues while pplaylist preparation -# while 'otf' (on the fly) cues while loading into ls -# (needs the post_processor patch) -cue_style = 'pre' diff --git a/python_apps/pypo/dls/__init__.py b/python_apps/pypo/dls/__init__.py deleted file mode 100755 index 7957e7dad..000000000 --- a/python_apps/pypo/dls/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# -*- coding: utf-8 -*- - -from dls_client import * \ No newline at end of file diff --git a/python_apps/pypo/dls/dls_client.py b/python_apps/pypo/dls/dls_client.py deleted file mode 100755 index 94a8abd3d..000000000 --- a/python_apps/pypo/dls/dls_client.py +++ /dev/null @@ -1,88 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -# author Jonas Ohrstrom - -import sys -import time - -import logging - -import os -import socket - - - -class DlsClient(): - - def __init__(self, dls_host, dls_port, dls_user, dls_pass): - self.dls_host = dls_host - self.dls_port = dls_port - self.dls_user = dls_user - self.dls_pass = dls_pass - - def set_txt(self, txt): - - logger = logging.getLogger("DlsClient.set_txt") - - try: - - print 'trying to update dls' - - s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.connect((self.dls_host, self.dls_port)) - - s.send('client_zzzz') - s.send("\r\n") - data = s.recv(1024) - print data; - - s.send('RS_DLS_VERSION' + ' ' + '1') - s.send("\r\n") - data = s.recv(1024) - print data; - - s.send('SERVICE' + ' ' + self.dls_user) - s.send("\r\n") - - s.send('PASSWORD' + ' ' + self.dls_pass) - s.send("\r\n") - data = s.recv(1024) - print data; - - s.send('SET_DLS_CHARSET' + ' ' + '4') - s.send("\r\n") - data = s.recv(1024) - print data; - - s.send('CLEAR_DLS') - s.send("\r\n") - - s.send('SET_DLS' + ' ' + txt) - s.send("\r\n") - data = s.recv(1024) - print data; - - s.send('CLOSE_DLS') - s.send("\r\n") - data = s.recv(1024) - print data; - - s.close() - - - print 'OK' - - except Exception, e: - #print e - print 'did not work out.' - dls_status = False - logger.info("Unable to connect to the update metadata - %s", e) - - - return - - - - - diff --git a/python_apps/pypo/install/pypo-install.py b/python_apps/pypo/install/pypo-install.py index 29b3edb58..32f3f873a 100755 --- a/python_apps/pypo/install/pypo-install.py +++ b/python_apps/pypo/install/pypo-install.py @@ -81,16 +81,16 @@ try: if architecture == '64bit' and natty: print "Installing 64-bit liquidsoap binary (Natty)" - shutil.copy("%s/../liquidsoap/liquidsoap-amd64-natty"%current_script_dir, "%s/../liquidsoap/liquidsoap"%current_script_dir) + shutil.copy("%s/../liquidsoap_bin/liquidsoap-amd64-natty"%current_script_dir, "%s/../liquidsoap_bin/liquidsoap"%current_script_dir) elif architecture == '32bit' and natty: print "Installing 32-bit liquidsoap binary (Natty)" - shutil.copy("%s/../liquidsoap/liquidsoap-i386-natty"%current_script_dir, "%s/../liquidsoap/liquidsoap"%current_script_dir) + shutil.copy("%s/../liquidsoap_bin/liquidsoap-i386-natty"%current_script_dir, "%s/../liquidsoap_bin/liquidsoap"%current_script_dir) elif architecture == '64bit' and not natty: print "Installing 64-bit liquidsoap binary" - shutil.copy("%s/../liquidsoap/liquidsoap-amd64"%current_script_dir, "%s/../liquidsoap/liquidsoap"%current_script_dir) + shutil.copy("%s/../liquidsoap_bin/liquidsoap-amd64"%current_script_dir, "%s/../liquidsoap_bin/liquidsoap"%current_script_dir) elif architecture == '32bit' and not natty: print "Installing 32-bit liquidsoap binary" - shutil.copy("%s/../liquidsoap/liquidsoap-i386"%current_script_dir, "%s/../liquidsoap/liquidsoap"%current_script_dir) + shutil.copy("%s/../liquidsoap_bin/liquidsoap-i386"%current_script_dir, "%s/../liquidsoap_bin/liquidsoap"%current_script_dir) else: print "Unknown system architecture." sys.exit(1) diff --git a/python_apps/pypo/liquidsoap/liquidsoap-amd64 b/python_apps/pypo/liquidsoap_bin/liquidsoap-amd64 similarity index 100% rename from python_apps/pypo/liquidsoap/liquidsoap-amd64 rename to python_apps/pypo/liquidsoap_bin/liquidsoap-amd64 diff --git a/python_apps/pypo/liquidsoap/liquidsoap-amd64-natty b/python_apps/pypo/liquidsoap_bin/liquidsoap-amd64-natty similarity index 100% rename from python_apps/pypo/liquidsoap/liquidsoap-amd64-natty rename to python_apps/pypo/liquidsoap_bin/liquidsoap-amd64-natty diff --git a/python_apps/pypo/liquidsoap/liquidsoap-i386 b/python_apps/pypo/liquidsoap_bin/liquidsoap-i386 similarity index 100% rename from python_apps/pypo/liquidsoap/liquidsoap-i386 rename to python_apps/pypo/liquidsoap_bin/liquidsoap-i386 diff --git a/python_apps/pypo/liquidsoap/liquidsoap-i386-natty b/python_apps/pypo/liquidsoap_bin/liquidsoap-i386-natty similarity index 100% rename from python_apps/pypo/liquidsoap/liquidsoap-i386-natty rename to python_apps/pypo/liquidsoap_bin/liquidsoap-i386-natty diff --git a/python_apps/pypo/scripts/library/Makefile b/python_apps/pypo/liquidsoap_scripts/library/Makefile similarity index 100% rename from python_apps/pypo/scripts/library/Makefile rename to python_apps/pypo/liquidsoap_scripts/library/Makefile diff --git a/python_apps/pypo/scripts/library/ask-liquidsoap.pl b/python_apps/pypo/liquidsoap_scripts/library/ask-liquidsoap.pl similarity index 100% rename from python_apps/pypo/scripts/library/ask-liquidsoap.pl rename to python_apps/pypo/liquidsoap_scripts/library/ask-liquidsoap.pl diff --git a/python_apps/pypo/scripts/library/ask-liquidsoap.rb b/python_apps/pypo/liquidsoap_scripts/library/ask-liquidsoap.rb similarity index 100% rename from python_apps/pypo/scripts/library/ask-liquidsoap.rb rename to python_apps/pypo/liquidsoap_scripts/library/ask-liquidsoap.rb diff --git a/python_apps/pypo/scripts/library/external-todo.liq b/python_apps/pypo/liquidsoap_scripts/library/external-todo.liq similarity index 100% rename from python_apps/pypo/scripts/library/external-todo.liq rename to python_apps/pypo/liquidsoap_scripts/library/external-todo.liq diff --git a/python_apps/pypo/scripts/library/externals.liq b/python_apps/pypo/liquidsoap_scripts/library/externals.liq similarity index 100% rename from python_apps/pypo/scripts/library/externals.liq rename to python_apps/pypo/liquidsoap_scripts/library/externals.liq diff --git a/python_apps/pypo/scripts/library/extract-replaygain b/python_apps/pypo/liquidsoap_scripts/library/extract-replaygain similarity index 100% rename from python_apps/pypo/scripts/library/extract-replaygain rename to python_apps/pypo/liquidsoap_scripts/library/extract-replaygain diff --git a/python_apps/pypo/scripts/library/interactive.screen b/python_apps/pypo/liquidsoap_scripts/library/interactive.screen similarity index 100% rename from python_apps/pypo/scripts/library/interactive.screen rename to python_apps/pypo/liquidsoap_scripts/library/interactive.screen diff --git a/python_apps/pypo/scripts/library/lastfm.liq b/python_apps/pypo/liquidsoap_scripts/library/lastfm.liq similarity index 100% rename from python_apps/pypo/scripts/library/lastfm.liq rename to python_apps/pypo/liquidsoap_scripts/library/lastfm.liq diff --git a/python_apps/pypo/scripts/library/liquidsoap.gentoo.initd b/python_apps/pypo/liquidsoap_scripts/library/liquidsoap.gentoo.initd similarity index 100% rename from python_apps/pypo/scripts/library/liquidsoap.gentoo.initd rename to python_apps/pypo/liquidsoap_scripts/library/liquidsoap.gentoo.initd diff --git a/python_apps/pypo/scripts/library/liquidsoap.gentoo.initd.in b/python_apps/pypo/liquidsoap_scripts/library/liquidsoap.gentoo.initd.in similarity index 100% rename from python_apps/pypo/scripts/library/liquidsoap.gentoo.initd.in rename to python_apps/pypo/liquidsoap_scripts/library/liquidsoap.gentoo.initd.in diff --git a/python_apps/pypo/scripts/library/liquidsoap.initd b/python_apps/pypo/liquidsoap_scripts/library/liquidsoap.initd similarity index 100% rename from python_apps/pypo/scripts/library/liquidsoap.initd rename to python_apps/pypo/liquidsoap_scripts/library/liquidsoap.initd diff --git a/python_apps/pypo/scripts/library/liquidsoap.initd.in b/python_apps/pypo/liquidsoap_scripts/library/liquidsoap.initd.in similarity index 100% rename from python_apps/pypo/scripts/library/liquidsoap.initd.in rename to python_apps/pypo/liquidsoap_scripts/library/liquidsoap.initd.in diff --git a/python_apps/pypo/scripts/library/liquidsoap.logrotate b/python_apps/pypo/liquidsoap_scripts/library/liquidsoap.logrotate similarity index 100% rename from python_apps/pypo/scripts/library/liquidsoap.logrotate rename to python_apps/pypo/liquidsoap_scripts/library/liquidsoap.logrotate diff --git a/python_apps/pypo/scripts/library/liquidsoap.logrotate.in b/python_apps/pypo/liquidsoap_scripts/library/liquidsoap.logrotate.in similarity index 100% rename from python_apps/pypo/scripts/library/liquidsoap.logrotate.in rename to python_apps/pypo/liquidsoap_scripts/library/liquidsoap.logrotate.in diff --git a/python_apps/pypo/scripts/library/liquidtts b/python_apps/pypo/liquidsoap_scripts/library/liquidtts similarity index 100% rename from python_apps/pypo/scripts/library/liquidtts rename to python_apps/pypo/liquidsoap_scripts/library/liquidtts diff --git a/python_apps/pypo/scripts/library/liquidtts.in b/python_apps/pypo/liquidsoap_scripts/library/liquidtts.in similarity index 100% rename from python_apps/pypo/scripts/library/liquidtts.in rename to python_apps/pypo/liquidsoap_scripts/library/liquidtts.in diff --git a/python_apps/pypo/scripts/library/pervasives.liq b/python_apps/pypo/liquidsoap_scripts/library/pervasives.liq similarity index 100% rename from python_apps/pypo/scripts/library/pervasives.liq rename to python_apps/pypo/liquidsoap_scripts/library/pervasives.liq diff --git a/python_apps/pypo/scripts/library/shoutcast.liq b/python_apps/pypo/liquidsoap_scripts/library/shoutcast.liq similarity index 100% rename from python_apps/pypo/scripts/library/shoutcast.liq rename to python_apps/pypo/liquidsoap_scripts/library/shoutcast.liq diff --git a/python_apps/pypo/scripts/library/test.liq b/python_apps/pypo/liquidsoap_scripts/library/test.liq similarity index 100% rename from python_apps/pypo/scripts/library/test.liq rename to python_apps/pypo/liquidsoap_scripts/library/test.liq diff --git a/python_apps/pypo/scripts/library/typing.liq b/python_apps/pypo/liquidsoap_scripts/library/typing.liq similarity index 100% rename from python_apps/pypo/scripts/library/typing.liq rename to python_apps/pypo/liquidsoap_scripts/library/typing.liq diff --git a/python_apps/pypo/scripts/library/utils.liq b/python_apps/pypo/liquidsoap_scripts/library/utils.liq similarity index 100% rename from python_apps/pypo/scripts/library/utils.liq rename to python_apps/pypo/liquidsoap_scripts/library/utils.liq diff --git a/python_apps/pypo/scripts/liquidsoap.cfg b/python_apps/pypo/liquidsoap_scripts/liquidsoap.cfg similarity index 100% rename from python_apps/pypo/scripts/liquidsoap.cfg rename to python_apps/pypo/liquidsoap_scripts/liquidsoap.cfg diff --git a/python_apps/pypo/scripts/ls_lib.liq b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq similarity index 86% rename from python_apps/pypo/scripts/ls_lib.liq rename to python_apps/pypo/liquidsoap_scripts/ls_lib.liq index 51a59e019..a1b551c97 100644 --- a/python_apps/pypo/scripts/ls_lib.liq +++ b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq @@ -1,6 +1,6 @@ def notify(m) - system("/usr/lib/airtime/pypo/bin/scripts/notify.sh --data='#{!pypo_data}' --media-id=#{m['schedule_table_id']}") - print("/usr/lib/airtime/pypo/bin/scripts/notify.sh --data='#{!pypo_data}' --media-id=#{m['schedule_table_id']}") + system("/usr/lib/airtime/pypo/bin/liquidsoap_scripts/notify.sh --data='#{!pypo_data}' --media-id=#{m['schedule_table_id']}") + print("/usr/lib/airtime/pypo/bin/liquidsoap_scripts/notify.sh --data='#{!pypo_data}' --media-id=#{m['schedule_table_id']}") end # A function applied to each metadata chunk diff --git a/python_apps/pypo/scripts/ls_script.liq b/python_apps/pypo/liquidsoap_scripts/ls_script.liq similarity index 100% rename from python_apps/pypo/scripts/ls_script.liq rename to python_apps/pypo/liquidsoap_scripts/ls_script.liq diff --git a/python_apps/pypo/scripts/notify.sh b/python_apps/pypo/liquidsoap_scripts/notify.sh similarity index 100% rename from python_apps/pypo/scripts/notify.sh rename to python_apps/pypo/liquidsoap_scripts/notify.sh diff --git a/python_apps/pypo/pypo-dls.py b/python_apps/pypo/pypo-dls.py deleted file mode 100755 index 5267efff1..000000000 --- a/python_apps/pypo/pypo-dls.py +++ /dev/null @@ -1,193 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -""" -Python part of radio playout (pypo) - -This function acts as a gateway between liquidsoap and the obp-api. -Mainliy used to tell the platform what pypo/LS does. - -Main case: - - whenever Liquidsoap starts playing a new track, its on_metadata callback calls - a function in liquidsoap (notify(m)) which then calls the python script here - with the currently starting filename as parameter - - this python script takes this parameter, tries to extract the actual - media id from it, and then calls back to API to tell it about it. - -""" - -# python defaults (debian default) -import time -import os -import traceback -from optparse import * -import sys -import time -import datetime -import logging -import logging.config -import urllib -import urllib2 -import string - -import socket - -# additional modules (should be checked) -from configobj import ConfigObj - -# custom imports -from util import * -from obp import * - -#set up command-line options -parser = OptionParser() - -# help screeen / info -usage = "%prog [options]" + " - notification gateway" -parser = OptionParser(usage=usage) - -#options -parser.add_option("-p", "--playing", help="Tell daddy what is playing right now", metavar="path") - -# parse options -(options, args) = parser.parse_args() - -# configure logging -logging.config.fileConfig("logging.cfg") - -# loading config file -try: - config = ConfigObj('config.cfg') - TMP_DIR = config['tmp_dir'] - BASE_URL = config['base_url'] - API_BASE = BASE_URL + 'mod/medialibrary/' - EXPORT_SOURCE = config['export_source'] - API_KEY = config['api_key'] - -except Exception, e: - print 'error: ', e - sys.exit() - - -class Global: - def __init__(self): - print - - def selfcheck(self): - self.api_auth = urllib.urlencode({'api_key': API_KEY}) - self.api_client = api_client.api_client_factory(config) - if (not self.api_client.is_server_compatible()): - sys.exit() - -class Notify: - def __init__(self): - - self.tmp_dir = TMP_DIR - self.export_source = EXPORT_SOURCE - - self.api_auth = urllib.urlencode({'api_key': API_KEY}) - self.api_client = api_client.api_client_factory(config) - - - def start_playing(self, options): - logger = logging.getLogger("start_playing") - - tnow = time.localtime(time.time()) - - path = options - - try: - file = path.split("/")[-1:][0] - if file.find('_cue_') > 0: - id = file.split("_cue_")[0] - else: - id = file.split(".")[-2:][0] - - except Exception, e: - #print e - id = False - - try: - id = int(id) - except Exception, e: - #print e - id = False - - print - print "Media ID: ", - print id - - # self.api_client.update_start_playing(id, self.export_source, path) - txt = "test this update" - - # Echo client program - HOST = '172.16.16.128' # The remote host - PORT = 50008 # The same port as used by the server - s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.connect((HOST, PORT)) - - s.send('client_zzzz') - s.send("\r\n") - data = s.recv(1024) - print data; - - s.send('RS_DLS_VERSION' + ' ' + '1') - s.send("\r\n") - data = s.recv(1024) - print data; - - s.send('SERVICE' + ' ' + 'OPENBRO+') - s.send("\r\n") - - s.send('PASSWORD' + ' ' + 'OPENBRO+') - s.send("\r\n") - data = s.recv(1024) - print data; - - s.send('CLEAR_DLS') - s.send("\r\n") - - s.send('SET_DLS' + ' ' + txt) - s.send("\r\n") - data = s.recv(1024) - print data; - - s.close() - - print data - - if data == "session": - print 'KKK' - - time.sleep(0.1) - print 'DONE' - - - - -if __name__ == '__main__': - print - print '#########################################' - print '# *** pypo *** #' - print '# pypo notification gateway #' - print '#########################################' - print - - # initialize - g = Global() - g.selfcheck() - n = Notify() - - -run = True -while run == True: - - logger = logging.getLogger("pypo notify") - - while options.playing: - try: n.start_playing(options.playing) - except Exception, e: - print e - sys.exit() - - sys.exit() diff --git a/python_apps/pypo/logging-api-validator.cfg b/python_apps/pypo/test/logging-api-validator.cfg similarity index 100% rename from python_apps/pypo/logging-api-validator.cfg rename to python_apps/pypo/test/logging-api-validator.cfg diff --git a/python_apps/pypo/pypo-api-validator.py b/python_apps/pypo/test/pypo-api-validator.py similarity index 100% rename from python_apps/pypo/pypo-api-validator.py rename to python_apps/pypo/test/pypo-api-validator.py diff --git a/python_apps/pypo/pypo-cue-in-validator.py b/python_apps/pypo/test/pypo-cue-in-validator.py similarity index 100% rename from python_apps/pypo/pypo-cue-in-validator.py rename to python_apps/pypo/test/pypo-cue-in-validator.py