Update utils/github_fetcher.py

utils/github_fetcher.py

@@ -26,13 +26,13 @@ class GitHubRepoFetcher:
         Returns:
             List of dictionaries containing file/directory information
         """
+        # Normalize path
+        path = path.strip('/')
         path = path.replace('\\', '/')
-        # Remove 'blob/main/' or 'tree/main/' from path if present
         path = path.replace('blob/main/', '').replace('tree/main/', '')
         path = path.replace('blob/master/', '').replace('tree/master/', '')
         
         url = f'{self.base_url}/repos/{owner}/{repo}/contents/{path}'
-
         
         try:
             response = requests.get(url, headers=self.headers)
@@ -51,17 +51,17 @@ class GitHubRepoFetcher:
     def download_file(self, owner: str, repo: str, path: str, save_path: str = None) -> Optional[Union[str, bytes]]:
         """Download a specific file from the repository."""
         try:
+            # Normalize path
+            path = path.strip('/')
+            path = path.replace('\\', '/')
             path = path.replace('blob/main/', '').replace('tree/main/', '')
             path = path.replace('blob/master/', '').replace('tree/master/', '')
             
             url = f'{self.base_url}/repos/{owner}/{repo}/contents/{path}'
-            print(f"Fetching file from: {url}")  # Debug log
+            print(f"Fetching file from: {url}")
             
             response = requests.get(url, headers=self.headers)
-            if response.status_code != 200:
-                print(f"GitHub API error: {response.status_code}")
-                print(f"Response: {response.text}")
-                return None
+            response.raise_for_status()
                 
             content = response.json()
             if not content.get('content'):
@@ -101,35 +101,47 @@ class GitHubRepoFetcher:
         Returns:
             Boolean indicating success
         """
-        # Remove 'tree/main/' or 'tree/master/' from path if present
-        path = path.replace('tree/main/', '').replace('tree/master/', '')
-        
-        contents = self.fetch_contents(owner, repo, path)
-        if not contents:
-            print(f"Failed to fetch contents for path: {path}")
-            return False
-        
-        print(f"\nProcessing directory: {path or 'root'}")
-        
-        success = True
-        for item in contents:
-            item_path = item['path']
-            local_item_path = os.path.join(local_path, os.path.basename(item_path))
+        try:
+            # Normalize path
+            path = path.strip('/')
+            path = path.replace('\\', '/')
+            path = path.replace('blob/main/', '').replace('tree/main/', '')
+            path = path.replace('blob/master/', '').replace('tree/master/', '')
             
-            try:
-                if item['type'] == 'dir':
-                    os.makedirs(local_item_path, exist_ok=True)
-                    if not self.download_directory(owner, repo, item_path, local_item_path):
-                        success = False
-                else:
-                    print(f"Downloading file: {item_path}")
-                    result = self.download_file(owner, repo, item_path, local_item_path)
-                    if result is None and local_item_path not in self.downloaded_files:
-                        success = False
-                    else:
-                        print(f"Successfully downloaded: {item_path}")
-            except Exception as e:
-                print(f"Error processing {item_path}: {str(e)}")
-                success = False
+            print(f"Fetching directory: {path} for {owner}/{repo}")
+            
+            contents = self.fetch_contents(owner, repo, path)
+            if not contents:
+                print(f"Failed to fetch contents for path: {path}")
+                return False
+            
+            print(f"Processing directory: {path or 'root'}")
+            os.makedirs(local_path, exist_ok=True)
+            
+            success = True
+            for item in contents:
+                item_path = item['path']
+                # Use basename for local path to maintain correct directory structure
+                local_item_path = os.path.join(local_path, os.path.basename(item_path))
                 
-        return success
+                try:
+                    if item['type'] == 'dir':
+                        print(f"Found directory: {item_path}")
+                        if not self.download_directory(owner, repo, item_path, local_item_path):
+                            success = False
+                    else:
+                        print(f"Downloading file: {item_path}")
+                        result = self.download_file(owner, repo, item_path, local_item_path)
+                        if result is None and local_item_path not in self.downloaded_files:
+                            success = False
+                        else:
+                            print(f"Successfully downloaded: {item_path}")
+                except Exception as e:
+                    print(f"Error processing {item_path}: {str(e)}")
+                    success = False
+                    
+            return success
+                    
+        except Exception as e:
+            print(f"Error in download_directory: {str(e)}")
+            return False