Fix [Bug]: Short description of the issue #1093

Closes #1093

Author: kRHYME7

Configs/.local/lib/hyde/waybar.py

@@ -170,14 +170,28 @@ def get_current_layout_from_config():
 
     logger.debug("Fallback to legacy hash comparison method")
     logger.debug(f"Checking config: {CONFIG_JSONC}")
+    
+    layouts = find_layout_files()
+    if not layouts:
+        logger.error("No layout files found")
+        return None
+    
+    # If config.jsonc doesn't exist, just use the first available layout
     if not CONFIG_JSONC.exists():
-        logger.error("Config file not found")
+        logger.debug("Config file not found, using first available layout")
         CONFIG_JSONC.parent.mkdir(parents=True, exist_ok=True)
-        with open(CONFIG_JSONC, "w") as f:
-            json.dump({}, f)
+        
+        layout = layouts[0]
+        layout_name = os.path.basename(layout).replace(".jsonc", "")
+        set_state_value("WAYBAR_LAYOUT_PATH", layout)
+        set_state_value("WAYBAR_LAYOUT_NAME", layout_name)
+        
+        shutil.copyfile(layout, CONFIG_JSONC)
+        logger.debug(f"Created config.jsonc with first layout: {layout}")
+        return layout
 
+    # Try hash comparison for existing config
     config_hash = get_file_hash(CONFIG_JSONC)
-    layouts = find_layout_files()
     layout = None
 
     for layout_file in layouts:
@@ -189,8 +203,9 @@ def get_current_layout_from_config():
             layout = layout_file
             return layout
 
-    if not layout and layouts:
-        logger.debug("No current layout found by hash comparison")
+    # If no hash match found, use first layout as fallback
+    if not layout:
+        logger.debug("No current layout found by hash comparison, using first layout")
         current_layout_name = "unknown"
         backup_layout(current_layout_name)
         layout = layouts[0]
@@ -1443,47 +1458,74 @@ def main():
         logger.debug(f"State file found: {STATE_FILE}")
         layout_path = get_state_value("WAYBAR_LAYOUT_PATH")
 
-        if layout_path and os.path.exists(layout_path) and CONFIG_JSONC.exists():
-            config_hash = get_file_hash(CONFIG_JSONC)
-            layout_hash = get_file_hash(layout_path)
+        if layout_path and os.path.exists(layout_path):
+            # If config.jsonc doesn't exist, create it from the layout
+            if not CONFIG_JSONC.exists():
+                logger.debug("Config file missing, creating from layout path")
+                CONFIG_JSONC.parent.mkdir(parents=True, exist_ok=True)
+                shutil.copyfile(layout_path, CONFIG_JSONC)
+                logger.debug("Created config.jsonc from state file layout")
+            else:
+                config_hash = get_file_hash(CONFIG_JSONC)
+                layout_hash = get_file_hash(layout_path)
 
-            if config_hash != layout_hash:
-                logger.debug("Config hash differs from layout hash, creating backup")
-                layout_name = os.path.basename(layout_path).replace(".jsonc", "")
-                backup_layout(layout_name)
+                if config_hash != layout_hash:
+                    logger.debug("Config hash differs from layout hash, creating backup")
+                    layout_name = os.path.basename(layout_path).replace(".jsonc", "")
+                    backup_layout(layout_name)
 
-            try:
-                shutil.copyfile(layout_path, CONFIG_JSONC)
-                logger.debug("Updated config.jsonc with layout from state file")
-            except Exception as e:
-                logger.error(f"Failed to update config.jsonc: {e}")
+                try:
+                    shutil.copyfile(layout_path, CONFIG_JSONC)
+                    logger.debug("Updated config.jsonc with layout from state file")
+                except Exception as e:
+                    logger.error(f"Failed to update config.jsonc: {e}")
 
-        elif layout_path and not os.path.exists(layout_path) and CONFIG_JSONC.exists():
+        elif layout_path and not os.path.exists(layout_path):
             logger.warning(f"Layout path in state file doesn't exist: {layout_path}")
             layout_name = get_state_value("WAYBAR_LAYOUT_NAME")
             if layout_name:
                 logger.debug(f"Looking for layout by name: {layout_name}")
                 layouts = find_layout_files()
+                found_layout = None
                 for layout in layouts:
                     if os.path.basename(layout).replace(".jsonc", "") == layout_name:
                         logger.debug(f"Found layout by name: {layout}")
-
+                        found_layout = layout
+                        break
+                
+                if found_layout:
+                    # Update state and create/update config
+                    set_state_value("WAYBAR_LAYOUT_PATH", found_layout)
+                    CONFIG_JSONC.parent.mkdir(parents=True, exist_ok=True)
+                    
+                    if CONFIG_JSONC.exists():
                         config_hash = get_file_hash(CONFIG_JSONC)
-                        layout_hash = get_file_hash(layout)
-
+                        layout_hash = get_file_hash(found_layout)
                         if config_hash != layout_hash:
                             backup_layout(layout_name)
-
-                        set_state_value("WAYBAR_LAYOUT_PATH", layout)
-
-                        try:
-                            shutil.copyfile(layout, CONFIG_JSONC)
-                            logger.debug("Updated config.jsonc with layout by name")
-                        except Exception as e:
-                            logger.error(f"Failed to update config.jsonc: {e}")
-                        break
+                    
+                    shutil.copyfile(found_layout, CONFIG_JSONC)
+                    logger.debug("Updated config.jsonc with layout by name")
                 else:
                     logger.error(f"Could not find layout by name: {layout_name}")
+                    # Fall back to first available layout
+                    layouts = find_layout_files()
+                    if layouts:
+                        first_layout = layouts[0]
+                        first_layout_name = os.path.basename(first_layout).replace(".jsonc", "")
+                        set_state_value("WAYBAR_LAYOUT_PATH", first_layout)
+                        set_state_value("WAYBAR_LAYOUT_NAME", first_layout_name)
+                        CONFIG_JSONC.parent.mkdir(parents=True, exist_ok=True)
+                        shutil.copyfile(first_layout, CONFIG_JSONC)
+                        logger.debug(f"Used first available layout: {first_layout}")
+        else:
+            # No layout path in state file or layout path is empty
+            logger.debug("No valid layout path in state file, determining current layout")
+            current_layout = get_current_layout_from_config()
+            if current_layout:
+                CONFIG_JSONC.parent.mkdir(parents=True, exist_ok=True)
+                shutil.copyfile(current_layout, CONFIG_JSONC)
+                logger.debug(f"Created config.jsonc from determined layout: {current_layout}")
     else:
         logger.debug("State file not found, creating it")
         ensure_state_file()