3420 Commits

• Revert "Merge pull request #36102 from bdach/move-check-to-better-place"

  This reverts commit 2cb2167765, reversing
  changes made to 0bcb3c5839.

  Dean Herbert · 2025-12-26 22:36:16 +09:00
  56ef5eae14
• Merge pull request #36102 from bdach/move-check-to-better-place

  Perform online ID checks during import in more proper sequence

  Dean Herbert · 2025-12-26 22:35:02 +09:00
  2cb2167765
• Reduce code duplication

  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dan Balasescu · 2025-12-24 19:30:04 +09:00
  81f03957d8
• Merge pull request #36101 from bdach/guest-difficulty-export

  Add explicit menu item for exporting guest difficulties from editor

  Dean Herbert · 2025-12-24 00:45:19 +09:00
  1340e18d93
• Only perform replace-on-import based on online beatmap set ID after it's validated

  Even without the ID resetting logic before `Populate()` getting broken
  and annotated with a TODO, this was kinda stupid. Why was purging logic
  allowed to run *using a not-yet-completely-validated online ID of the
  set*?
  
  This is the other part of hopefully fixing scenarios like
  https://osu.ppy.sh/community/forums/topics/2162457?n=8 (hopefully with
  no babies poured out in the mean time, but only time will tell).

  Bartłomiej Dach · 2025-12-22 12:27:29 +01:00
  44df9047ae
• Move online ID validation check into its proper location

  The end of `Populate()` is too early to do any validation of online IDs,
  as population happens in `PostImport()` via `ProcessBeatmap`.
  
  Additionally, this modifies the check to also include the set's ID. This
  is one part of curtailing issues like
  https://osu.ppy.sh/community/forums/topics/2162457?n=8 - the featured
  artist template beatmap in question has a single difficulty with a bogus
  positive beatmap set ID and a beatmap ID of 0, and my opinion is that
  this sort of situation should for all intents and purposes cause the
  beatmap set's ID to be reset.

  Bartłomiej Dach · 2025-12-22 12:22:04 +01:00
  17143ca0a8
• Add explicit menu item for exporting guest difficulties from editor

  A few facts of life:
  
  - Guest difficulties are at this point a staple of mapping.
  
  - People are very much used to flinging `.osu`s around (because there's
    no better alternative).
  
  - Currently there are two ways to get an `.osu` out of lazer. You can:
  
    - Export the beatmap as "compatibility" to an `.osz`, then
      transmogrify the `.osz` to a `.zip`, then extract the `.zip`, then
      pluck out the `.osu`. This is the "correct" way to make sure stable
      works, but is also stupidly arcane.
  
    - Use "edit externally" to mount the beatmap files to disk, then
      copy-paste out the `.osu`. This is the *wrong* way to make sure
      stable works, because the mounting process exposes the raw "for
      editing" format with features stable doesn't support, but it the
      actual easy one.
  
  - Reports about guest difficulties exported from lazer "working wrong on
    stable" are prevalent. Probably mostly because of the preceding point.
  
  What this PR does is introduce a *third* method to export an `.osu`,
  which is designed to be both the easiest one yet *and* correct. I am
  hoping this will curb the complaints until support for direct submission
  of guest difficulties is added - which I still hope to see, but it will
  be a significant effort *client-side* (the server side has been ready
  for years now).
  
  And yes, you will notice that much of the code added in
  `LegacyBeatmapExporter` related to manipulation of the path is
  copy-pasted from `LegacyExporter`. I don't care enough to invent
  protected / abstract / whatever else OOP faff for something that may not
  survive review and is mostly a weird semi-temporary wart.

  Bartłomiej Dach · 2025-12-22 11:36:23 +01:00
  3712093158
• Add helper method and update some other similar preempt calculations
  Dean Herbert · 2025-12-18 22:28:50 +09:00
  09178b5dc4
• Add remaining two locus winners as bundled beatmaps
  Dean Herbert · 2025-12-04 14:20:04 +09:00
  fe5cbc4932
• Fix Beatmap.GetMostCommonBeatLength() potentially returning a beat length smaller or larger than the actual limits (#35827)

  Closes https://github.com/ppy/osu/issues/35807.
  
  The reason this closes the aforementioned issue is as follows:
  
  Taking https://osu.ppy.sh/beatmapsets/1236180#osu/4650477 as the
  example, we have:
  
  ```
  minBeatLength = 342.857142857143
  maxBeatLength = 419.58041958042003
  mostCommonBeatLength = 342.85700000000003
  ```
  
  Note that `mostCommonBeatLength < minBeatLength` here.
  
  Taking the inverse of that to compute BPM, we get
  
  ```
  minBpm = 174.99999999999991
  maxBpm = 142.99999999999986
  mostCommonBpm = 175.00007291669704
  ```
  
  which without DT present doesn't do anything bad, but when DT is
  engaged (and thus BPM is multiplied by 1.5), midpoint rounding causes
  the min BPM to become 262, and the most common BPM to become 263.

  Bartłomiej Dach · 2025-11-28 08:25:47 +09:00
  8f927ea7b5
• Fix several issues with incorrect sample playback (#35685)

  * Add failing test coverage for layered hit samples not playing in mania when beatmap is converted
  
  Adding the `osu.Game.Rulesets.Osu` reference to the mania test project
  is required so that `HitObjectSampleTest` base logic doesn't die on
  
  https://github.com/ppy/osu/blob/f0aeeeea966f06add12cf2bca3dd48dac8573e82/osu.Game/Tests/Beatmaps/HitObjectSampleTest.cs#L88-L91
  
  * Fix layered hit sounds not playing on converted beatmaps in mania
  
  Compare
  https://github.com/peppy/osu-stable-reference/blob/f9e58b4864a10f801393199e7652b2192c7342c3/osu!/GameplayElements/HitObjects/HitObject.cs#L476-L477.
  
  In case of converted beatmaps, the last condition there
  (`BeatmapManager.Current.PlayMode != PlayModes.OsuMania`) fails,
  and thus layered hitsounds are allowed to play.
  
  * Add failing test coverage for mania beatmap conversion assigning wrong samples to spinners
  
  * Fix mania beatmap conversion assigning wrong samples to spinners
  
  A spinner is never `IHasRepeats`. It was a dead condition, leading to
  the hitobject generating fallback `NodeSamples`, which in particular
  feature a silent tail which stable doesn't do.
  
  Noticeably, stable also appears to force the head of the generated hold
  note to have no addition sounds:
  
  https://github.com/peppy/osu-stable-reference/blob/f9e58b4864a10f801393199e7652b2192c7342c3/osu!/GameplayElements/HitObjects/Mania/SpinnerMania.cs#L86-L89
  
  * Add failing test coverage for file hit sample not falling back to plain samples if file missing
  
  * Allow `FileHitSampleInfo` to fall back to standard samples if the file is not found (or not allowed to be looked up)
  
  I'm honestly not 100% as to how closely this matches stable because I
  reached the point wherein I'd rather not look at stable code anymore, so
  as long as this passes tests I'm fine to wait for someone else to report
  new breakage.
  
  * Use alternative workaround for lack of osu! ruleset assembly in mania test project
  
  * Fix encode stability test failures

  Bartłomiej Dach · 2025-11-15 16:19:08 +09:00
  bd4ed49c06
• Alleviate song select post-filter update thread hitches by caching a model-to-carousel-item mapping (#35628)
  Bartłomiej Dach · 2025-11-13 23:21:14 +09:00
  b64abbf1f5
• Refetch list of user favourites on every change to favourites

  Is this lazy? Sure it is. Friends and blocks do the same thing, though,
  and I'm not overthinking this any more than I already have.
  
  Being smarter here would likely mean being more invasive with respect to
  listening in on all outgoing API requests and silently updating
  favourites on that basis. Which is "smart" but also complicated.

  Bartłomiej Dach · 2025-10-24 08:41:52 +02:00
  6b56a0611b
• Merge branch 'master' into fix-qp-availability
  Dean Herbert · 2025-10-24 14:27:45 +09:00
  d062c99666
• Adjust gameplay sample models to support custom sample sets

  This is a set of model changes which is supposed to facilitate support
  for custom sample sets to the beatmap editor that is on par with stable.
  
  It is the minimal set of changes. Because of this, it can probably be
  considered "ugly" or however else you want to put it - but before you
  say that, I want to try and pre-empt that criticism by explaining where
  the problems lie.
  
  Problem #1: duality in sample models
  ---
  
  There is currently a weird duality of what a `HitObject`'s samples will
  be.
  
  - If an object has just been placed in the editor, and not saved /
    decoded yet, it will use `HitSampleInfo`.
  
  - If an object has already been encoded to the beatmap at least once, it
    will use `ConvertHitObjectParser.LegacyHitSampleInfo`.
  
  As long as that state of affairs remains, `HitSampleInfo` must be able
  to represent anything that `LegacyHitSampleInfo` can, if feature parity
  is to be achieved.
  
  Problem 2: The 0 & 1 sample banks
  ---
  
  Custom sample banks of 2 and above are a pretty clean affair. They map to
  a suffix on the sample filename, and said samples are allowed to be
  looked up from the beatmap skin. `Suffix` already exists in
  `HitSampleInfo`.
  
  However, the 1 custom sample bank is evil. It uses *non-suffixed*
  samples, *allows lookups from the beatmap skins*, contrary to no bank /
  bank 0, which *also* uses non-suffixed samples, but *doesn't* allow them
  to be looked up from the beatmap skin.
  
  This is why `HitSampleInfo.UseBeatmapSamples` has been called to
  existence - without it there is no way to represent the ability of using
  or not using the beatmap skin assets.
  
  As has been stated previously in discussions about this feature, it's
  both a *mapping* and a *skinning* concern.
  
  There are many things you could do about either of these problems, but I
  am pretty sure tackling either one is going to take *many* more lines of
  code than this commit does. Which is why this is the starting point of
  negotiation.

  Bartłomiej Dach · 2025-10-22 14:58:08 +02:00
  c361e6d3c2
• Use interface instead
  Dan Balasescu · 2025-10-22 16:02:46 +09:00
  4cac1781c5
• Fix quick play not redownloading modified beatmaps
  Dan Balasescu · 2025-10-22 15:34:29 +09:00
  c6fcba7e1c
• Add locus 2025 winners to bundled download beatmaps list
  Dean Herbert · 2025-10-17 02:03:52 +09:00
  98762ce09e
• SSV2 : Replace "Mark as Played" with "Remove from Played" if map is already played (#35287)

  * SSV2 : Replace Mark as Played with Remove from Played if already played
  
  * Remove checks of BeatmapInfo.LastPlayed for DateTimeOffset.MinValue
  
  * Make FooterButtonOptions use a RealmLive<BeatmapInfo> and act on review comments
  
  * FIXUP: Detach BeatmapInfo before passing it to FooterButtonOptions.Popover
  
  ---------
  
  Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>

  Alban Cabannes-Michel · 2025-10-16 14:59:16 +02:00
  8f6f859c15
• Add some logging when FindWithRefresh triggers a slow realm refresh
  Dean Herbert · 2025-10-10 13:36:28 +09:00
  94c7489c1c
• Fix shift-clicking not working on extra size beatmap cards

  Was broken due to double assignment to `Action`.

  Bartłomiej Dach · 2025-10-09 08:59:26 +02:00
  6da6edd1d1
• Always explicitly assign the action for beatmap cards
  Dean Herbert · 2025-09-29 17:31:45 +09:00
  3f5b71fdc3
• Keep panel backgrounds loaded
  Dean Herbert · 2025-09-26 18:26:11 +09:00
  b743506207
• Use BeatmapCard for matchmaking beatmap display
  Dean Herbert · 2025-09-26 18:09:05 +09:00
  0a17a3c4ed
• Allow visibly disabling the "go to beatmap" button

  Easiest way to make this work without rewriting the layout logic.
  
  I think it makes sense to have the button still exist there but not be
  usable on certain screens.

  Dean Herbert · 2025-09-26 18:08:47 +09:00
  da80b61f38
• Merge pull request #34900 from bdach/invalid-filenames-in-imported-skins

  Fix external edit operations failing due to invalid filenames

  Dean Herbert · 2025-09-03 18:50:17 +09:00
  0ab3b593e7
• Replace local copy of GetValidFilename() with direct usage

  Noticed in passing.

  Bartłomiej Dach · 2025-09-03 09:32:43 +02:00
  5c66998c57
• Merge pull request #34892 from bdach/shift-click-beatmap-card

  Download online beatmap / present local beatmap on shift-clicking beatmap cards

  Dean Herbert · 2025-09-03 16:19:48 +09:00
  1e50e36a64
• Ignore .osu files not placed at top level of beatmap archive on import

  Closes https://github.com/ppy/osu/issues/34677.

  Bartłomiej Dach · 2025-09-02 14:50:31 +02:00
  79f7f0ecad
• Download online beatmap / present local beatmap on shift-clicking beatmap cards

  Closes https://github.com/ppy/osu/issues/34883.

  Bartłomiej Dach · 2025-09-02 13:11:18 +02:00
  6c82f543e6
• Adjust interpolation workaround to catch-up slightly smoother
  Dean Herbert · 2025-08-29 21:24:23 +09:00
  41b8033ebd
• Fix metadata cache version queries failing hard if the image is corrupted

  This was not fatal but with this change it should recover in a slightly
  better way.
  
  Also incidentally fixes the cache refetch potentially being attempted
  twice by each of the two background population tasks that use it.

  Bartłomiej Dach · 2025-08-07 11:10:02 +02:00
  dac643121a
• Fix metadata cache refetches failing on windows

  Reported at
  https://discord.com/channels/188630481301012481/1097318920991559880/1402910684320108574
  among others.
  
  Only really visible on windows for reasons outlined in inline comment.

  Bartłomiej Dach · 2025-08-07 10:24:15 +02:00
  7da94c4010
• Merge pull request #34432 from bdach/unified-beatmap-attribute-display

  Unify display logic of beatmap difficulty attributes across usages

  Dean Herbert · 2025-08-01 13:35:48 +09:00
  71644e4629
• Merge pull request #34346 from bdach/user-tag-population

  Backpopulate user tag data using `online.db`

  Dean Herbert · 2025-07-30 22:24:19 +09:00
  094f703c02
• Rename property to reduce confusion

  Caused an actual bug in one of the replaced usages.

  Bartłomiej Dach · 2025-07-30 14:06:38 +02:00
  cd2c5075df
• Migrate other usages of GetAdjustedDisplayDifficulty() to use GetBeatmapAttributesForDisplay() instead

  This ensures parity between all beatmap attribute displays that used the
  former method.

  Bartłomiej Dach · 2025-07-30 14:06:38 +02:00
  a952e3704e
• Refactor beatmap attribute methods

  This change refactors `GetAdjustedDisplayDifficulty()` and
  `GetBeatmapAttributesToDisplay()` in two ways:
  
  - Both methods now accept `IBeatmapInfo` instead of
    `IBeatmapDifficultyInfo`. This is done in order to make mania key
    count display to work, wherein `IBeatmapDifficultyInfo` is not enough
    to calculate the final key count.
  
  - `GetAdjustedDisplayDifficulty()` now applies all
    `IApplicableToDifficulty` mods itself. I did this after noticing that
    every real consumer of this method had to do that themselves for very
    little reason.

  Bartłomiej Dach · 2025-07-30 14:06:34 +02:00
  7c4dd812b6
• Only perform user tag backpopulation after the local metadata cache updates
  Bartłomiej Dach · 2025-07-29 11:50:41 +02:00
  8307947a10
• Fix some issues
  Dean Herbert · 2025-07-29 13:19:43 +09:00
  f8f37f53a7
• Clear user tags when performing metadata lookup
  Bartłomiej Dach · 2025-07-28 10:29:48 +02:00
  aae16045f6
• Merge branch 'master' into ssv2-localisation
  Denis Titovets · 2025-07-25 11:36:52 +03:00
  4b73afd195
• Add back-population operation for user tags
  Bartłomiej Dach · 2025-07-23 10:35:32 +02:00
  1709811458
• Add support for retrieving user tags from local metadata cache
  Bartłomiej Dach · 2025-07-23 10:26:31 +02:00
  05923d3b2b
• Merge pull request #34231 from bdach/user-tag-search-wip

  Add initial support for filtering by user tags in song select

  Dean Herbert · 2025-07-21 14:52:47 +09:00
  b4466aa7a2
• Merge pull request #34306 from EYHN/eyhn/fix/beatmap-set-cover-load

  Fix beatmap set cover not loading at screen edges

  Dean Herbert · 2025-07-21 14:49:02 +09:00
  6f0111583d
• Fix beatmap set cover not loading at screen edges
  eyhn · 2025-07-20 22:24:59 +08:00
  d770a08526
• Allow beatmap cards' collapsible icon buttons to be accessible via context menu
  Bartłomiej Dach · 2025-07-17 12:49:12 +02:00
  1ee439ad7f
• Merge branch 'ppy:master' into ssv2-localisation
  Denis Titovets · 2025-07-16 11:59:47 +03:00
  021ef6d727
• Add initial support for filtering by user tags in song select

  The way that this works is that it plugs into the online request to
  retrieve the beatmap set that the client is already performing, and
  stores user tag data to the local realm database.
  
  This means that for now user tags will only populate for beatmaps that
  the user has displayed on song select which is obviously subpar. I plan
  to follow this change up by adding user tag state dumps to `online.db`
  and using that data for initial tag population to make the majority case
  (ranked beatmaps) work.
  
  Note that several decisions were made here that are potential discussion
  points:
  
  - `RealmPopulatingOnlineLookupSource` is set up such that it can be the
    middle man / redirection point for similar flows that we need and we
    are currently missing, such as storing guest difficulty information,
    or storing the user's current best score on a beatmap (handy for rank
    achieved sorting / filtering / etc.)
  
  - The user tags are stored in `BeatmapMetadata` which breaks the
    longstanding assumption that you can arbitrarily pull out a metadata
    instance from any of the beatmaps in a set and get essentially the
    same object back.
  
    I've attempted to constrain this some by not adding user tags to
    the `IBeatmapMetadataInfo` interface through which `BeatmapSetInfo`
    exposes metadata further, but I warn in advance that this is
    a temporary state of affairs and I will make it worse in the future
    when `BeatmapMetadata.Author` becomes `Authors` plural in order to
    support guest mapper display (and direct guest difficulty submission).
  
  - The syntax for searching via user tags is chosen to mostly match web -
    it's `tag=`, with support for all of the string matching modes song
    select already has (bare word for substring, `""` quotes for phrase
    isolated by whitespace, `""!` for exact full match).

  Bartłomiej Dach · 2025-07-15 11:09:40 +02:00
  8cb81974eb