Merge lp:~jfb-tempo-consulting/unifield-server/US-4373 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_instance/msf_instance.py'
--- bin/addons/msf_instance/msf_instance.py	2018-02-22 14:23:17 +0000
+++ bin/addons/msf_instance/msf_instance.py	2018-03-28 07:26:44 +0000
@@ -468,6 +468,7 @@
 
     _logger = logging.getLogger('cloud.backup')
     _empty_pass = 'X' * 10
+    _temp_folder = 'Temp'
 
     def _get_cloud_set_password(self, cr, uid, ids, fields, arg, context=None):
         ret = {}
@@ -631,6 +632,11 @@
         except webdav.ConnectionFailed, e:
             raise osv.except_osv(_('Warning !'), _('Unable to delete a test file: %s') % (e.message))
 
+        try:
+            dav.create_folder(self._temp_folder)
+        except webdav.ConnectionFailed, e:
+            raise osv.except_osv(_('Warning !'), _('Unable to create temp folder: %s') % (e.message))
+
         raise osv.except_osv(_('OK'), _('Connection to remote storage is OK'))
 
         return True
@@ -720,9 +726,13 @@
             if progress:
                 progress_obj = self.pool.get('msf.instance.cloud.progress').browse(cr, uid, progress)
 
+            dav.create_folder(self._temp_folder)
+            final_name = '%s-%s.zip' % (local_instance.instance, day_abr[today.day_of_week])
+            temp_drive_file = '%s/%s.zip' % (self._temp_folder, local_instance.instance)
 
-            dav.upload(temp_fileobj, '%s-%s.zip' % (local_instance.instance, day_abr[today.day_of_week]), buffer_size=buffer_size, log=True, progress_obj=progress_obj)
+            dav.upload(temp_fileobj, temp_drive_file, buffer_size=buffer_size, log=True, progress_obj=progress_obj)
             temp_fileobj.close()
+            dav.move(temp_drive_file, final_name)
 
             monitor.create(cr, uid, {'cloud_date': today.strftime('%Y-%m-%d %H:%M:%S'), 'cloud_backup': bck['name'], 'cloud_error': '', 'cloud_size': zip_size})
             if progress_obj:

=== modified file 'bin/tools/webdav.py'
--- bin/tools/webdav.py	2018-02-22 14:23:17 +0000
+++ bin/tools/webdav.py	2018-03-28 07:26:44 +0000
@@ -40,6 +40,21 @@
         else:
             raise ConnectionFailed(ctx_auth.get_last_error())
 
+    def create_folder(self, remote_path):
+        webUri = '%s%s' % (self.path, remote_path)
+        request_url = "%s/_api/web/GetFolderByServerRelativeUrl('%s')" % (self.baseurl, webUri)
+        options = RequestOptions(request_url)
+        options.method = HttpMethod.Post
+        options.set_header("X-HTTP-Method", "POST")
+        self.request.context.authenticate_request(options)
+        self.request.context.ensure_form_digest(options)
+        result = requests.post(url=request_url, data="", headers=options.headers, auth=options.auth)
+        if result.status_code not in (200, 201):
+            result = requests.post("%s/_api/Web/Folders/add('%s')" % (self.baseurl, webUri), data="", headers=options.headers, auth=options.auth)
+            if result.status_code not in (200, 201):
+                raise Exception(result.content)
+        return True
+
     def delete(self, remote_path):
         webUri = '%s%s' % (self.path, remote_path)
         request_url = "%s/_api/web/getfilebyserverrelativeurl('%s')" % (self.baseurl, webUri)
@@ -53,6 +68,21 @@
             raise Exception(result.content)
         return True
 
+    def move(self, remote_path, dest):
+        webUri = '%s%s' % (self.path, remote_path)
+        destUri = '%s%s' % (self.path, dest)
+        # falgs=1 to overwrite existing file
+        request_url = "%s_api/web/getfilebyserverrelativeurl('%s')/moveto(newurl='%s',flags=1)" % (self.baseurl, webUri, destUri)
+        options = RequestOptions(request_url)
+        options.method = HttpMethod.Post
+        options.set_header("X-HTTP-Method", "POST")
+        self.request.context.authenticate_request(options)
+        self.request.context.ensure_form_digest(options)
+        result = requests.post(url=request_url, data="", headers=options.headers, auth=options.auth)
+        if result.status_code not in (200, 201):
+            raise Exception(result.content)
+        return True
+
     def upload(self, fileobj, remote_path, buffer_size=None, log=False, progress_obj=False):
         iid = uuid.uuid1()
 
@@ -70,16 +100,23 @@
         if not buffer_size:
             buffer_size = 10* 1024 * 1024
         x = ""
-        webUri = '%s%s' % (self.path, remote_path)
+        split_name = remote_path.split('/')
+        new_file = split_name.pop()
+        split_name.insert(0, self.path)
+        path  = '/'.join(split_name)
+        if path[-1] != '/':
+            path += '/'
+        webUri = '%s%s' % (path, new_file)
+
         while True:
             if offset == -1:
-                request_url = "%s/_api/web/GetFolderByServerRelativeUrl('%s')/Files/add(url='%s',overwrite=true)" % (self.baseurl, self.path, remote_path)
+                request_url = "%s/_api/web/GetFolderByServerRelativeUrl('%s')/Files/add(url='%s',overwrite=true)" % (self.baseurl, path, new_file)
                 offset = 0
             elif not offset:
                 if len(x) == buffer_size:
                     request_url="%s/_api/web/getfilebyserverrelativeurl('%s')/startupload(uploadId=guid'%s')" % (self.baseurl, webUri, iid)
                 else:
-                    request_url = "%s/_api/web/GetFolderByServerRelativeUrl('%s')/Files/add(url='%s',overwrite=true)" % (self.baseurl, self.path, remote_path)
+                    request_url = "%s/_api/web/GetFolderByServerRelativeUrl('%s')/Files/add(url='%s',overwrite=true)" % (self.baseurl, path, new_file)
             elif len(x) == buffer_size:
                 request_url = "%s/_api/web/getfilebyserverrelativeurl('%s')/continueupload(uploadId=guid'%s',fileOffset=%s)" % (self.baseurl, webUri, iid, offset)
             else: