From f2a9d6f117275d7d3d3059ef1f686a3a6e1df89c Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sun, 28 Feb 2016 20:13:10 +0200 Subject: [PATCH] never remove root media folder --- motioneye/mediafiles.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/motioneye/mediafiles.py b/motioneye/mediafiles.py index ddf710d..d637d8e 100644 --- a/motioneye/mediafiles.py +++ b/motioneye/mediafiles.py @@ -53,7 +53,7 @@ def findfiles(path): files = [] for name in os.listdir(path): pathname = os.path.join(path, name) - st = os.stat(pathname) + st = os.lstat(pathname) mode = st.st_mode if stat.S_ISDIR(mode): files.extend(findfiles(pathname)) @@ -703,6 +703,9 @@ def del_media_content(camera_config, path, media_type): target_dir = camera_config.get('target_dir') full_path = os.path.join(target_dir, path) + + # create a sentinel file to make sure the target dir is never removed + open(os.path.join(target_dir, '.keep'), 'w').close() try: # remove the file itself @@ -738,6 +741,9 @@ def del_media_group(camera_config, group, media_type): target_dir = camera_config.get('target_dir') full_path = os.path.join(target_dir, group) + # create a sentinel file to make sure the target dir is never removed + open(os.path.join(target_dir, '.keep'), 'w').close() + mf = _list_media_files(target_dir, exts=exts, prefix=group) for (path, st) in mf: # @UnusedVariable try: -- 2.39.5