osu: ignore Hold objects instead of panicking

src/osu/versions/all_included/mod.rs

@@ -44,7 +44,7 @@ pub fn stars(
         .hit_objects
         .iter()
         .take(take)
-        .map(|h| OsuObject::new(h, map, &attributes));
+        .filter_map(|h| OsuObject::new(h, map, &attributes));
 
     let mut skills = vec![Skill::new(SkillKind::Aim), Skill::new(SkillKind::Speed)];
 

src/osu/versions/all_included/osu_object.rs

@@ -42,14 +42,18 @@ pub(crate) enum OsuObject {
 }
 
 impl OsuObject {
-    pub(crate) fn new(h: &HitObject, map: &Beatmap, attributes: &BeatmapAttributes) -> Self {
+    pub(crate) fn new(
+        h: &HitObject,
+        map: &Beatmap,
+        attributes: &BeatmapAttributes,
+    ) -> Option<Self> {
         let pos = h.pos;
         let time = h.start_time;
 
         let scale = (1.0 - 0.7 * (attributes.cs - 5.0) / 5.0) / 2.0;
         let mut stack_height = 0.0;
 
-        match &h.kind {
+        let obj = match &h.kind {
             HitObjectKind::Circle => Self::Circle {
                 pos,
                 time,
@@ -303,8 +307,10 @@ impl OsuObject {
                 }
             }
             HitObjectKind::Spinner { .. } => Self::Spinner { pos, time },
-            HitObjectKind::Hold { .. } => panic!("found Hold object in osu!standard file"),
-        }
+            HitObjectKind::Hold { .. } => return None,
+        };
+
+        Some(obj)
     }
 
     #[inline]

src/osu/versions/no_leniency/mod.rs

@@ -66,7 +66,7 @@ pub fn stars(
     let mut slider_state = SliderState::new(map);
     let mut ticks_buf = Vec::new();
 
-    let mut hit_objects = map.hit_objects.iter().take(take).map(|h| {
+    let mut hit_objects = map.hit_objects.iter().take(take).filter_map(|h| {
         OsuObject::new(
             h,
             map,

src/osu/versions/no_leniency/osu_object.rs

@@ -21,10 +21,10 @@ impl OsuObject {
         ticks: &mut Vec<f32>,
         attributes: &mut DifficultyAttributes,
         slider_state: &mut SliderState,
-    ) -> Self {
+    ) -> Option<Self> {
         attributes.max_combo += 1; // hitcircle, slider head, or spinner
 
-        match &h.kind {
+        let obj = match &h.kind {
             HitObjectKind::Circle => {
                 attributes.n_circles += 1;
 
@@ -168,8 +168,10 @@ impl OsuObject {
                     travel_dist: None,
                 }
             }
-            HitObjectKind::Hold { .. } => panic!("found Hold object in osu!standard file"),
-        }
+            HitObjectKind::Hold { .. } => return None,
+        };
+
+        Some(obj)
     }
 
     #[inline]

src/osu/versions/no_sliders_no_leniency/mod.rs

@@ -64,33 +64,37 @@ pub fn stars(
     let mut n_spinners = 0;
     let mut state = SliderState::new(&map);
 
-    let mut hit_objects = map.hit_objects.iter().take(take).map(|h| match &h.kind {
-        HitObjectKind::Circle => {
-            max_combo += 1;
-            n_circles += 1;
+    let mut hit_objects = map
+        .hit_objects
+        .iter()
+        .take(take)
+        .filter_map(|h| match &h.kind {
+            HitObjectKind::Circle => {
+                max_combo += 1;
+                n_circles += 1;
 
-            Cow::Borrowed(h)
-        }
-        HitObjectKind::Slider {
-            pixel_len, repeats, ..
-        } => {
-            max_combo += state.count_ticks(h.start_time, *pixel_len, *repeats, &map);
+                Some(Cow::Borrowed(h))
+            }
+            HitObjectKind::Slider {
+                pixel_len, repeats, ..
+            } => {
+                max_combo += state.count_ticks(h.start_time, *pixel_len, *repeats, &map);
 
-            Cow::Owned(HitObject {
-                pos: h.pos,
-                start_time: h.start_time,
-                kind: HitObjectKind::Circle,
-                sound: h.sound,
-            })
-        }
-        HitObjectKind::Spinner { .. } => {
-            max_combo += 1;
-            n_spinners += 1;
+                Some(Cow::Owned(HitObject {
+                    pos: h.pos,
+                    start_time: h.start_time,
+                    kind: HitObjectKind::Circle,
+                    sound: h.sound,
+                }))
+            }
+            HitObjectKind::Spinner { .. } => {
+                max_combo += 1;
+                n_spinners += 1;
 
-            Cow::Borrowed(h)
-        }
-        HitObjectKind::Hold { .. } => panic!("found Hold object in osu!standard map"),
-    });
+                Some(Cow::Borrowed(h))
+            }
+            HitObjectKind::Hold { .. } => None,
+        });
 
     let mut aim = Skill::new(SkillKind::Aim);
     let mut speed = Skill::new(SkillKind::Speed);