Merge branch '2.1.2' into 2.1.x

Conflicts:
	python_apps/pypo/pypofetch.py
This commit is contained in:
Martin Konecny 2012-06-18 14:57:22 -04:00
commit 27a6326c58
10 changed files with 53 additions and 4 deletions

View File

@ -1,3 +1,10 @@
=======
CREDITS
=======
Version 2.1.2
-------------
Same as previous version.
=======
CREDITS
=======

View File

@ -1,2 +1,2 @@
PRODUCT_ID=Airtime
PRODUCT_RELEASE=2.1.1
PRODUCT_RELEASE=2.1.2

View File

@ -1,3 +1,7 @@
2.1.2 - June 18th, 2012
* Bug Fixes
* Fixed problem where playout engine may not retrieve program schedule after extended periods of user inactivity.
2.1.1 - June 12th, 2012
* Changes
* Add Media page will now display error message and reject uploaded file if it is corrupt

View File

@ -1,3 +1,3 @@
<?php
define('AIRTIME_VERSION', '2.1.1');
define('AIRTIME_VERSION', '2.1.2');

View File

@ -108,5 +108,9 @@ if (strcmp($version, "2.1.1") < 0){
passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.1.1/airtime-upgrade.php");
pause();
}
if (strcmp($version, "2.1.2") < 0){
passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.1.2/airtime-upgrade.php");
pause();
}
echo "******************************* Upgrade Complete *******************************".PHP_EOL;

View File

@ -0,0 +1,24 @@
<?php
/* All functions other than start() should be marked as
* private.
*/
class AirtimeDatabaseUpgrade{
public static function start($p_dbValues){
echo "* Updating Database".PHP_EOL;
self::task0($p_dbValues);
echo " * Complete".PHP_EOL;
}
private static function task0($p_dbValues){
$username = $p_dbValues['database']['dbuser'];
$password = $p_dbValues['database']['dbpass'];
$host = $p_dbValues['database']['host'];
$database = $p_dbValues['database']['dbname'];
$dir = __DIR__;
passthru("export PGPASSWORD=$password && psql -h $host -U $username -q -f $dir/data/upgrade.sql $database 2>&1 | grep -v \"will create implicit index\"");
}
}

View File

@ -0,0 +1,8 @@
<?php
require_once 'DbUpgrade.php';
$filename = "/etc/airtime/airtime.conf";
$values = parse_ini_file($filename, true);
AirtimeDatabaseUpgrade::start($values);

View File

@ -0,0 +1,2 @@
DELETE FROM cc_pref WHERE keystr = 'system_version';
INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.1.2');

View File

@ -20,7 +20,7 @@ from configobj import ConfigObj
import string
import hashlib
AIRTIME_VERSION = "2.1.1"
AIRTIME_VERSION = "2.1.2"
def api_client_factory(config, logger=None):
if logger != None:

View File

@ -404,7 +404,7 @@ class PypoFetch(Thread):
- runs the cleanup routine, to get rid of unused cached files
"""
def process_schedule(self, schedule_data):
self.last_update_schedule_timestamp = time.time()
self.last_update_schedule_timestamp = time.time()
self.logger.debug(schedule_data)
media = schedule_data["media"]
media_filtered = {}