Merge pull request #116 from rage/refresh-fix

Refresh fix

Author: Heliozoa

tmc-langs-framework/src/command.rs

@@ -58,7 +58,6 @@ impl TmcCommand {
 
         // starts executing the command
         let mut popen = exec.popen().map_err(|e| popen_to_tmc_err(cmd.clone(), e))?;
-        log::debug!("here {:?} {:?}", popen.stdin, stdin);
         let stdin_handle = spawn_writer(popen.stdin.take(), stdin);
         let stdout_handle = spawn_reader(popen.stdout.take());
         let stderr_handle = spawn_reader(popen.stderr.take());

tmc-langs-framework/src/file_util.rs

@@ -48,6 +48,13 @@ pub fn read_file_to_string<P: AsRef<Path>>(path: P) -> Result<String, FileIo> {
     Ok(s)
 }
 
+pub fn read_file_to_string_lossy<P: AsRef<Path>>(path: P) -> Result<String, FileIo> {
+    let path = path.as_ref();
+    let bytes = read_file(path)?;
+    let s = String::from_utf8_lossy(&bytes).into_owned();
+    Ok(s)
+}
+
 pub fn create_file<P: AsRef<Path>>(path: P) -> Result<File, FileIo> {
     let path = path.as_ref();
     if let Some(parent) = path.parent() {

tmc-langs-framework/src/plugin.rs

@@ -424,7 +424,7 @@ pub trait LanguagePlugin {
                 let entry = entry?;
                 if entry.path().is_file() {
                     log::trace!("parsing points from {}", entry.path().display());
-                    let file_contents = file_util::read_file_to_string(entry.path())?;
+                    let file_contents = file_util::read_file_to_string_lossy(entry.path())?;
 
                     // reads any character
                     let etc_parser = combinator::value(Parse::Other, character::complete::anychar);

tmc-langs-util/src/task_executor/submission_processing.rs

@@ -9,8 +9,7 @@ use tmc_langs_framework::TmcError;
 use walkdir::{DirEntry, WalkDir};
 
 lazy_static! {
-    static ref FILES_TO_SKIP_ALWAYS: Regex =
-        Regex::new(r"\.tmcrc|^metadata\.yml$|(.*)Hidden(.*)").unwrap();
+    static ref FILES_TO_SKIP_ALWAYS: Regex = Regex::new(r"\.tmcrc|^metadata\.yml$").unwrap();
     static ref NON_TEXT_TYPES: Regex =
         Regex::new("class|jar|exe|jpg|jpeg|gif|png|zip|tar|gz|db|bin|csv|tsv|sqlite3|^$").unwrap();
 }
@@ -29,13 +28,29 @@ pub fn is_hidden_dir(entry: &DirEntry) -> bool {
     skip
 }
 
-// Filter for skipping directories on `FILES_TO_SKIP_ALWAYS` or named 'private'
+// Filter for skipping directories on `FILES_TO_SKIP_ALWAYS` or named 'private', and files in a 'test' directory that contain 'Hidden' in their name.
 fn on_skip_list(entry: &DirEntry) -> bool {
-    let skip = entry
-        .file_name()
-        .to_str()
+    // check if entry's filename matchees the skip list or is 'private'
+    let entry_file_name = entry.file_name().to_str();
+    let on_skip_list = entry_file_name
         .map(|s| FILES_TO_SKIP_ALWAYS.is_match(s) || s == "private")
         .unwrap_or_default();
+
+    // check if the current entry is a file in a "test" directory that contains "Hidden" in its name
+    let hidden_in_test = if entry.path().is_file() {
+        if let Some(parent) = entry.path().parent().and_then(|p| p.file_name()) {
+            parent == "test"
+                && entry_file_name
+                    .map(|n| n.contains("Hidden"))
+                    .unwrap_or_default()
+        } else {
+            false
+        }
+    } else {
+        false
+    };
+
+    let skip = on_skip_list || hidden_in_test;
     if skip {
         log::debug!("on skip list: {:?}", entry.path());
     }
@@ -383,4 +398,17 @@ extra_student_files:
         assert!(conf.extra_student_files[0] == PathBuf::from("test/StudentTest.java"));
         assert!(conf.extra_student_files[1] == PathBuf::from("test/OtherTest.java"));
     }
+
+    #[test]
+    fn hides_test_hidden_files() {
+        init();
+
+        let temp = tempdir().unwrap();
+        let temp_path = temp.path();
+
+        prepare_solution(Path::new("tests/data/dir"), temp_path).unwrap();
+
+        assert!(dbg!(temp_path.join("NotHidden.java")).exists());
+        assert!(!dbg!(temp_path.join("ActuallyHidden.java")).exists());
+    }
 }