exclude beatmaps other than osu! (such as taiko, CtB, or mania)

tmokmss · May 26, 2018 · 8a4a9e5 · 8a4a9e5
1 parent b3ab64f
commit 8a4a9e5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Osu2Saber/Model/BatchProcessor.cs b/Osu2Saber/Model/BatchProcessor.cs
@@ -57,11 +57,12 @@ OszProcessor DecompressOsz(int index)
         {
             OszProcessor.WorkDir = WorkDir;
             var oszPath = TargetFiles[index];
-            var oszp = new OszProcessor(oszPath);
             if (!oszPath.EndsWith("osz") && !oszPath.EndsWith("zip"))
                 return null;
 
-            var files = oszp.OsuFiles;
+            var oszp = new OszProcessor(oszPath);
+            if (oszp.OsuFiles.Length == 0) return null;
+
             ReportProgress(0.3);
             return oszp;
         }

diff --git a/Osu2Saber/Model/OszProcessor.cs b/Osu2Saber/Model/OszProcessor.cs
@@ -77,7 +77,10 @@ public Beatmap LoadOsuFile(int index)
         public Beatmap[] LoadOsuFiles()
         {
             var beatmaps = OsuFiles
-                .Select((e, i) => LoadOsuFile(i)).Where(map => map != null).ToArray();
+                .Select((e, i) => LoadOsuFile(i))
+                .Where(map => map != null)
+                .Where(map => map.Mode == 0) // pick osu! maps only (not taiko, CtB, or mania)
+                .ToArray();
             return beatmaps;
         }