refactor: seperated cloning from settings

backend/app/__init__.py

@@ -1,11 +1,13 @@
-from flask import Flask
+# app/__init__.py
+
+import os
+from flask import Flask, jsonify
 from flask_cors import CORS
 from .regex import bp as regex_bp
 from .format import bp as format_bp
-from .settings import bp as settings_bp
 from .profile import bp as profile_bp
 from .git import bp as git_bp
-import os
+from .settings_utils import create_empty_settings_if_not_exists, load_settings
 
 REGEX_DIR = os.path.join('data', 'db', 'regex_patterns')
 FORMAT_DIR = os.path.join('data', 'db', 'custom_formats')
@@ -15,16 +17,22 @@ def create_app():
     app = Flask(__name__)
     CORS(app, resources={r"/*": {"origins": "*"}})
     
-    # Initialize directories to avoid issues with non-existing directories
+    # Initialize directories and create empty settings file if it doesn't exist
     initialize_directories()
+    create_empty_settings_if_not_exists()
     
     # Register Blueprints
     app.register_blueprint(regex_bp)
     app.register_blueprint(format_bp)
-    app.register_blueprint(settings_bp)
     app.register_blueprint(profile_bp)
-    app.register_blueprint(git_bp) 
-    
+    app.register_blueprint(git_bp)
+
+    # Add settings route
+    @app.route('/settings', methods=['GET'])
+    def handle_settings():
+        settings = load_settings()
+        return jsonify(settings), 200
+
     return app
 
 def initialize_directories():

backend/app/git/__init__.py

@@ -4,6 +4,9 @@ from .status.diff import get_diff
 from .branches.branches import Branch_Manager
 from .operations.operations import GitOperations
 from .unlink_repo import unlink_repository
+from .clone_repo import clone_repository
+from .authenticate import validate_git_token
+from ..settings_utils import save_settings
 import logging
 
 logger = logging.getLogger(__name__)
@@ -15,6 +18,41 @@ REPO_PATH = '/app/data/db'
 branch_manager = Branch_Manager(REPO_PATH)
 git_operations = GitOperations(REPO_PATH)
 
+@bp.route('/clone', methods=['POST'])
+def handle_clone_repository():
+    try:
+        new_settings = request.json
+        logger.info(f"Received new settings: {new_settings}")
+
+        # Validate required fields
+        required_fields = ['gitRepo', 'gitToken']
+        for field in required_fields:
+            if field not in new_settings:
+                logger.error(f"Missing required field: {field}")
+                return jsonify({"error": f"Missing required field: {field}"}), 400
+
+        # Validate Git token
+        if not validate_git_token(new_settings['gitRepo'], new_settings['gitToken']):
+            logger.warning("Invalid Git token provided")
+            return jsonify({"error": "Invalid Git token. Please check your credentials and try again."}), 401
+
+        # Attempt to clone the repository
+        success, message = clone_repository(new_settings['gitRepo'], REPO_PATH, new_settings['gitToken'])
+
+        if success:
+            # Only save the settings if the clone was successful
+            save_settings(new_settings)
+            logger.info("Settings updated and repository cloned successfully")
+            return jsonify({"message": "Repository cloned and settings updated successfully"}), 200
+        else:
+            logger.error(f"Failed to clone repository: {message}")
+            return jsonify({"error": message}), 400
+
+    except Exception as e:
+        logger.exception("Unexpected error in clone_repository")
+        return jsonify({"error": f"Failed to clone repository: {str(e)}"}), 500
+
+
 @bp.route('/status', methods=['GET'])
 def get_status():
     logger.debug("Received request for git status")

backend/app/git/unlink_repo.py

@@ -3,25 +3,31 @@ import shutil
 from flask import Blueprint, jsonify
 import logging
 
+# Import settings utilities
+from ..settings_utils import save_settings, load_settings
+
 logger = logging.getLogger(__name__)
 
-repo_bp = Blueprint('repository', __name__, url_prefix='/repository')
-
-def unlink_repository(settings_manager):
+def unlink_repository(repo_path):
     try:
+        # Load current settings
+        settings = load_settings()
+        if not settings:
+            return False, "Settings file not found or could not be loaded"
+
         # Remove the .git folder
-        git_folder = os.path.join(settings_manager.repo_path, '.git')
+        git_folder = os.path.join(repo_path, '.git')
         if os.path.exists(git_folder):
             shutil.rmtree(git_folder)
-            logger.info(f"Removed .git folder from {settings_manager.repo_path}")
+            logger.info(f"Removed .git folder from {repo_path}")
 
         # Update settings
-        settings_manager.settings.pop('gitRepo', None)
-        settings_manager.settings.pop('gitToken', None)
-        settings_manager.save_settings(settings_manager.settings)
+        settings.pop('gitRepo', None)
+        settings.pop('gitToken', None)
+        save_settings(settings)
         logger.info("Updated settings to remove git information")
 
         return True, "Repository successfully unlinked"
     except Exception as e:
         logger.error(f"Error unlinking repository: {str(e)}", exc_info=True)
-        return False, f"Error unlinking repository: {str(e)}"
+        return False, f"Error unlinking repository: {str(e)}"

backend/app/settings.py

@@ -1,74 +0,0 @@
-import os
-import yaml
-import git
-from flask import Blueprint, request, jsonify
-import logging
-from .git.clone_repo import clone_repository
-from .git.authenticate import validate_git_token
-from .settings_utils import load_settings, save_settings
-
-logging.basicConfig(level=logging.DEBUG)
-logging.getLogger('git').setLevel(logging.WARNING)
-logger = logging.getLogger(__name__)
-
-bp = Blueprint('settings', __name__, url_prefix='/settings')
-
-DATA_DIR = '/app/data'
-DB_DIR = os.path.join(DATA_DIR, 'db')
-SETTINGS_FILE = os.path.join(DATA_DIR, 'config', 'settings.yml')
-REGEX_DIR = os.path.join(DB_DIR, 'regex_patterns')
-FORMAT_DIR = os.path.join(DB_DIR, 'custom_formats')
-
-class SettingsManager:
-    def __init__(self):
-        self.settings = load_settings()
-        self.repo_url = self.settings.get('gitRepo') if self.settings else None
-        self.repo_path = DB_DIR
-
-    def clone_repository(self):
-        return clone_repository(self.repo_url, self.repo_path, self.settings["gitToken"])
-
-        
-settings_manager = SettingsManager()
-
-@bp.route('', methods=['GET'])
-def handle_settings():
-    settings = load_settings()
-    if not settings:
-        return jsonify({}), 204
-    return jsonify(settings), 200
-
-@bp.route('', methods=['POST'])
-def update_settings():
-    try:
-        new_settings = request.json
-        logger.info(f"Received new settings: {new_settings}")
-        
-        # Validate required fields
-        required_fields = ['gitRepo', 'gitToken']
-        for field in required_fields:
-            if field not in new_settings:
-                logger.error(f"Missing required field: {field}")
-                return jsonify({"error": f"Missing required field: {field}"}), 400
-
-        # Validate Git token
-        if not validate_git_token(new_settings['gitRepo'], new_settings['gitToken']):
-            logger.warning("Invalid Git token provided")
-            return jsonify({"error": "Invalid Git token. Please check your credentials and try again."}), 401
-
-        # Attempt to clone the repository before saving settings
-        settings_manager.settings = new_settings
-        settings_manager.repo_url = new_settings['gitRepo']
-        success, message = settings_manager.clone_repository()
-        
-        if success:
-            # Only save the settings if the clone was successful
-            save_settings(new_settings)
-            logger.info("Settings updated and repository cloned successfully")
-            return jsonify(new_settings), 200
-        else:
-            logger.error(f"Failed to clone repository: {message}")
-            return jsonify({"error": message}), 400
-    except Exception as e:
-        logger.exception("Unexpected error in update_settings")
-        return jsonify({"error": f"Failed to update settings: {str(e)}"}), 500

backend/app/settings_utils.py

@@ -21,4 +21,9 @@ def save_settings(settings):
         with open(SETTINGS_FILE, 'w') as file:
             yaml.dump(settings, file)
     except Exception as e:
-        pass
+        pass
+
+def create_empty_settings_if_not_exists():
+    if not os.path.exists(SETTINGS_FILE):
+        save_settings({})
+