From 500e43a331c3ab79f34397d5754ba97ea2f586d2 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Thu, 26 Nov 2015 21:38:14 +0200
Subject: [PATCH] version bumped to 0.29rc1

---
 motioneye/__init__.py       |  2 +-
 motioneye/server.py         | 20 +++++++++++++++++++-
 motioneye/uploadservices.py | 12 +++++-------
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/motioneye/__init__.py b/motioneye/__init__.py
index b9cb08a..b081463 100644
--- a/motioneye/__init__.py
+++ b/motioneye/__init__.py
@@ -1,2 +1,2 @@
 
-VERSION = "0.28.4-git"
+VERSION = "0.29rc1"
diff --git a/motioneye/server.py b/motioneye/server.py
index 7fd80bb..abb637c 100644
--- a/motioneye/server.py
+++ b/motioneye/server.py
@@ -289,7 +289,24 @@ def test_requirements():
         else:
             logging.info('v4l-utils not installed')
 
-        
+
+def make_media_folders():
+    import config
+    
+    config.get_main() # just to have main config already loaded
+    
+    camera_ids = config.get_camera_ids()
+    for camera_id in camera_ids:
+        camera_config = config.get_camera(camera_id)
+        if not os.path.exists(camera_config['target_dir']):
+            try:
+                os.makedirs(camera_config['target_dir'])
+            
+            except Exception as e:
+                logging.error('failed to create root media folder "%s" for camera with id %s: %s' % (
+                        camera_config['target_dir'], camera_id, e))
+
+
 def start_motion():
     import config
     import motionctl
@@ -337,6 +354,7 @@ def run():
     logging.info('hello! this is motionEye server %s' % motioneye.VERSION)
 
     test_requirements()
+    make_media_folders()
 
     if settings.SMB_SHARES:
         stop, start = smbctl.update_mounts()  # @UnusedVariable
diff --git a/motioneye/uploadservices.py b/motioneye/uploadservices.py
index 12fd2dd..494091c 100644
--- a/motioneye/uploadservices.py
+++ b/motioneye/uploadservices.py
@@ -100,7 +100,7 @@ class UploadService(object):
     
     def save(self):
         services = _load()
-        camera_services = services.get(self.camera_id, {})
+        camera_services = services.setdefault(self.camera_id, {})
         camera_services[self.NAME] = self
         
         _save(services)
@@ -146,7 +146,7 @@ class GoogleDrive(UploadService):
         self._folder_id = None
         
         UploadService.__init__(self, camera_id)
-
+        
     def get_authorize_url(self):
         query = {
             'scope': self.SCOPE,
@@ -168,6 +168,8 @@ class GoogleDrive(UploadService):
             return str(e)
 
     def upload_data(self, filename, mime_type, data):
+        filename = os.path.basename(filename)
+        
         metadata = {
             'title': filename,
             'parents': [{'id': self._get_folder_id()}]
@@ -395,9 +397,8 @@ class Dropbox(UploadService):
 
     MAX_FILE_SIZE = 128 * 1024 * 1024 # 128 MB
 
-    def __init__(self, camera_id, location=None, subfolders=True, authorization_key=None, credentials=None, **kwargs):
+    def __init__(self, camera_id, location=None, authorization_key=None, credentials=None, **kwargs):
         self._location = location
-        self._subfolders = subfolders
         self._authorization_key = authorization_key
         self._credentials = credentials
         
@@ -453,7 +454,6 @@ class Dropbox(UploadService):
     def dump(self):
         return {
             'location': self._location,
-            'subfolders': self._subfolders,
             'credentials': self._credentials,
             'authorization_key': self._authorization_key
         }
@@ -461,8 +461,6 @@ class Dropbox(UploadService):
     def load(self, data):
         if 'location' in data:
             self._location = data['location']
-        if 'subfolders' in data:
-            self._subfolders = data['subfolders']
         if 'credentials' in data:
             self._credentials = data['credentials']
         if 'authorization_key' in data:
-- 
2.39.5