diff --git a/airtime_mvc/application/configs/ACL.php b/airtime_mvc/application/configs/ACL.php index a8e6b2adc..b60f06a4d 100644 --- a/airtime_mvc/application/configs/ACL.php +++ b/airtime_mvc/application/configs/ACL.php @@ -35,6 +35,7 @@ $ccAcl->allow('G', 'index') ->allow('G', 'schedule') ->allow('G', 'dashboard') ->allow('G', 'audiopreview') + ->allow('H', 'preference', 'is-import-in-progress') ->allow('H', 'usersettings') ->allow('H', 'plupload') ->allow('H', 'library') @@ -42,7 +43,7 @@ $ccAcl->allow('G', 'index') ->allow('A', 'playouthistory') ->allow('A', 'user') ->allow('A', 'systemstatus') - ->allow('A', 'preference'); + ->allow('A', 'preference', 'admin'); $aclPlugin = new Zend_Controller_Plugin_Acl($ccAcl); diff --git a/python_apps/pypo/pypofile.py b/python_apps/pypo/pypofile.py index 6f9a213e6..cf8e199e9 100644 --- a/python_apps/pypo/pypofile.py +++ b/python_apps/pypo/pypofile.py @@ -60,10 +60,14 @@ class PypoFile(Thread): except Exception, e: dst_exists = False + media_item['already_exist'] = False do_copy = False if dst_exists: if src_size != dst_size: do_copy = True + else: + self.logger.debug("file %s already exists in local cache as %s, skipping cpoying..." % (src, dst)) + media_item['already_exist'] = True else: do_copy = True diff --git a/python_apps/pypo/pypopush.py b/python_apps/pypo/pypopush.py index 347b856fa..cb71937a3 100644 --- a/python_apps/pypo/pypopush.py +++ b/python_apps/pypo/pypopush.py @@ -344,7 +344,7 @@ class PypoPush(Thread): time.sleep(0.1) iter_num += 1 - if media_item['started_copying']: + if media_item['started_copying'] or media_item['already_exist']: self.telnet_to_liquidsoap(media_item) else: self.logger.warn("File %s did not become ready in less than 5 seconds. Skipping...", media_item['dst'])