diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install index 86691c427..4a9ff3a25 100755 --- a/install_minimal/airtime-install +++ b/install_minimal/airtime-install @@ -107,12 +107,28 @@ echo "* Making sure /etc/default/locale is set properly" set +e update-locale 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." + echo -e " * Fail\n" + echo "A non UTF-8 default locale found in /etc/default/locale. Airtime requires +a UTF-8 locale to run. To fix this please do the following: + +Ubuntu: +Put line 'en_US.UTF-8 UTF-8' (or similar) without quotes to '/var/lib/locales/supported.d/local', +replacing any existing lines. +A list of supported locales is available in '/usr/share/i18n/SUPPORTED' +Then run 'sudo dpkg-reconfigure locales' + +Debian: +Run 'sudo dpkg-reconfigure locales' and use the interface to select 'en_US.UTF-8 UTF-8' (or similar). +On the second page select this new locale as the default. + +After these changes have been made simply run install again. + +Now exiting install... +" exit 1 fi - +set -e # Check if airtime exists already set +e diff --git a/install_minimal/upgrades/airtime-2.1.3/data/upgrade.sql b/install_minimal/upgrades/airtime-2.1.3/data/upgrade.sql index 2f413bf0c..4e11ea91c 100644 --- a/install_minimal/upgrades/airtime-2.1.3/data/upgrade.sql +++ b/install_minimal/upgrades/airtime-2.1.3/data/upgrade.sql @@ -1,5 +1,5 @@ DELETE FROM cc_pref WHERE keystr = 'system_version'; INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.1.3'); -UPDATE cc_show_instances SET time_filled='00:00:00' WHERE time_filled IS NULL;\ +UPDATE cc_show_instances SET time_filled='00:00:00' WHERE time_filled IS NULL; ALTER TABLE cc_subjs ADD COLUMN cell_phone VARCHAR(255); diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py b/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py index 35c1830e6..35b5135ab 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py @@ -221,11 +221,17 @@ class AirtimeMetadata: md['MDATA_KEY_COPYRIGHT'] = self.truncate_to_length(md['MDATA_KEY_COPYRIGHT'], 512) #end of db truncation checks. - - md['MDATA_KEY_BITRATE'] = file_info.info.bitrate - md['MDATA_KEY_SAMPLERATE'] = file_info.info.sample_rate - md['MDATA_KEY_DURATION'] = self.format_length(file_info.info.length) - md['MDATA_KEY_MIME'] = file_info.mime[0] + try: + md['MDATA_KEY_BITRATE'] = getattr(file_info.info, "bitrate", 0) + md['MDATA_KEY_SAMPLERATE'] = getattr(file_info.info, "sample_rate", 0) + + #TODO: WHATS A GOOD DEFAULT VALUE??? + md['MDATA_KEY_DURATION'] = self.format_length(file_info.info.length) + + #TODO: WHATS A GOOD DEFAULT VALUE??? + md['MDATA_KEY_MIME'] = file_info.mime[0] + except Exception as e: + self.logger.warn(e) if "mp3" in md['MDATA_KEY_MIME']: md['MDATA_KEY_FTYPE'] = "audioclip" diff --git a/python_apps/pypo/airtime-playout-init-d b/python_apps/pypo/airtime-playout-init-d index 0723a657d..c2e27f320 100755 --- a/python_apps/pypo/airtime-playout-init-d +++ b/python_apps/pypo/airtime-playout-init-d @@ -73,7 +73,7 @@ monit_restart() { start-stop-daemon --stop --oknodo --retry TERM/5/0/30 --quiet --pidfile $PIDFILE1 rm -f $PIDFILE1 - start-stop-daemon --start --background --quiet --chuid $USERID:$GROUPID --make-pidfile --pidfile $PIDFILE0 --startas $DAEMON0 + start-stop-daemon --start --background --quiet --chuid $ROOTUSERID:$ROOTUSERID --make-pidfile --pidfile $PIDFILE0 --startas $DAEMON0 start-stop-daemon --start --background --quiet --chuid $USERID:$GROUPID \ --nicelevel -15 --make-pidfile --pidfile $PIDFILE1 --startas $DAEMON1