Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SAAS-404: Separate the Airtime API version from the Airtime version 

* Airtime PHP side can be version bumped without pypo freaking out now
This commit is contained in:
Albert Santoni 2014-02-14 16:22:15 -05:00
parent a9cb71e248
commit 86dafaf61c
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
airtime_mvc/application/controllers/ApiController.php
View File

@ -65,7 +65,8 @@ class ApiController extends Zend_Controller_Action
public function versionAction() public function versionAction()
{ {
$this->_helper->json->sendJson( array( $this->_helper->json->sendJson( array(
"version" => Application_Model_Preference::GetAirtimeVersion())); "airtime_version" => Application_Model_Preference::GetAirtimeVersion(),
"api_version" => AIRTIME_API_VERSION));
} }
/** /**

29
python_apps/api_clients/api_client.py
View File

@ -17,7 +17,7 @@ import base64
import traceback import traceback
from configobj import ConfigObj from configobj import ConfigObj
AIRTIME_VERSION = "2.5.1" AIRTIME_API_VERSION = "1.1"
# TODO : Place these functions in some common module. Right now, media # TODO : Place these functions in some common module. Right now, media
@ -218,27 +218,30 @@ class AirtimeApiClient(object):
sys.exit(1) sys.exit(1)
def __get_airtime_version(self): def __get_airtime_version(self):
try: return self.services.version_url()[u'version'] try: return self.services.version_url()[u'airtime_version']
except Exception: return -1
def __get_api_version(self):
try: return self.services.version_url()[u'api_version']
except Exception: return -1 except Exception: return -1
def is_server_compatible(self, verbose=True): def is_server_compatible(self, verbose=True):
logger = self.logger logger = self.logger
version = self.__get_airtime_version() api_version = self.__get_api_version()
# logger.info('Airtime version found: ' + str(version)) # logger.info('Airtime version found: ' + str(version))
if version == -1: if api_version == -1:
if (verbose):
logger.info('Unable to get Airtime version number.\n')
return False
elif version[0:3] != AIRTIME_VERSION[0:3]:
if verbose: if verbose:
logger.info('Airtime version found: ' + str(version)) logger.info('Unable to get Airtime API version number.\n')
logger.info('pypo is at version ' + AIRTIME_VERSION + return False
' and is not compatible with this version of Airtime.\n') elif api_version[0:3] != AIRTIME_API_VERSION[0:3]:
if verbose:
logger.info('Airtime API version found: ' + str(api_version))
logger.info('pypo is only compatible with API version: ' + AIRTIME_API_VERSION)
return False return False
else: else:
if verbose: if verbose:
logger.info('Airtime version: ' + str(version)) logger.info('Airtime API version found: ' + str(api_version))
logger.info('pypo is at version ' + AIRTIME_VERSION + ' and is compatible with this version of Airtime.') logger.info('pypo is only compatible with API version: ' + AIRTIME_API_VERSION)
return True return True