Remove dropbox_upload.py and add MARISOL documentation

.gitignore

@@ -12,3 +12,9 @@ debug_*.py
 dist/
 build/
 *.egg-info/
+
+# Auto-added by Marisol pipeline
+.pio/
+.gradle/
+*.class
+local.properties

dropbox_upload.py

@@ -21,6 +21,7 @@
 # OAuth2 access token.  TODO: login etc.
 TOKEN = 'YOUR_ACCESS_TOKEN'
 
+<<<<<<< Updated upstream
 parser = argparse.ArgumentParser(description='Sync ~/Downloads to Dropbox')
 parser.add_argument('folder', nargs='?', default='Downloads',
                     help='Folder name in your Dropbox')
@@ -35,6 +36,195 @@
                     help='Answer no to all questions')
 parser.add_argument('--default', '-d', action='store_true',
                     help='Take default answer on all questions')
+=======
+
+def parse_args(args=None):
+    """Parse command-line arguments for Dropbox upload.
+
+    Args:
+        args: List of command-line arguments (defaults to sys.argv[1:])
+
+    Returns:
+        argparse.Namespace: Parsed arguments containing folder, rootdir, token,
+                           yes, no, default flags
+    """
+    parser = argparse.ArgumentParser(
+        description='Sync ~/Downloads to Dropbox',
+        prog='dropbox_upload.py'
+    )
+    parser.add_argument('folder', nargs='?', default='Downloads',
+                        help='Folder name in your Dropbox')
+    parser.add_argument('rootdir', nargs='?', default='~/Downloads',
+                        help='Local directory to upload')
+    parser.add_argument('--token', default=TOKEN,
+                        help='Access token (see https://www.dropbox.com/developers/apps)')
+    parser.add_argument('--yes', '-y', action='store_true',
+                        help='Answer yes to all questions')
+    parser.add_argument('--no', '-n', action='store_true',
+                        help='Answer no to all questions')
+    parser.add_argument('--default', '-d', action='store_true',
+                        help='Take default answer on all questions')
+    parser.add_argument('--count', type=int, default=None,
+                        help='Maximum number of files to upload')
+
+    return parser.parse_args(args)
+
+
+def should_skip_file(filename):
+    """Determine if a file should be skipped based on its name.
+
+    Filters out:
+    - Dot files (starting with .)
+    - Temporary files (starting with @, ending with ~, or ending with .tmp/.temp)
+    - Generated files (ending with .pyc or .pyo)
+    - Generated directories (__pycache__)
+    - Empty filenames
+
+    Note: This check is case-sensitive (e.g., .PYC is not filtered).
+
+    Args:
+        filename: Name of the file to check (can be string or None)
+
+    Returns:
+        bool: True if file should be skipped, False otherwise
+    """
+    if filename is None:
+        return True
+
+    if not isinstance(filename, str):
+        try:
+            filename = str(filename)
+        except (ValueError, TypeError):
+            return True
+
+    if not filename:
+        return True
+
+    # Skip dot files (starting with .)
+    if filename.startswith('.'):
+        return True
+
+    # Skip temporary files (starting with @ or ~)
+    if filename.startswith('@') or filename.startswith('~'):
+        return True
+
+    # Skip temporary file extensions (.tmp, .temp)
+    if filename.endswith('.tmp') or filename.endswith('.temp'):
+        return True
+
+    # Skip generated Python bytecode files
+    if filename.endswith('.pyc') or filename.endswith('.pyo'):
+        return True
+
+    # Skip __pycache__ directories
+    if filename == '__pycache__':
+        return True
+
+    return False
+
+
+def upload(dbx, fullname, folder, subfolder, name, overwrite=False):
+    """Upload a file to Dropbox with error handling.
+
+    Args:
+        dbx: Dropbox client instance
+        fullname: Full path to the local file to upload
+        folder: Dropbox folder name
+        subfolder: Subfolder within Dropbox folder (can be empty)
+        name: Filename to use in Dropbox
+        overwrite: Whether to overwrite if file exists
+
+    Returns:
+        dict: Upload result with status information containing:
+            - status: 'success' or 'error'
+            - file_path: Dropbox path of uploaded file
+            - bytes_uploaded: Number of bytes uploaded
+            - message: Description of result
+    """
+    path = '/%s/%s/%s' % (folder, subfolder.replace(os.path.sep, '/'), name)
+    while '//' in path:
+        path = path.replace('//', '/')
+
+    mode = (dropbox.files.WriteMode.overwrite
+            if overwrite
+            else dropbox.files.WriteMode.add)
+
+    try:
+        # Get file size before upload
+        file_size = os.path.getsize(fullname)
+        mtime = os.path.getmtime(fullname)
+
+        with open(fullname, 'rb') as f:
+            data = f.read()
+
+        with stopwatch('upload %d bytes' % len(data)):
+            try:
+                res = dbx.files_upload(
+                    data, path, mode,
+                    client_modified=datetime.datetime(*time.gmtime(mtime)[:6]),
+                    mute=True)
+                print('Uploaded %s (%d bytes) -> %s' % (name, file_size, res.name))
+                return {
+                    'status': 'success',
+                    'file_path': path,
+                    'bytes_uploaded': file_size,
+                    'message': 'File uploaded successfully'
+                }
+            except dropbox.exceptions.ApiError as err:
+                error_msg = str(err)
+                if 'path' in error_msg and 'not_found' in error_msg:
+                    print('Error: Could not create subfolder, creating...')
+                    # Try creating parent folder first
+                    parent_path = '/'.join(path.split('/')[:-1])
+                    try:
+                        dbx.files_create_folder_v2(parent_path)
+                        print('Created folder:', parent_path)
+                        # Retry upload
+                        res = dbx.files_upload(
+                            data, path, mode,
+                            client_modified=datetime.datetime(*time.gmtime(mtime)[:6]),
+                            mute=True)
+                        print('Uploaded %s (%d bytes) -> %s' % (name, file_size, res.name))
+                        return {
+                            'status': 'success',
+                            'file_path': path,
+                            'bytes_uploaded': file_size,
+                            'message': 'File uploaded successfully after folder creation'
+                        }
+                    except Exception as folder_err:
+                        print('*** Failed to create folder:', folder_err)
+                        return {
+                            'status': 'error',
+                            'file_path': path,
+                            'bytes_uploaded': 0,
+                            'message': 'Failed to create folder: ' + str(folder_err)
+                        }
+                else:
+                    print('*** API error uploading %s: %s' % (name, error_msg))
+                    return {
+                        'status': 'error',
+                        'file_path': path,
+                        'bytes_uploaded': 0,
+                        'message': 'Upload failed: ' + error_msg
+                    }
+    except IOError as err:
+        print('*** IO error reading file %s: %s' % (fullname, err))
+        return {
+            'status': 'error',
+            'file_path': path,
+            'bytes_uploaded': 0,
+            'message': 'Failed to read file: ' + str(err)
+        }
+    except Exception as err:
+        print('*** Unexpected error uploading %s: %s' % (fullname, err))
+        return {
+            'status': 'error',
+            'file_path': path,
+            'bytes_uploaded': 0,
+            'message': 'Unexpected error: ' + str(err)
+        }
+
+>>>>>>> Stashed changes
 
 def main():
     """Main program.