Merge branch '2.0.x' into devel
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:
commit
54cbc86a0a
3234 changed files with 71062 additions and 781848 deletions
|
@ -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):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue