Merge pull request #142 from unhappychoice/refactor/model-terminology-unification

refactor: unify model terminology and structure

Author: unhappychoice

src/cli/commands/game.rs

@@ -55,10 +55,10 @@ pub fn run_game_session(cli: Cli) -> Result<()> {
         .and_then(
             |ProcessingResult {
                  challenges,
-                 git_info,
+                 git_repository,
              }| {
                 let mut stage_manager = StageManager::new(challenges);
-                stage_manager.set_git_info(git_info);
+                stage_manager.set_git_repository(git_repository);
                 stage_manager.run_session()
             },
         );

src/extractor/challenge_converter.rs

@@ -1,5 +1,5 @@
-use super::{CodeChunk, ProgressReporter};
-use crate::game::Challenge;
+use super::ProgressReporter;
+use crate::models::{Challenge, CodeChunk};
 use rayon::prelude::*;
 use std::sync::{
     atomic::{AtomicUsize, Ordering},

src/extractor/core/extractor.rs

@@ -1,5 +1,5 @@
-use crate::extractor::models::CodeChunk;
 use crate::extractor::parsers::{get_parser_registry, parse_with_thread_local};
+use crate::models::CodeChunk;
 use crate::{GitTypeError, Result};
 use std::fs;
 use std::path::Path;

src/extractor/git_info.rs

@@ -1,32 +1,24 @@
+use crate::models::GitRepository;
 use crate::Result;
-use serde::{Deserialize, Serialize};
 use std::path::Path;
 use std::process::Command;
 
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub struct GitRepositoryInfo {
-    pub user_name: String,
-    pub repository_name: String,
-    pub remote_url: String,
-    pub branch: Option<String>,
-    pub commit_hash: Option<String>,
-    pub is_dirty: bool,
-}
+// Re-export for backward compatibility - removed duplicate import
 
-pub struct GitInfoExtractor;
+pub struct GitRepositoryExtractor;
 
-impl Default for GitInfoExtractor {
+impl Default for GitRepositoryExtractor {
     fn default() -> Self {
         Self::new()
     }
 }
 
-impl GitInfoExtractor {
+impl GitRepositoryExtractor {
     pub fn new() -> Self {
         Self
     }
 
-    pub fn extract_git_info(repo_path: &Path) -> Result<Option<GitRepositoryInfo>> {
+    pub fn extract_git_repository(repo_path: &Path) -> Result<Option<GitRepository>> {
         // Canonicalize the path to handle relative paths like ../../
         let canonical_path = match repo_path.canonicalize() {
             Ok(path) => path,
@@ -48,7 +40,7 @@ impl GitInfoExtractor {
             let commit_hash = Self::get_current_commit_hash(&git_root).ok();
             let is_dirty = Self::is_working_directory_dirty(&git_root).unwrap_or(false);
 
-            Ok(Some(GitRepositoryInfo {
+            Ok(Some(GitRepository {
                 user_name,
                 repository_name,
                 remote_url,

src/extractor/mod.rs

@@ -7,8 +7,9 @@ pub mod parsers;
 pub mod repository_loader;
 
 pub use crate::game::screens::loading_screen::{NoOpProgressReporter, ProgressReporter};
+pub use crate::models::{ChunkType, CodeChunk, GitRepository};
 pub use challenge_converter::ChallengeConverter;
-pub use git_info::{GitInfoExtractor, GitRepositoryInfo};
-pub use models::{ChunkType, CodeChunk, ExtractionOptions, Language};
+pub use git_info::GitRepositoryExtractor;
+pub use models::{ExtractionOptions, Language};
 pub use parser::CodeExtractor;
 pub use repository_loader::RepositoryLoader;

src/extractor/models/mod.rs

@@ -1,8 +1,8 @@
-pub mod chunk;
 pub mod language;
 pub mod languages;
 pub mod options;
 
-pub use chunk::{ChunkType, CodeChunk};
+// Re-export from new models location
+pub use crate::models::{ChunkType, CodeChunk};
 pub use language::Language;
 pub use options::ExtractionOptions;

src/extractor/parsers/c.rs

@@ -1,5 +1,5 @@
-use crate::extractor::models::ChunkType;
 use crate::extractor::parsers::LanguageExtractor;
+use crate::models::ChunkType;
 use crate::Result;
 use tree_sitter::{Node, Parser};
 

src/extractor/parsers/cpp.rs

@@ -1,5 +1,5 @@
-use crate::extractor::models::ChunkType;
 use crate::extractor::parsers::LanguageExtractor;
+use crate::models::ChunkType;
 use crate::Result;
 use tree_sitter::{Node, Parser};
 

src/extractor/parsers/csharp.rs

@@ -1,5 +1,5 @@
 use super::LanguageExtractor;
-use crate::extractor::models::ChunkType;
+use crate::models::ChunkType;
 use crate::{GitTypeError, Result};
 use tree_sitter::{Node, Parser};
 

src/extractor/parsers/dart.rs

@@ -1,5 +1,5 @@
 use super::LanguageExtractor;
-use crate::extractor::models::ChunkType;
+use crate::models::ChunkType;
 use crate::{GitTypeError, Result};
 use tree_sitter::{Node, Parser};