stacksync
diff --git a/‎stacksync_api_swift/stacksync_api_swift/resources/data_handler.py‎
Lines changed: 32 additions & 2 deletions b/‎stacksync_api_swift/stacksync_api_swift/resources/data_handler.py‎
Lines changed: 32 additions & 2 deletions
diff --git a/‎stacksync_api_swift/stacksync_api_swift/resources/data_resource.py‎
Lines changed: 17 additions & 12 deletions b/‎stacksync_api_swift/stacksync_api_swift/resources/data_resource.py‎
Lines changed: 17 additions & 12 deletions
diff --git a/‎stacksync_api_swift/stacksync_api_swift/resources/file_resource.py‎
Lines changed: 12 additions & 3 deletions b/‎stacksync_api_swift/stacksync_api_swift/resources/file_resource.py‎
Lines changed: 12 additions & 3 deletions
diff --git a/‎tests/api_test_menu.py‎
Lines changed: 49 additions & 26 deletions b/‎tests/api_test_menu.py‎
Lines changed: 49 additions & 26 deletions
@@ -14,6 +14,7 @@ def do_start_response(self, *args):
     def upload_file_chunks(self, env, chunked_file, container):
         error = False
         self.app.logger.info('StackSync API: upload_file_chunks: container: %s', str(container))
+        upload_chunks = []
 	for k, v in chunked_file.chunk_dict.iteritems():
             chunk_name = k
             chunk_content = v[1]
@@ -25,17 +26,20 @@ def upload_file_chunks(self, env, chunked_file, container):
                                               agent=str(container))
 
             seg_resp = seg_req.get_response(self.app)
-            
+
             if not is_valid_status(seg_resp.status_int):
                 self.app.logger.error('StackSync API: upload_file_chunks: error uploading chunk %s', chunk_name)
                 error = True
                 break
+            upload_chunks.append(chunk_name)
 
         if error:
             self.app.logger.error(
                 'StackSync API: upload_file_chunks: status: %s description: Error uploading chunks to storage backend',
                 seg_resp.status)
             response = create_error_response(500, "Error uploading chunks to storage backend")
+            self.remove_chunks(env, upload_chunks, container)
+
         else:
             response = HTTPCreated()
 
@@ -52,7 +56,7 @@ def remove_old_chunks(self, env, chunks_diff, container):
                                               agent=str(container))
 
             seg_resp = seg_req.get_response(self.app)
-            
+
             if not is_valid_status(seg_resp.status_int):
                 self.app.logger.error('StackSync API: upload_file_chunks: error deleting old chunk %s', str(chunk_name))
                 error = True
@@ -67,6 +71,7 @@ def remove_old_chunks(self, env, chunks_diff, container):
             response = HTTPCreated()
 
         return response
+
     def get_chunks(self, env, chunks, container):
         file_compress_content = []
         self.app.logger.info('StackSync API: get_chunks: chunks: %s container: %s', str(chunks), str(container))
@@ -88,3 +93,28 @@ def get_chunks(self, env, chunks, container):
             # No chunks
             return file_compress_content, 200
 
+    def remove_chunks(self, env, chunks_names, container):
+        error = False
+        self.app.logger.info('StackSync API: internal remove uploaded chunks: container: %s', str(container))
+        for chunk_name in chunks_names:
+
+            env_aux = env.copy()
+            new_path = "/v1/" + env['stacksync_user_account'] + "/" + container + "/" + str(chunk_name)
+            del env_aux['HTTP_STACKSYNC_API']
+            seg_req = make_pre_authed_request(env_aux, method='DELETE', path=new_path,
+                                              agent=str(container))
+
+            seg_resp = seg_req.get_response(self.app)
+
+            if not is_valid_status(seg_resp.status_int):
+                self.app.logger.error('StackSync API: remove_chunks: error deleting uploaded chunks %s', str(chunk_name))
+                error = True
+                break
+
+        if error:
+            self.app.logger.error(
+                'StackSync API: upload_file_chunks: status: %s description: Error uploading chunks to storage backend',
+                seg_resp.status)
+            return False
+
+        return True
@@ -55,14 +55,25 @@ def PUT(request, api_library, app):
 
         workspace_info = json.loads(workspace_info)
         old_chunks = file_metadata['chunks']
-	app.logger.error("StackSync API: old_chunks: %s", old_chunks)
+	app.logger.info("StackSync API: old_chunks: %s", old_chunks)
         container_name = workspace_info['swift_container']
+
+        #Take the quota information
+        quota_limit = long(workspace_info['quota_limit'])
+        quota_used = long(workspace_info['quota_used'])
+        old_file_size = long(file_metadata['size'])
+
+        #check if the new file exced the quota limit
+        quota_used = quota_used - size
+        quota_used_after_put = quota_used + long(len(content))
+        if (quota_used_after_put > quota_limit):
+            return create_error_response(413, "Upload exceeds quota.")
+
         chunked_file = BuildFile(content, [])
         chunked_file.separate(file_id)
-        print 'new chunks', chunked_file.chunk_dict.keys() 
         chunks_diff_remove = list(set(old_chunks) - set(chunked_file.chunk_dict.keys()))
         data_handler = DataHandler(app)
-        
+
         #delete old chunks
         response = data_handler.remove_old_chunks(request.environ, chunks_diff_remove, container_name)
         if not is_valid_status(response.status_int):
@@ -72,12 +83,12 @@ def PUT(request, api_library, app):
             return create_error_response(500, "Could not upload chunks to storage backend.")
         #upload new chunks
         chunks_diff_add = list(set(chunked_file.chunk_dict.keys())-set(old_chunks))
-        chunks_no_diff =  list(set(chunked_file.chunk_dict.keys())-set(chunks_diff_add))                  
-        
+        chunks_no_diff =  list(set(chunked_file.chunk_dict.keys())-set(chunks_diff_add))
+
         for key in chunks_no_diff:
             del chunked_file.chunk_dict[key]
         response = data_handler.upload_file_chunks(request.environ, chunked_file, container_name)
-        
+
         if not is_valid_status(response.status_int):
             app.logger.error("StackSync API: data_resource PUT: error uploading file chunks: %s path info: %s",
                              str(response.status),
@@ -166,9 +177,3 @@ def GET(request, api_library, app):
         app.logger.error("StackSync API: data_resource GET: Cannot retrieve chunks. File_id: %s. Status: %s",
                          str(file_id), str(status))
         return create_error_response(status, "Cannot retrieve chunks from storage backend.")
-
-
-
-
-
-
 
@@ -59,6 +59,15 @@ def POST(request, api_library, app):
 
         workspace_info = json.loads(workspace_info)
         container_name = workspace_info['swift_container']
+        #Take the quota information
+        quota_used = long(workspace_info['quota_used'])
+        quota_limit = long(workspace_info['quota_limit'])
+
+        #check if the new file exced the quota limit
+        quota_used_after_put = long(quota_used) + long(len(content))
+        if (quota_used_after_put > quota_limit):
+            return create_error_response(413, "Upload exceeds quota.")
+
         chunked_file = BuildFile(content, [])
         chunked_file.separate()
 
@@ -111,7 +120,7 @@ def DELETE(request, api_library, app):
         app.logger.error("StackSync API: file_resource DELETE: Wrong resource path: %s path_info: %s", str(400),
                          str(request.path_info))
         return create_error_response(400, "Wrong resource path. Expected /file/:file_id")
-    
+
     app.logger.info('StackSync API: file_resource DELETE: path info: %s', request.path_info)
     user_id = request.environ["stacksync_user_id"]
 
@@ -131,7 +140,7 @@ def DELETE(request, api_library, app):
         return response
 
     workspace_info = json.loads(workspace_info)
-    data_handler = DataHandler(app)   
+    data_handler = DataHandler(app)
     file_metadata = json.loads(message)
     container_name = workspace_info['swift_container']
     response = data_handler.remove_old_chunks(request.environ, file_metadata['chunks'], container_name)
@@ -140,7 +149,7 @@ def DELETE(request, api_library, app):
         app.logger.error("StackSync API: data_resource DELETE: status code: %s. body: %s", str(response.status_int),
                          str(response.body))
         return response
-    
+
     message_delete = api_library.delete_item(user_id, file_id, is_folder=False)
 
     response = create_response(message_delete, status_code=200)
 
@@ -11,8 +11,8 @@
 from urlparse import parse_qs
 
 #BASE_URL = "http://10.30.239.237:8080/oauth"
-BASE_URL = 'http://localhost:8080/v1'
-BASE_URL_OAUTH = "http://10.30.233.214:8080/oauth"
+BASE_URL = 'http://10.30.238.232:8080/v1'
+BASE_URL_OAUTH = "http://10.30.238.232:8080/oauth"
 CLIENT_KEY = "b3af4e669daf880fb16563e6f36051b105188d413"
 CLIENT_SECRET = "c168e65c18d75b35d8999b534a3776cf"
 REQUEST_TOKEN_ENDPOINT = "/request_token"
@@ -24,32 +24,32 @@
                        client_secret=CLIENT_SECRET,
                        signature_type=SIGNATURE_TYPE_QUERY,
                        signature_method=SIGNATURE_PLAINTEXT,
-                       resource_owner_key='GmOFBjhSzC0A2rxrnM6gQWKnm6m3Ew',
-                       resource_owner_secret='RtA8hMYzgxnpoMxd8kBUtVQmcSvM4D')
+                       resource_owner_key='jBA2wUcPgCUezpPNSNnhOA4h5ZWJyZ',
+                       resource_owner_secret='o2NyFGYnk7JqOOwDeMAXrNMZBzARgo')
 
 
 
 
 # Main definition - constants
-menu_actions  = {}  
- 
+menu_actions  = {}
+
 # =======================
 #     MENUS FUNCTIONS
 # =======================
- 
+
 # Main menu
 def main_menu():
     os.system('clear')
-    
+
     print "Welcome,\n"
     print "Please choose the menu you want to start:"
     print "1. Menu 1"
     print "\n0. Quit"
     choice = raw_input(" >>  ")
     exec_menu(choice)
- 
+
     return
- 
+
 # Execute menu
 def exec_menu(choice):
     os.system('clear')
@@ -63,7 +63,7 @@ def exec_menu(choice):
             print "Invalid selection, please try again.\n"
             menu_actions['main_menu']()
     return
- 
+
 # Menu 1
 def menu1():
     while True:
@@ -79,11 +79,12 @@ def menu1():
         print "10. Update folder metadata"
         print "11. Delete a file"
         print "12. Get folder"
+        print "13. Upload a new File"
         print "0. Quit"
         choice = raw_input(" >>  ")
         exec_menu(choice)
     return
-  
+
 # Back to main menu
 def back():
     menu_actions['main_menu']()
@@ -97,7 +98,7 @@ def create_new_file():
 	else:
 	    url = BASE_URL +"/file?name="+name
 	uri, headers, _ = client.sign(url, http_method='GET')
-	
+
 	content_file = raw_input("Content file:  ")
         headers['StackSync-API'] = "v2"
         headers['Content-Type'] = "text/plain"
@@ -108,6 +109,27 @@ def create_new_file():
     else:
     	print 'Can not create a new file without name'
 
+def upload_new_file():
+    name = raw_input("File name:  ")
+    if name:
+        parent = raw_input("Parent id:  ")
+	if parent:
+	    url = BASE_URL +"/file?name="+name+"&parent="+parent
+	else:
+	    url = BASE_URL +"/file?name="+name
+        uri, headers, _ = client.sign(url, http_method='GET')
+        path = raw_input("Absolute path of the file:  ")
+        #with open (path, "r") as myfile:
+        #    data=myfile.read()
+        files = {'file': open(path, 'rb')}
+        headers['StackSync-API'] = "v2"
+        r = requests.post(uri, files=files, headers=headers)
+        print 'response', r
+        print 'response', r.text
+    else:
+    	print 'Can not create a new file without name'
+
+
 def update_file_data():
     file_id = raw_input("File id:  ")
     url = BASE_URL +'/file/'+str(file_id)+'/data'
@@ -126,7 +148,7 @@ def update_file_metadata():
     uri, headers, _ = client.sign(url, http_method='GET')
     new_name = raw_input("New name:  ")
     new_parent = raw_input("New parent id: ")
-    if not new_name and not new_parent:	
+    if not new_name and not new_parent:
 	print 'Can not update metadata without any parameter'
     else:
 	if not new_parent:
@@ -156,7 +178,7 @@ def get_file_data():
     file_id = raw_input("File id:  ")
     url = BASE_URL +'/file/'+str(file_id)+'/data'
     uri, headers, _ = client.sign(url, http_method='GET')
-    headers['StackSync-API'] = "v2"  
+    headers['StackSync-API'] = "v2"
     headers['Content-Type'] = "application/json"
     r = requests.get(uri, headers=headers)
     print 'response', r
@@ -166,7 +188,7 @@ def create_new_folder():
     uri, headers, _ = client.sign(url, http_method='GET')
     new_name = raw_input("Name:  ")
     new_parent = raw_input("Parent id: ")
-    if not new_name:	
+    if not new_name:
 	print 'Can not create folder without name'
     else:
 	if not new_parent:
@@ -182,32 +204,32 @@ def share_folder():
     file_id = raw_input("File id:  ")
     url = BASE_URL +'/folder/'+str(file_id)+'/share'
     uri, headers, _ = client.sign(url, http_method='GET')
-    headers['StackSync-API'] = "v2"  
+    headers['StackSync-API'] = "v2"
     headers['Content-Type'] = "application/json"
     emails = raw_input("mails to share (separated by comma):  ")
     shared_to = emails.split(",")
     r = requests.post(uri, json.dumps(shared_to), headers=headers)
     print 'response', r
-    print 'response', r.text    
+    print 'response', r.text
 def unshare_folder():
     file_id = raw_input("File id:  ")
     url = BASE_URL +'/folder/'+str(file_id)+'/unshare'
     uri, headers, _ = client.sign(url, http_method='GET')
-    headers['StackSync-API'] = "v2"  
+    headers['StackSync-API'] = "v2"
     headers['Content-Type'] = "application/json"
     emails = raw_input("mails to unshare (separated by comma):  ")
     shared_to = emails.split(",")
     r = requests.post(uri, json.dumps(shared_to), headers=headers)
     print 'response', r
-    print 'response', r.text   
+    print 'response', r.text
 
 def update_folder_metadata():
     folder_id = raw_input("Folder id:  ")
     url = BASE_URL +'/folder/'+str(folder_id)
     uri, headers, _ = client.sign(url, http_method='GET')
     new_name = raw_input("New name:  ")
     new_parent = raw_input("New parent id: ")
-    if not new_name and not new_parent:	
+    if not new_name and not new_parent:
 	print 'Can not update metadata without any parameter'
     else:
 	if not new_parent:
@@ -242,7 +264,7 @@ def get_folder():
     uri, headers, _ = client.sign(url,
                                    http_method='GET')
     headers['StackSync-API'] = "v2"
-    
+
     headers['Content-Type'] = "text/plain"
     r = requests.get(uri, headers=headers)
     print 'response status', r
@@ -252,11 +274,11 @@ def get_folder():
 # Exit program
 def exit():
     sys.exit()
- 
+
 # =======================
 #    MENUS DEFINITIONS
 # =======================
- 
+
 # Menu definition
 menu_actions = {
     'main_menu': main_menu,
@@ -272,13 +294,14 @@ def exit():
     '10': update_folder_metadata,
     '11': delete_file,
     '12': get_folder,
+    '13': upload_new_file,
     '0': exit,
 }
- 
+
 # =======================
 #      MAIN PROGRAM
 # =======================
- 
+
 # Main Program
 if __name__ == "__main__":
     # Launch main menu