From: Calin Crisan <ccrisan@gmail.com>
Date: Sat, 19 Sep 2015 11:18:59 +0000 (+0300)
Subject: cleanup: never remove the root directory
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=8135e6c4b96f9288fba23cb86d6140db94ccb89e;p=motioneye-debian

cleanup: never remove the root directory
---

diff --git a/motioneye/cleanup.py b/motioneye/cleanup.py
index a032ef1..f635200 100644
--- a/motioneye/cleanup.py
+++ b/motioneye/cleanup.py
@@ -31,9 +31,12 @@ _process = None
 
 
 def start():
+    if not settings.CLEANUP_INTERVAL:
+        return
+
     # schedule the first call a bit later to improve performance at startup
     ioloop = tornado.ioloop.IOLoop.instance()
-    ioloop.add_timeout(datetime.timedelta(seconds=60), _run_process)
+    ioloop.add_timeout(datetime.timedelta(seconds=min(settings.CLEANUP_INTERVAL, 60)), _run_process)
 
 
 def stop():
diff --git a/motioneye/mediafiles.py b/motioneye/mediafiles.py
index 88252b4..42149fa 100644
--- a/motioneye/mediafiles.py
+++ b/motioneye/mediafiles.py
@@ -190,8 +190,11 @@ def cleanup_media(media_type):
             continue # only cleanup movies for cameras with movies enabled
 
         preserve_moment = datetime.datetime.now() - datetime.timedelta(days=preserve_media)
-            
+
         target_dir = camera_config.get('target_dir')
+        # create a sentinel file to make sure the target dir is never removed
+        open(os.path.join(target_dir, '.keep'), 'w').close()
+
         _remove_older_files(target_dir, preserve_moment, exts=exts)