Upload githubService.js

backend/src/services/githubService.js

@@ -57,6 +57,7 @@ class GitHubService {
           
           // 测试是否可以访问仓库内容
           let canAccessContents = false;
+          let repoEmpty = false;
           try {
             await axios.get(`${this.apiUrl}/repos/${owner}/${repo}/contents`, {
               headers: {
@@ -67,6 +68,12 @@ class GitHubService {
             canAccessContents = true;
           } catch (contentsError) {
             console.log(`Cannot access repository contents: ${contentsError.message}`);
+            
+            // 如果是409错误，说明仓库为空
+            if (contentsError.response?.status === 409) {
+              repoEmpty = true;
+              console.log('Repository appears to be empty, will initialize when needed');
+            }
           }
           
           repoResults.push({ 
@@ -75,7 +82,9 @@ class GitHubService {
             name: repoResponse.data.full_name,
             permissions,
             canAccessContents,
-            defaultBranch: repoResponse.data.default_branch
+            repoEmpty,
+            defaultBranch: repoResponse.data.default_branch,
+            size: repoResponse.data.size
           });
         } catch (error) {
           console.error(`Repository access error for ${repoUrl}:`, error.response?.data || error.message);
@@ -97,6 +106,65 @@ class GitHubService {
     return { owner: match[1], repo: match[2] };
   }
 
+  // 初始化空仓库
+  async initializeRepository(repoIndex = 0) {
+    if (this.useMemoryStorage) {
+      return { success: false, reason: 'Using memory storage' };
+    }
+
+    try {
+      const repoUrl = this.repositories[repoIndex];
+      const { owner, repo } = this.parseRepoUrl(repoUrl);
+      
+      console.log(`Initializing empty repository: ${owner}/${repo}`);
+      
+      // 创建初始README文件
+      const readmeContent = Buffer.from(`# PPTist Data Repository
+
+This repository stores PPT data for the PPTist application.
+
+## Structure
+
+\`\`\`
+users/
+├── PS01/
+│   ├── README.md
+│   └── *.json (PPT files)
+├── PS02/
+│   ├── README.md
+│   └── *.json (PPT files)
+└── ...
+\`\`\`
+
+## Auto-generated
+
+This repository is automatically managed by PPTist Huggingface Space.
+Do not manually edit files unless you know what you're doing.
+`).toString('base64');
+
+      const response = await axios.put(
+        `${this.apiUrl}/repos/${owner}/${repo}/contents/README.md`,
+        {
+          message: 'Initialize repository for PPTist data storage',
+          content: readmeContent,
+          branch: 'main'
+        },
+        {
+          headers: {
+            'Authorization': `token ${this.token}`,
+            'Accept': 'application/vnd.github.v3+json'
+          }
+        }
+      );
+
+      console.log(`Repository initialized successfully: ${response.data.commit.sha}`);
+      return { success: true, commit: response.data.commit.sha };
+    } catch (error) {
+      console.error('Repository initialization failed:', error.response?.data || error.message);
+      return { success: false, error: error.message };
+    }
+  }
+
   // 获取文件内容
   async getFile(userId, fileName, repoIndex = 0) {
     // 如果使用内存存储
@@ -190,126 +258,150 @@ class GitHubService {
     } catch (error) {
       console.error(`GitHub save failed:`, error.response?.data || error.message);
       
+      // 特殊处理空仓库的情况
+      if (error.response?.status === 409 && error.response?.data?.message?.includes('empty')) {
+        console.log('Repository is empty, initializing...');
+        const initResult = await this.initializeRepository(repoIndex);
+        
+        if (initResult.success) {
+          console.log('Repository initialized, retrying save...');
+          // 等待一会儿让GitHub同步
+          await new Promise(resolve => setTimeout(resolve, 2000));
+          
+          // 继续执行原来的目录创建逻辑
+          return this.saveFileWithDirectoryCreation(userId, fileName, data, repoIndex, payload);
+        }
+      }
+      
       // 详细的错误处理
       if (error.response?.status === 404) {
-        console.log('404 error - attempting to create directory structure...');
+        return this.saveFileWithDirectoryCreation(userId, fileName, data, repoIndex, payload);
+      } else if (error.response?.status === 403) {
+        throw new Error(`GitHub permission denied. Check if the token has 'repo' permissions: ${error.response.data.message}`);
+      } else {
+        throw new Error(`GitHub API error (${error.response?.status}): ${error.response?.data?.message || error.message}`);
+      }
+    }
+  }
+
+  // 带目录创建的保存文件方法
+  async saveFileWithDirectoryCreation(userId, fileName, data, repoIndex, payload) {
+    const repoUrl = this.repositories[repoIndex];
+    const { owner, repo } = this.parseRepoUrl(repoUrl);
+    const path = `users/${userId}/${fileName}`;
+    
+    console.log('404 error - attempting to create directory structure...');
+    
+    try {
+      // 方法1: 先检查仓库是否存在和可访问
+      const repoCheckResponse = await axios.get(`${this.apiUrl}/repos/${owner}/${repo}`, {
+        headers: {
+          'Authorization': `token ${this.token}`,
+          'Accept': 'application/vnd.github.v3+json'
+        }
+      });
+      console.log(`Repository exists: ${repoCheckResponse.data.full_name}`);
+      
+      // 方法2: 检查users目录是否存在
+      try {
+        await axios.get(`${this.apiUrl}/repos/${owner}/${repo}/contents/users`, {
+          headers: {
+            'Authorization': `token ${this.token}`,
+            'Accept': 'application/vnd.github.v3+json'
+          }
+        });
+        console.log('Users directory exists');
+      } catch (usersDirError) {
+        console.log('Users directory does not exist, creating...');
         
-        try {
-          // 方法1: 先检查仓库是否存在和可访问
-          const repoCheckResponse = await axios.get(`${this.apiUrl}/repos/${owner}/${repo}`, {
+        // 创建users目录的README
+        const usersReadmePath = 'users/README.md';
+        const usersReadmeContent = Buffer.from('# Users Directory\n\nThis directory contains user-specific PPT files.\n').toString('base64');
+        
+        await axios.put(
+          `${this.apiUrl}/repos/${owner}/${repo}/contents/${usersReadmePath}`,
+          {
+            message: 'Create users directory',
+            content: usersReadmeContent,
+            branch: 'main'
+          },
+          {
             headers: {
               'Authorization': `token ${this.token}`,
               'Accept': 'application/vnd.github.v3+json'
             }
-          });
-          console.log(`Repository exists: ${repoCheckResponse.data.full_name}`);
-          
-          // 方法2: 检查users目录是否存在
-          try {
-            await axios.get(`${this.apiUrl}/repos/${owner}/${repo}/contents/users`, {
-              headers: {
-                'Authorization': `token ${this.token}`,
-                'Accept': 'application/vnd.github.v3+json'
-              }
-            });
-            console.log('Users directory exists');
-          } catch (usersDirError) {
-            console.log('Users directory does not exist, creating...');
-            
-            // 创建users目录的README
-            const usersReadmePath = 'users/README.md';
-            const usersReadmeContent = Buffer.from('# Users Directory\n\nThis directory contains user-specific PPT files.\n').toString('base64');
-            
-            await axios.put(
-              `${this.apiUrl}/repos/${owner}/${repo}/contents/${usersReadmePath}`,
-              {
-                message: 'Create users directory',
-                content: usersReadmeContent,
-                branch: 'main'
-              },
-              {
-                headers: {
-                  'Authorization': `token ${this.token}`,
-                  'Accept': 'application/vnd.github.v3+json'
-                }
-              }
-            );
-            console.log('Users directory created');
           }
-          
-          // 方法3: 检查用户目录是否存在
-          try {
-            await axios.get(`${this.apiUrl}/repos/${owner}/${repo}/contents/users/${userId}`, {
-              headers: {
-                'Authorization': `token ${this.token}`,
-                'Accept': 'application/vnd.github.v3+json'
-              }
-            });
-            console.log(`User directory exists: users/${userId}`);
-          } catch (userDirError) {
-            console.log(`User directory does not exist, creating: users/${userId}`);
-            
-            // 创建用户目录的README
-            const userReadmePath = `users/${userId}/README.md`;
-            const userReadmeContent = Buffer.from(`# PPT Files for User ${userId}\n\nThis directory contains PPT files for user ${userId}.\n`).toString('base64');
-            
-            await axios.put(
-              `${this.apiUrl}/repos/${owner}/${repo}/contents/${userReadmePath}`,
-              {
-                message: `Create user directory for ${userId}`,
-                content: userReadmeContent,
-                branch: 'main'
-              },
-              {
-                headers: {
-                  'Authorization': `token ${this.token}`,
-                  'Accept': 'application/vnd.github.v3+json'
-                }
-              }
-            );
-            console.log(`User directory created: users/${userId}`);
+        );
+        console.log('Users directory created');
+      }
+      
+      // 方法3: 检查用户目录是否存在
+      try {
+        await axios.get(`${this.apiUrl}/repos/${owner}/${repo}/contents/users/${userId}`, {
+          headers: {
+            'Authorization': `token ${this.token}`,
+            'Accept': 'application/vnd.github.v3+json'
           }
-          
-          // 等待一小会儿让GitHub同步
-          await new Promise(resolve => setTimeout(resolve, 1000));
-          
-          // 重试保存PPT文件
-          console.log('Retrying PPT file save...');
-          const retryResponse = await axios.put(
-            `${this.apiUrl}/repos/${owner}/${repo}/contents/${path}`,
-            payload,
-            {
-              headers: {
-                'Authorization': `token ${this.token}`,
-                'Accept': 'application/vnd.github.v3+json'
-              }
+        });
+        console.log(`User directory exists: users/${userId}`);
+      } catch (userDirError) {
+        console.log(`User directory does not exist, creating: users/${userId}`);
+        
+        // 创建用户目录的README
+        const userReadmePath = `users/${userId}/README.md`;
+        const userReadmeContent = Buffer.from(`# PPT Files for User ${userId}\n\nThis directory contains PPT files for user ${userId}.\n`).toString('base64');
+        
+        await axios.put(
+          `${this.apiUrl}/repos/${owner}/${repo}/contents/${userReadmePath}`,
+          {
+            message: `Create user directory for ${userId}`,
+            content: userReadmeContent,
+            branch: 'main'
+          },
+          {
+            headers: {
+              'Authorization': `token ${this.token}`,
+              'Accept': 'application/vnd.github.v3+json'
             }
-          );
-          
-          console.log(`Successfully saved to GitHub after retry: ${retryResponse.data.commit.sha}`);
-          return retryResponse.data;
-          
-        } catch (retryError) {
-          console.error(`Comprehensive retry also failed:`, retryError.response?.data || retryError.message);
-          
-          // 如果GitHub彻底失败，fallback到内存存储
-          console.log('GitHub save completely failed, falling back to memory storage...');
-          try {
-            const memoryResult = await memoryStorageService.saveFile(userId, fileName, data);
-            console.log('Successfully saved to memory storage as fallback');
-            return {
-              ...memoryResult,
-              warning: 'Saved to temporary memory storage due to GitHub issues'
-            };
-          } catch (memoryError) {
-            console.error('Memory storage fallback also failed:', memoryError.message);
-            throw new Error(`All storage methods failed. GitHub: ${retryError.message}, Memory: ${memoryError.message}`);
+          }
+        );
+        console.log(`User directory created: users/${userId}`);
+      }
+      
+      // 等待一小会儿让GitHub同步
+      await new Promise(resolve => setTimeout(resolve, 1000));
+      
+      // 重试保存PPT文件
+      console.log('Retrying PPT file save...');
+      const retryResponse = await axios.put(
+        `${this.apiUrl}/repos/${owner}/${repo}/contents/${path}`,
+        payload,
+        {
+          headers: {
+            'Authorization': `token ${this.token}`,
+            'Accept': 'application/vnd.github.v3+json'
           }
         }
-      } else if (error.response?.status === 403) {
-        throw new Error(`GitHub permission denied. Check if the token has 'repo' permissions: ${error.response.data.message}`);
-      } else {
-        throw new Error(`GitHub API error (${error.response?.status}): ${error.response?.data?.message || error.message}`);
+      );
+      
+      console.log(`Successfully saved to GitHub after retry: ${retryResponse.data.commit.sha}`);
+      return retryResponse.data;
+      
+    } catch (retryError) {
+      console.error(`Comprehensive retry also failed:`, retryError.response?.data || retryError.message);
+      
+      // 如果GitHub彻底失败，fallback到内存存储
+      console.log('GitHub save completely failed, falling back to memory storage...');
+      try {
+        const memoryResult = await memoryStorageService.saveFile(userId, fileName, data);
+        console.log('Successfully saved to memory storage as fallback');
+        return {
+          ...memoryResult,
+          warning: 'Saved to temporary memory storage due to GitHub issues'
+        };
+      } catch (memoryError) {
+        console.error('Memory storage fallback also failed:', memoryError.message);
+        throw new Error(`All storage methods failed. GitHub: ${retryError.message}, Memory: ${memoryError.message}`);
       }
     }
   }