temp

Author: nunogoncalves03

singlestoredb/fusion/handler.py

@@ -52,7 +52,9 @@
     json_string = ~r"\"[ !#-\[\]-\U0010ffff]*(?:\\(?:[\"\\/bfnrt]|u[0-9A-Fa-f]{4})[ !#-\[\]-\U0010ffff]*)*\""
     json_number = ~r"-?(0|[1-9][0-9]*)(\.\d*)?([eE][-+]?\d+)?"
 
-    file_location = ~r"(personal|shared)"i ws*
+    # TODO
+    # file_location = ~r"(personal|shared)"i ws*
+    # file_type = ~r"(file|folder)"i ws*
 '''  # noqa: E501
 
 BUILTINS = {
@@ -79,6 +81,9 @@
     '<file-location>': r'''
     file_location = { PERSONAL | SHARED }
     ''',
+    '<file-type>': r'''
+    file_type = { FILE | FOLDER }
+    ''',
 }
 
 BUILTIN_DEFAULTS = {  # type: ignore

singlestoredb/fusion/handlers/files.py

@@ -33,7 +33,7 @@ class ShowFilesHandler(SQLHandler):
     Arguments
     ---------
     * ``<file-location>``: The location of the file, it can
-      be either 'personal' or 'shared'.
+      be either 'PERSONAL' or 'SHARED'.
     * ``<path>``: A path in the personal/shared space.
     * ``<pattern>``: A pattern similar to SQL LIKE clause.
       Uses ``%`` as the wildcard character.
@@ -138,7 +138,7 @@ class UploadFileHandler(SQLHandler):
     Arguments
     ---------
     * ``<file-location>``: The location of the file, it can
-      be either 'personal' or 'shared'.
+      be either 'PERSONAL' or 'SHARED'.
     * ``<path>``: The path in the personal/shared space where the file is uploaded.
     * ``<local-path>``: The path to the file to upload in the local
       directory.
@@ -203,7 +203,7 @@ class DownloadFileHandler(SQLHandler):
     Arguments
     ---------
     * ``<file-location>``: The location of the file, it can
-      be either 'personal' or 'shared'.
+      be either 'PERSONAL' or 'SHARED'.
     * ``<path>``: The path to the file to download in a personal/shared space.
     * ``<encoding>``: The encoding to apply to the downloaded file.
     * ``<local-path>``: Specifies the path in the local directory
@@ -267,99 +267,71 @@ def run(self, params: Dict[str, Any]) -> Optional[FusionSQLResult]:
 DownloadFileHandler.register(overwrite=True)
 
 
-class DropFileHandler(SQLHandler):
+class DropHandler(SQLHandler):
     """
-    DROP <file-location> FILE path;
+    DROP <file-location> <file-type> path
+        [ recursive ];
 
     # Path to file
     path = '<path>'
 
+    # Should folders be deleted recursively?
+    recursive = RECURSIVE
+
     Description
     -----------
-    Deletes a file from a personal/shared space.
+    Deletes a file/folder from a personal/shared space.
 
     Arguments
     ---------
     * ``<file-location>``: The location of the file, it can
-      be either 'personal' or 'shared'.
+      be either 'PERSONAL' or 'SHARED'.
+    * ``<file-type>``: The type of the file, it can
+      be either 'FILE' or 'FOLDER'.
     * ``<path>``: The path to the file to delete in a personal/shared space.
 
     Remarks
     -------
+    * The ``RECURSIVE`` clause indicates that the specified folder
+      is deleted recursively.
 
     Example
     --------
-    The following commands delete a file from a personal/shared space::
+    The following commands delete a file/folder from a personal/shared space::
 
         DROP PERSONAL FILE '/data/stats.csv';
         DROP SHARED FILE '/data/stats.csv';
+        DROP PERSONAL FOLDER '/data/' RECURSIVE;
+        DROP SHARED FOLDER '/data/' RECURSIVE;
 
     See Also
     --------
-    * ``DROP PERSONAL FOLDER``
-    * ``DROP SHARED FOLDER``
 
     """  # noqa: E501
 
     def run(self, params: Dict[str, Any]) -> Optional[FusionSQLResult]:
         file_space = get_file_space(params)
-        file_space.remove(params['path'])
-        return None
-
-
-DropFileHandler.register(overwrite=True)
-
 
-class DropFolderHandler(SQLHandler):
-    """
-    DROP <file-location> FOLDER path
-        [ recursive ];
-
-    # Path to folder
-    path = '<path>'
+        file_type = params['file_type']
+        if not file_type:
+            raise KeyError('file type was not specified')
 
-    # Should folers be deleted recursively?
-    recursive = RECURSIVE
+        file_type = file_type.lower()
+        if file_type not in ['file', 'folder']:
+            raise ValueError('file type must be either FILE or FOLDER')
 
-    Description
-    -----------
-    Deletes a folder from a personal/shared space.
-
-    Arguments
-    ---------
-    * ``<file-location>``: The location of the file, it can
-      be either 'personal' or 'shared'.
-    * ``<path>``: The path to the folder to delete in a personal/shared space.
-
-    Remarks
-    -------
-    * The ``RECURSIVE`` clause indicates that the specified folder
-      is deleted recursively.
-
-    Example
-    -------
-    The following command recursively deletes a folder from a personal/shared space::
-
-        DROP PERSONAL FOLDER '/data/' RECURSIVE;
-        DROP SHARED FOLDER '/data/' RECURSIVE;
-
-    See Also
-    --------
-    * ``DROP PERSONAL FILE``
-    * ``DROP SHARED FILE``
-
-    """  # noqa: E501
+        if file_type == 'file':
+            file_space.remove(params['path'])
+        elif file_type == 'folder':
+            if params['recursive']:
+                file_space.removedirs(params['path'])
+            else:
+                file_space.rmdir(params['path'])
 
-    def run(self, params: Dict[str, Any]) -> Optional[FusionSQLResult]:
-        file_space = get_file_space(params)
-        if params['recursive']:
-            file_space.removedirs(params['path'])
-        else:
-            file_space.rmdir(params['path'])
         return None
 
 
-DropFolderHandler.register(overwrite=True)
+DropHandler.register(overwrite=True)
 
 
 class CreateFolderHandler(SQLHandler):
@@ -380,7 +352,7 @@ class CreateFolderHandler(SQLHandler):
     Arguments
     ---------
     * ``<file-location>``: The location of the file, it can
-      be either 'personal' or 'shared'.
+      be either 'PERSONAL' or 'SHARED'.
     * ``<path>``: The path in a personal/shared space where the folder
       is created. The path must end with a trailing slash (/).