Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '2.0.x' into devel

Browse source 
Conflicts:
	VERSION
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Nowplaying.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/application/models/airtime/CcShowInstances.php
This commit is contained in:
Martin Konecny 2012-02-14 14:47:07 -05:00
commit 54cbc86a0a
3234 changed files with 71062 additions and 781848 deletions
Download patch file Download diff file Expand all files Collapse all files

1
python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
View file

@ -131,6 +131,7 @@ class AirtimeMetadata:
self.logger.error("Exception %s", e)
return None
#check if file has any metadata
if file_info is None:
return None
#check if file has any metadata

3
python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
View file

@ -261,6 +261,9 @@ class MediaMonitorCommon:
return stdout.splitlines()
def touch_index_file(self):
dirname = os.path.dirname(self.timestamp_file)
if not os.path.exists(dirname):
os.makedirs(dirname)
open(self.timestamp_file, "w")
def organize_new_file(self, pathname):

2
python_apps/media-monitor/install/media-monitor-initialize.py
View file

@ -16,8 +16,10 @@ try:
#Start media-monitor daemon
print "* Waiting for media-monitor processes to start..."
"""
p = Popen("/etc/init.d/airtime-media-monitor stop", shell=True)
sts = os.waitpid(p.pid, 0)[1]
"""
p = Popen("/etc/init.d/airtime-media-monitor start-no-monit", shell=True)
sts = os.waitpid(p.pid, 0)[1]
except Exception, e: