mirror of
https://github.com/navidrome/navidrome.git
synced 2025-12-23 23:18:05 -05:00
feat(bfr): Big Refactor: new scanner, lots of new fields and tags, improvements and DB schema changes (#2709)
* fix(server): more race conditions when updating artist/album from external sources Signed-off-by: Deluan <deluan@navidrome.org> * feat(scanner): add .gitignore syntax to .ndignore. Resolves #1394 Signed-off-by: Deluan <deluan@navidrome.org> * fix(ui): null Signed-off-by: Deluan <deluan@navidrome.org> * fix(scanner): pass configfile option to child process Signed-off-by: Deluan <deluan@navidrome.org> * fix(scanner): resume interrupted fullScans Signed-off-by: Deluan <deluan@navidrome.org> * fix(scanner): remove old scanner code Signed-off-by: Deluan <deluan@navidrome.org> * fix(scanner): rename old metadata package Signed-off-by: Deluan <deluan@navidrome.org> * fix(scanner): move old metadata package Signed-off-by: Deluan <deluan@navidrome.org> * fix: tests Signed-off-by: Deluan <deluan@navidrome.org> * chore(deps): update Go to 1.23.4 Signed-off-by: Deluan <deluan@navidrome.org> * fix: logs Signed-off-by: Deluan <deluan@navidrome.org> * fix(test): Signed-off-by: Deluan <deluan@navidrome.org> * fix: log level Signed-off-by: Deluan <deluan@navidrome.org> * fix: remove log message Signed-off-by: Deluan <deluan@navidrome.org> * feat: add config for scanner watcher Signed-off-by: Deluan <deluan@navidrome.org> * refactor: children playlists Signed-off-by: Deluan <deluan@navidrome.org> * refactor: replace `interface{}` with `any` Signed-off-by: Deluan <deluan@navidrome.org> * fix: smart playlists with genres Signed-off-by: Deluan <deluan@navidrome.org> * fix: allow any tags in smart playlists Signed-off-by: Deluan <deluan@navidrome.org> * fix: artist names in playlists Signed-off-by: Deluan <deluan@navidrome.org> * fix: smart playlist's sort by tags Signed-off-by: Deluan <deluan@navidrome.org> * feat(subsonic): add moods to child Signed-off-by: Deluan <deluan@navidrome.org> * feat(subsonic): add moods to AlbumID3 Signed-off-by: Deluan <deluan@navidrome.org> * refactor(subsonic): use generic JSONArray for OS arrays Signed-off-by: Deluan <deluan@navidrome.org> * refactor(subsonic): use https in test Signed-off-by: Deluan <deluan@navidrome.org> * feat(subsonic): add releaseTypes to AlbumID3 Signed-off-by: Deluan <deluan@navidrome.org> * feat(subsonic): add recordLabels to AlbumID3 Signed-off-by: Deluan <deluan@navidrome.org> * refactor(subsonic): rename JSONArray to Array Signed-off-by: Deluan <deluan@navidrome.org> * feat(subsonic): add artists to AlbumID3 Signed-off-by: Deluan <deluan@navidrome.org> * feat(subsonic): add artists to Child Signed-off-by: Deluan <deluan@navidrome.org> * fix(scanner): do not pre-populate smart playlists Signed-off-by: Deluan <deluan@navidrome.org> * feat(subsonic): implement a simplified version of ArtistID3. See https://github.com/opensubsonic/open-subsonic-api/discussions/120 Signed-off-by: Deluan <deluan@navidrome.org> * feat(subsonic): add artists to album child Signed-off-by: Deluan <deluan@navidrome.org> * feat(subsonic): add contributors to mediafile Child Signed-off-by: Deluan <deluan@navidrome.org> * feat(subsonic): add albumArtists to mediafile Child Signed-off-by: Deluan <deluan@navidrome.org> * feat(subsonic): add displayArtist and displayAlbumArtist Signed-off-by: Deluan <deluan@navidrome.org> * feat(subsonic): add displayComposer to Child Signed-off-by: Deluan <deluan@navidrome.org> * feat(subsonic): add roles to ArtistID3 Signed-off-by: Deluan <deluan@navidrome.org> * fix(subsonic): use " • " separator for displayComposer Signed-off-by: Deluan <deluan@navidrome.org> * refactor: Signed-off-by: Deluan <deluan@navidrome.org> * fix(subsonic): Signed-off-by: Deluan <deluan@navidrome.org> * fix(subsonic): respect `PreferSortTags` config option Signed-off-by: Deluan <deluan@navidrome.org> * refactor(subsonic): Signed-off-by: Deluan <deluan@navidrome.org> * refactor: optimize purging non-unused tags Signed-off-by: Deluan <deluan@navidrome.org> * refactor: don't run 'refresh artist stats' concurrently with other transactions Signed-off-by: Deluan <deluan@navidrome.org> * refactor: Signed-off-by: Deluan <deluan@navidrome.org> * fix: log message Signed-off-by: Deluan <deluan@navidrome.org> * feat: add Scanner.ScanOnStartup config option, default true Signed-off-by: Deluan <deluan@navidrome.org> * feat: better json parsing error msg when importing NSPs Signed-off-by: Deluan <deluan@navidrome.org> * fix: don't update album's imported_time when updating external_metadata Signed-off-by: Deluan <deluan@navidrome.org> * fix: handle interrupted scans and full scans after migrations Signed-off-by: Deluan <deluan@navidrome.org> * feat: run `analyze` when migration requires a full rescan Signed-off-by: Deluan <deluan@navidrome.org> * feat: run `PRAGMA optimize` at the end of the scan Signed-off-by: Deluan <deluan@navidrome.org> * fix: don't update artist's updated_at when updating external_metadata Signed-off-by: Deluan <deluan@navidrome.org> * feat: handle multiple artists and roles in smart playlists Signed-off-by: Deluan <deluan@navidrome.org> * feat(ui): dim missing tracks Signed-off-by: Deluan <deluan@navidrome.org> * fix: album missing logic Signed-off-by: Deluan <deluan@navidrome.org> * fix: error encoding in gob Signed-off-by: Deluan <deluan@navidrome.org> * feat: separate warnings from errors Signed-off-by: Deluan <deluan@navidrome.org> * fix: mark albums as missing if they were contained in a deleted folder Signed-off-by: Deluan <deluan@navidrome.org> * refactor: add participant names to media_file and album tables Signed-off-by: Deluan <deluan@navidrome.org> * refactor: use participations in criteria, instead of m2m relationship Signed-off-by: Deluan <deluan@navidrome.org> * refactor: rename participations to participants Signed-off-by: Deluan <deluan@navidrome.org> * feat(subsonic): add moods to album child Signed-off-by: Deluan <deluan@navidrome.org> * fix: albumartist role case Signed-off-by: Deluan <deluan@navidrome.org> * feat(scanner): run scanner as an external process by default Signed-off-by: Deluan <deluan@navidrome.org> * fix(ui): show albumArtist names Signed-off-by: Deluan <deluan@navidrome.org> * fix(ui): dim out missing albums Signed-off-by: Deluan <deluan@navidrome.org> * fix: flaky test Signed-off-by: Deluan <deluan@navidrome.org> * fix(server): scrobble buffer mapping. fix #3583 Signed-off-by: Deluan <deluan@navidrome.org> * refactor: more participations renaming Signed-off-by: Deluan <deluan@navidrome.org> * fix: listenbrainz scrobbling Signed-off-by: Deluan <deluan@navidrome.org> * feat: send release_group_mbid to listenbrainz Signed-off-by: Deluan <deluan@navidrome.org> * feat(subsonic): implement OpenSubsonic explicitStatus field (#3597) * feat: implement OpenSubsonic explicitStatus field * fix(subsonic): fix failing snapshot tests * refactor: create helper for setting explicitStatus * fix: store smaller values for explicit-status on database * test: ToAlbum explicitStatus * refactor: rename explicitStatus helper function --------- Co-authored-by: Deluan Quintão <deluan@navidrome.org> * fix: handle album and track tags in the DB based on the mappings.yaml file Signed-off-by: Deluan <deluan@navidrome.org> * save similar artists as JSONB Signed-off-by: Deluan <deluan@navidrome.org> * fix: getAlbumList byGenre Signed-off-by: Deluan <deluan@navidrome.org> * detect changes in PID configuration Signed-off-by: Deluan <deluan@navidrome.org> * set default album PID to legacy_pid Signed-off-by: Deluan <deluan@navidrome.org> * fix tests Signed-off-by: Deluan <deluan@navidrome.org> * fix SIGSEGV Signed-off-by: Deluan <deluan@navidrome.org> * fix: don't lose album stars/ratings when migrating Signed-off-by: Deluan <deluan@navidrome.org> * store full PID conf in properties Signed-off-by: Deluan <deluan@navidrome.org> * fix: keep album annotations when changing PID.Album config Signed-off-by: Deluan <deluan@navidrome.org> * fix: reassign album annotations Signed-off-by: Deluan <deluan@navidrome.org> * feat: use (display) albumArtist and add links to each artist Signed-off-by: Deluan <deluan@navidrome.org> * fix: not showing albums by albumartist Signed-off-by: Deluan <deluan@navidrome.org> * fix: error msgs Signed-off-by: Deluan <deluan@navidrome.org> * fix: hide PID from Native API Signed-off-by: Deluan <deluan@navidrome.org> * fix: album cover art resolution Signed-off-by: Deluan <deluan@navidrome.org> * fix: trim participant names Signed-off-by: Deluan <deluan@navidrome.org> * fix: reduce watcher log spam Signed-off-by: Deluan <deluan@navidrome.org> * fix: panic when initializing the watcher Signed-off-by: Deluan <deluan@navidrome.org> * fix: various artists Signed-off-by: Deluan <deluan@navidrome.org> * fix: don't store empty lyrics in the DB Signed-off-by: Deluan <deluan@navidrome.org> * remove unused methods Signed-off-by: Deluan <deluan@navidrome.org> * drop full_text indexes, as they are not being used by SQLite Signed-off-by: Deluan <deluan@navidrome.org> * keep album created_at when upgrading Signed-off-by: Deluan <deluan@navidrome.org> * fix(ui): null pointer Signed-off-by: Deluan <deluan@navidrome.org> * fix: album artwork cache Signed-off-by: Deluan <deluan@navidrome.org> * fix: don't expose missing files in Subsonic API Signed-off-by: Deluan <deluan@navidrome.org> * refactor: searchable interface Signed-off-by: Deluan <deluan@navidrome.org> * fix: filter out missing items from subsonic search * fix: filter out missing items from playlists * fix: filter out missing items from shares Signed-off-by: Deluan <deluan@navidrome.org> * feat(ui): add filter by artist role Signed-off-by: Deluan <deluan@navidrome.org> * feat(subsonic): only return albumartists in getIndexes and getArtists endpoints Signed-off-by: Deluan <deluan@navidrome.org> * sort roles alphabetically Signed-off-by: Deluan <deluan@navidrome.org> * fix: artist playcounts Signed-off-by: Deluan <deluan@navidrome.org> * change default Album PID conf Signed-off-by: Deluan <deluan@navidrome.org> * fix albumartist link when it does not match any albumartists values Signed-off-by: Deluan <deluan@navidrome.org> * fix `Ignoring filter not whitelisted` (role) message Signed-off-by: Deluan <deluan@navidrome.org> * fix: trim any names/titles being imported Signed-off-by: Deluan <deluan@navidrome.org> * remove unused genre code Signed-off-by: Deluan <deluan@navidrome.org> * serialize calls to Last.fm's getArtist Signed-off-by: Deluan <deluan@navidrome.org> xxx Signed-off-by: Deluan <deluan@navidrome.org> * add counters to genres Signed-off-by: Deluan <deluan@navidrome.org> * nit: fix migration `notice` message Signed-off-by: Deluan <deluan@navidrome.org> * optimize similar artists query Signed-off-by: Deluan <deluan@navidrome.org> * fix: last.fm.getInfo when mbid does not exist Signed-off-by: Deluan <deluan@navidrome.org> * ui only show missing items for admins Signed-off-by: Deluan <deluan@navidrome.org> * don't allow interaction with missing items Signed-off-by: Deluan <deluan@navidrome.org> * Add Missing Files view (WIP) Signed-off-by: Deluan <deluan@navidrome.org> * refactor: merged tag_counts into tag table Signed-off-by: Deluan <deluan@navidrome.org> * add option to completely disable automatic scanner Signed-off-by: Deluan <deluan@navidrome.org> * add delete missing files functionality Signed-off-by: Deluan <deluan@navidrome.org> * fix: playlists not showing for regular users Signed-off-by: Deluan <deluan@navidrome.org> * reduce updateLastAccess frequency to once every minute Signed-off-by: Deluan <deluan@navidrome.org> * reduce update player frequency to once every minute Signed-off-by: Deluan <deluan@navidrome.org> * add timeout when updating player Signed-off-by: Deluan <deluan@navidrome.org> * remove dead code Signed-off-by: Deluan <deluan@navidrome.org> * fix duplicated roles in stats Signed-off-by: Deluan <deluan@navidrome.org> * add `; ` to artist splitters Signed-off-by: Deluan <deluan@navidrome.org> * fix stats query Signed-off-by: Deluan <deluan@navidrome.org> * more logs Signed-off-by: Deluan <deluan@navidrome.org> * fix: support legacy clients (DSub) by removing OpenSubsonic extra fields - WIP Signed-off-by: Deluan <deluan@navidrome.org> * fix: support legacy clients (DSub) by removing OpenSubsonic extra fields - WIP Signed-off-by: Deluan <deluan@navidrome.org> * fix: support legacy clients (DSub) by removing OpenSubsonic extra fields - WIP Signed-off-by: Deluan <deluan@navidrome.org> * fix: support legacy clients (DSub) by removing OpenSubsonic extra fields - WIP Signed-off-by: Deluan <deluan@navidrome.org> * add record label filter Signed-off-by: Deluan <deluan@navidrome.org> * add release type filter Signed-off-by: Deluan <deluan@navidrome.org> * fix purgeUnused tags Signed-off-by: Deluan <deluan@navidrome.org> * add grouping filter to albums Signed-off-by: Deluan <deluan@navidrome.org> * allow any album tags to be used in as filters in the API Signed-off-by: Deluan <deluan@navidrome.org> * remove empty tags from album info Signed-off-by: Deluan <deluan@navidrome.org> * comments in the migration Signed-off-by: Deluan <deluan@navidrome.org> * fix: Cannot read properties of undefined Signed-off-by: Deluan <deluan@navidrome.org> * fix: listenbrainz scrobbling (#3640) Signed-off-by: Deluan <deluan@navidrome.org> * fix: remove duplicated tag values Signed-off-by: Deluan <deluan@navidrome.org> * fix: don't ignore the taglib folder! Signed-off-by: Deluan <deluan@navidrome.org> * feat: show track subtitle tag Signed-off-by: Deluan <deluan@navidrome.org> * fix: show artists stats based on selected role Signed-off-by: Deluan <deluan@navidrome.org> * fix: inspect Signed-off-by: Deluan <deluan@navidrome.org> * add media type to album info/filters Signed-off-by: Deluan <deluan@navidrome.org> * fix: change format of subtitle in the UI Signed-off-by: Deluan <deluan@navidrome.org> * fix: subtitle in Subsonic API and search Signed-off-by: Deluan <deluan@navidrome.org> * fix: subtitle in UI's player Signed-off-by: Deluan <deluan@navidrome.org> * fix: split strings should be case-insensitive Signed-off-by: Deluan <deluan@navidrome.org> * disable ScanSchedule Signed-off-by: Deluan <deluan@navidrome.org> * increase default sessiontimeout Signed-off-by: Deluan <deluan@navidrome.org> * add sqlite command line tool to docker image Signed-off-by: Deluan <deluan@navidrome.org> * fix: resources override Signed-off-by: Deluan <deluan@navidrome.org> * fix: album PID conf Signed-off-by: Deluan <deluan@navidrome.org> * change migration to mark current artists as albumArtists Signed-off-by: Deluan <deluan@navidrome.org> * feat(ui): Allow filtering on multiple genres (#3679) * feat(ui): Allow filtering on multiple genres Signed-off-by: Henrik Nordvik <henrikno@gmail.com> Signed-off-by: Deluan <deluan@navidrome.org> * add multi-genre filter in Album list Signed-off-by: Deluan <deluan@navidrome.org> --------- Signed-off-by: Henrik Nordvik <henrikno@gmail.com> Signed-off-by: Deluan <deluan@navidrome.org> Co-authored-by: Henrik Nordvik <henrikno@gmail.com> * add more multi-valued tag filters to Album and Song views Signed-off-by: Deluan <deluan@navidrome.org> * fix(ui): unselect missing files after removing Signed-off-by: Deluan <deluan@navidrome.org> * fix(ui): song filter Signed-off-by: Deluan <deluan@navidrome.org> * fix sharing tracks. fix #3687 Signed-off-by: Deluan <deluan@navidrome.org> * use rowids when using search for sync (ex: Symfonium) Signed-off-by: Deluan <deluan@navidrome.org> * fix "Report Real Paths" option for subsonic clients Signed-off-by: Deluan <deluan@navidrome.org> * fix "Report Real Paths" option for subsonic clients for search Signed-off-by: Deluan <deluan@navidrome.org> * add libraryPath to Native API /songs endpoint Signed-off-by: Deluan <deluan@navidrome.org> * feat(subsonic): add album version Signed-off-by: Deluan <deluan@navidrome.org> * made all tags lowercase as they are case-insensitive anyways. Signed-off-by: Deluan <deluan@navidrome.org> * feat(ui): Show full paths, extended properties for album/song (#3691) * feat(ui): Show full paths, extended properties for album/song - uses library path + os separator + path - show participants (album/song) and tags (song) - make album/participant clickable in show info * add source to path * fix pathSeparator in UI Signed-off-by: Deluan <deluan@navidrome.org> * fix local artist artwork (#3695) Signed-off-by: Deluan <deluan@navidrome.org> * fix: parse vorbis performers Signed-off-by: Deluan <deluan@navidrome.org> * refactor: clean function into smaller functions Signed-off-by: Deluan <deluan@navidrome.org> * fix translations for en and pt Signed-off-by: Deluan <deluan@navidrome.org> * add trace log to show annotations reassignment Signed-off-by: Deluan <deluan@navidrome.org> * add trace log to show annotations reassignment Signed-off-by: Deluan <deluan@navidrome.org> * fix: allow performers without instrument/subrole Signed-off-by: Deluan <deluan@navidrome.org> * refactor: metadata clean function again Signed-off-by: Deluan <deluan@navidrome.org> * refactor: optimize split function Signed-off-by: Deluan <deluan@navidrome.org> * refactor: split function is now a method of TagConf Signed-off-by: Deluan <deluan@navidrome.org> * fix: humanize Artist total size Signed-off-by: Deluan <deluan@navidrome.org> * add album version to album details Signed-off-by: Deluan <deluan@navidrome.org> * don't display album-level tags in SongInfo Signed-off-by: Deluan <deluan@navidrome.org> * fix genre clicking in Album Page Signed-off-by: Deluan <deluan@navidrome.org> * don't use mbids in Last.fm api calls. From https://discord.com/channels/671335427726114836/704303730660737113/1337574018143879248: With MBID: ``` GET https://ws.audioscrobbler.com/2.0/?api_key=XXXX&artist=Van+Morrison&format=json&lang=en&mbid=a41ac10f-0a56-4672-9161-b83f9b223559&method=artist.getInfo { artist: { name: "Bee Gees", mbid: "bf0f7e29-dfe1-416c-b5c6-f9ebc19ea810", url: "https://www.last.fm/music/Bee+Gees", } ``` Without MBID: ``` GET https://ws.audioscrobbler.com/2.0/?api_key=XXXX&artist=Van+Morrison&format=json&lang=en&method=artist.getInfo { artist: { name: "Van Morrison", mbid: "a41ac10f-0a56-4672-9161-b83f9b223559", url: "https://www.last.fm/music/Van+Morrison", } ``` Signed-off-by: Deluan <deluan@navidrome.org> * better logging for when the artist folder is not found Signed-off-by: Deluan <deluan@navidrome.org> * fix various issues with artist image resolution Signed-off-by: Deluan <deluan@navidrome.org> * hide "Additional Tags" header if there are none. Signed-off-by: Deluan <deluan@navidrome.org> * simplify tag rendering Signed-off-by: Deluan <deluan@navidrome.org> * enhance logging for artist folder detection Signed-off-by: Deluan <deluan@navidrome.org> * make folderID consistent for relative and absolute folderPaths Signed-off-by: Deluan <deluan@navidrome.org> * handle more folder paths scenarios Signed-off-by: Deluan <deluan@navidrome.org> * filter out other roles when SubsonicArtistParticipations = true Signed-off-by: Deluan <deluan@navidrome.org> * fix "Cannot read properties of undefined" Signed-off-by: Deluan <deluan@navidrome.org> * fix lyrics and comments being truncated (#3701) * fix lyrics and comments being truncated * specifically test for lyrics and comment length * reorder assertions Signed-off-by: Deluan <deluan@navidrome.org> --------- Signed-off-by: Deluan <deluan@navidrome.org> Co-authored-by: Deluan <deluan@navidrome.org> * fix(server): Expose library_path for playlist (#3705) Allows showing absolute path for UI, and makes "report real path" work for playlists (Subsonic) * fix BFR on Windows (#3704) * fix potential reflected cross-site scripting vulnerability Signed-off-by: Deluan <deluan@navidrome.org> * hack to make it work on Windows * ignore windows executables * try fixing the pipeline Signed-off-by: Deluan <deluan@navidrome.org> * allow MusicFolder in other drives * move windows local drive logic to local storage implementation --------- Signed-off-by: Deluan <deluan@navidrome.org> * increase pagination sizes for missing files Signed-off-by: Deluan <deluan@navidrome.org> * reduce level of "already scanning" watcher log message Signed-off-by: Deluan <deluan@navidrome.org> * only count folders with audio files in it See https://github.com/navidrome/navidrome/discussions/3676#discussioncomment-11990930 Signed-off-by: Deluan <deluan@navidrome.org> * add album version and catalog number to search Signed-off-by: Deluan <deluan@navidrome.org> * add `organization` alias for `recordlabel` Signed-off-by: Deluan <deluan@navidrome.org> * remove mbid from Last.fm agent Signed-off-by: Deluan <deluan@navidrome.org> * feat: support inspect in ui (#3726) * inspect in ui * address round 1 * add catalogNum to AlbumInfo Signed-off-by: Deluan <deluan@navidrome.org> * remove dependency on metadata_old (deprecated) package Signed-off-by: Deluan <deluan@navidrome.org> * add `RawTags` to model Signed-off-by: Deluan <deluan@navidrome.org> * support parsing MBIDs for roles (from the https://github.com/kgarner7/picard-all-mbids plugin) (#3698) * parse standard roles, vorbis/m4a work for now * fix djmixer * working roles, use DJ-mix * add performers to file * map mbids * add a few more tests * add test Signed-off-by: Deluan <deluan@navidrome.org> * try to simplify the performers logic Signed-off-by: Deluan <deluan@navidrome.org> * stylistic changes --------- Signed-off-by: Deluan <deluan@navidrome.org> Co-authored-by: Deluan <deluan@navidrome.org> * remove param mutation Signed-off-by: Deluan <deluan@navidrome.org> * run automated SQLite optimizations Signed-off-by: Deluan <deluan@navidrome.org> * fix playlists import/export on Windows * fix import playlists * fix export playlists * better handling of Windows volumes Signed-off-by: Deluan <deluan@navidrome.org> * handle more album ID reassignments Signed-off-by: Deluan <deluan@navidrome.org> * allow adding/overriding tags in the config file Signed-off-by: Deluan <deluan@navidrome.org> * fix(ui): Fix playlist track id, handle missing tracks better (#3734) - Use `mediaFileId` instead of `id` for playlist tracks - Only fetch if the file is not missing - If extractor fails to get the file, also error (rather than panic) * optimize DB after each scan. Signed-off-by: Deluan <deluan@navidrome.org> * remove sortable from AlbumSongs columns Signed-off-by: Deluan <deluan@navidrome.org> * simplify query to get missing tracks Signed-off-by: Deluan <deluan@navidrome.org> * mark Scanner.Extractor as deprecated Signed-off-by: Deluan <deluan@navidrome.org> --------- Signed-off-by: Deluan <deluan@navidrome.org> Signed-off-by: Henrik Nordvik <henrikno@gmail.com> Co-authored-by: Caio Cotts <caio@cotts.com.br> Co-authored-by: Henrik Nordvik <henrikno@gmail.com> Co-authored-by: Kendall Garner <17521368+kgarner7@users.noreply.github.com>
This commit is contained in:
Deluan Quintão
@@ -1 +1,24 @@
|
||||
{"listen_type": "playing_now", "payload": [{"track_metadata": { "artist_name": "Track Artist", "track_name": "Track Title", "release_name": "Track Album", "additional_info": { "tracknumber": 1, "recording_mbid": "mbz-123", "artist_mbids": ["mbz-789"], "release_mbid": "mbz-456", "duration_ms": 142200}}}]}
|
||||
{
|
||||
"listen_type": "playing_now",
|
||||
"payload": [
|
||||
{
|
||||
"track_metadata": {
|
||||
"artist_name": "Track Artist",
|
||||
"track_name": "Track Title",
|
||||
"release_name": "Track Album",
|
||||
"additional_info": {
|
||||
"tracknumber": 1,
|
||||
"recording_mbid": "mbz-123",
|
||||
"artist_names": [
|
||||
"Artist 1", "Artist 2"
|
||||
],
|
||||
"artist_mbids": [
|
||||
"mbz-789", "mbz-012"
|
||||
],
|
||||
"release_mbid": "mbz-456",
|
||||
"duration_ms": 142200
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -1 +1,25 @@
|
||||
{"listen_type": "single", "payload": [{"listened_at": 1635000000, "track_metadata": { "artist_name": "Track Artist", "track_name": "Track Title", "release_name": "Track Album", "additional_info": { "tracknumber": 1, "recording_mbid": "mbz-123", "artist_mbids": ["mbz-789"], "release_mbid": "mbz-456", "duration_ms": 142200}}}]}
|
||||
{
|
||||
"listen_type": "single",
|
||||
"payload": [
|
||||
{
|
||||
"listened_at": 1635000000,
|
||||
"track_metadata": {
|
||||
"artist_name": "Track Artist",
|
||||
"track_name": "Track Title",
|
||||
"release_name": "Track Album",
|
||||
"additional_info": {
|
||||
"tracknumber": 1,
|
||||
"recording_mbid": "mbz-123",
|
||||
"artist_names": [
|
||||
"Artist 1", "Artist 2"
|
||||
],
|
||||
"artist_mbids": [
|
||||
"mbz-789", "mbz-012"
|
||||
],
|
||||
"release_mbid": "mbz-456",
|
||||
"duration_ms": 142200
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
42
tests/fixtures/playlists/invalid_json.nsp
vendored
Normal file
42
tests/fixtures/playlists/invalid_json.nsp
vendored
Normal file
@@ -0,0 +1,42 @@
|
||||
{
|
||||
"all": [
|
||||
{"is": {"loved": true}},
|
||||
{"isNot": {"genre": "Hip-Hop"}},
|
||||
{"isNot": {"genre": "Hip Hop"}},
|
||||
{"isNot": {"genre": "Rap"}},
|
||||
{"isNot": {"genre": "Alternative Hip Hop"}},
|
||||
{"isNot": {"genre": "Deutsch-Rap"}},
|
||||
{"isNot": {"genre": "Deutsche Musik"}},
|
||||
{"isNot": {"genre": "Uk Hip Hop"}},
|
||||
{"isNot": {"genre": "UK Rap"}},
|
||||
{"isNot": {"genre": "Boom Bap"}},
|
||||
{"isNot": {"genre": "Lo-Fi Hip Hop"}},
|
||||
{"isNot": {"genre": "Jazzy Hip-Hop"}},
|
||||
{"isNot": {"genre": "Jazz Rap"}},
|
||||
{"isNot": {"genre": "Jazz Rap"}},
|
||||
{"isNot": {"genre": "Southern Hip Hop"}},
|
||||
{"isNot": {"genre": "Alternative Hip Hop}},
|
||||
{"isNot": {"genre": "Underground"}},
|
||||
{"isNot": {"genre": "Trap"}},
|
||||
{"isNot": {"genre": "Mixtape"}},
|
||||
{"isNot": {"genre": "Boom-Bap"}},
|
||||
{"isNot": {"genre": "Conscious"}},
|
||||
{"isNot": {"genre": "Turntablism"}},
|
||||
{"isNot": {"genre": "Pop Rap"}},
|
||||
{"isNot": {"genre": "Aussie"}},
|
||||
{"isNot": {"genre": "Horror-Core"}},
|
||||
{"isNot": {"genre": "Pop Rap"}},
|
||||
{"isNot": {"genre": "Female-Rap"}},
|
||||
{"isNot": {"genre": "Female Rap"}},
|
||||
{"isNot": {"genre": "East Coast"}},
|
||||
{"isNot": {"genre": "East Coast Hip Hop"}},
|
||||
{"isNot": {"genre": "West Coast"}},
|
||||
{"isNot": {"genre": "Gangsta Rap"}},
|
||||
{"isNot": {"genre": "Cloudrap"}},
|
||||
{"isNot": {"genre": "Hardcore Hip Hop"}},
|
||||
{"isNot": {"genre": "Mixtape"}},
|
||||
{"isNot": {"genre": "Deutschrap"}}
|
||||
],
|
||||
"sort": "dateLoved",
|
||||
"order": "desc"
|
||||
}
|
||||
BIN
tests/fixtures/test.aiff
vendored
BIN
tests/fixtures/test.aiff
vendored
Binary file not shown.
BIN
tests/fixtures/test.flac
vendored
BIN
tests/fixtures/test.flac
vendored
Binary file not shown.
BIN
tests/fixtures/test.m4a
vendored
BIN
tests/fixtures/test.m4a
vendored
Binary file not shown.
BIN
tests/fixtures/test.mp3
vendored
BIN
tests/fixtures/test.mp3
vendored
Binary file not shown.
BIN
tests/fixtures/test.ogg
vendored
BIN
tests/fixtures/test.ogg
vendored
Binary file not shown.
BIN
tests/fixtures/test.tak
vendored
BIN
tests/fixtures/test.tak
vendored
Binary file not shown.
BIN
tests/fixtures/test.wav
vendored
BIN
tests/fixtures/test.wav
vendored
Binary file not shown.
BIN
tests/fixtures/test.wma
vendored
BIN
tests/fixtures/test.wma
vendored
Binary file not shown.
BIN
tests/fixtures/test.wv
vendored
BIN
tests/fixtures/test.wv
vendored
Binary file not shown.
@@ -4,9 +4,8 @@ import (
|
||||
"errors"
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
|
||||
"github.com/navidrome/navidrome/model"
|
||||
"github.com/navidrome/navidrome/model/id"
|
||||
)
|
||||
|
||||
func CreateMockAlbumRepo() *MockAlbumRepo {
|
||||
@@ -28,7 +27,7 @@ func (m *MockAlbumRepo) SetError(err bool) {
|
||||
}
|
||||
|
||||
func (m *MockAlbumRepo) SetData(albums model.Albums) {
|
||||
m.data = make(map[string]*model.Album)
|
||||
m.data = make(map[string]*model.Album, len(albums))
|
||||
m.all = albums
|
||||
for i, a := range m.all {
|
||||
m.data[a.ID] = &m.all[i]
|
||||
@@ -37,7 +36,7 @@ func (m *MockAlbumRepo) SetData(albums model.Albums) {
|
||||
|
||||
func (m *MockAlbumRepo) Exists(id string) (bool, error) {
|
||||
if m.err {
|
||||
return false, errors.New("Error!")
|
||||
return false, errors.New("unexpected error")
|
||||
}
|
||||
_, found := m.data[id]
|
||||
return found, nil
|
||||
@@ -45,7 +44,7 @@ func (m *MockAlbumRepo) Exists(id string) (bool, error) {
|
||||
|
||||
func (m *MockAlbumRepo) Get(id string) (*model.Album, error) {
|
||||
if m.err {
|
||||
return nil, errors.New("Error!")
|
||||
return nil, errors.New("unexpected error")
|
||||
}
|
||||
if d, ok := m.data[id]; ok {
|
||||
return d, nil
|
||||
@@ -55,10 +54,10 @@ func (m *MockAlbumRepo) Get(id string) (*model.Album, error) {
|
||||
|
||||
func (m *MockAlbumRepo) Put(al *model.Album) error {
|
||||
if m.err {
|
||||
return errors.New("error")
|
||||
return errors.New("unexpected error")
|
||||
}
|
||||
if al.ID == "" {
|
||||
al.ID = uuid.NewString()
|
||||
al.ID = id.NewRandom()
|
||||
}
|
||||
m.data[al.ID] = al
|
||||
return nil
|
||||
@@ -69,18 +68,14 @@ func (m *MockAlbumRepo) GetAll(qo ...model.QueryOptions) (model.Albums, error) {
|
||||
m.Options = qo[0]
|
||||
}
|
||||
if m.err {
|
||||
return nil, errors.New("Error!")
|
||||
return nil, errors.New("unexpected error")
|
||||
}
|
||||
return m.all, nil
|
||||
}
|
||||
|
||||
func (m *MockAlbumRepo) GetAllWithoutGenres(qo ...model.QueryOptions) (model.Albums, error) {
|
||||
return m.GetAll(qo...)
|
||||
}
|
||||
|
||||
func (m *MockAlbumRepo) IncPlayCount(id string, timestamp time.Time) error {
|
||||
if m.err {
|
||||
return errors.New("error")
|
||||
return errors.New("unexpected error")
|
||||
}
|
||||
if d, ok := m.data[id]; ok {
|
||||
d.PlayCount++
|
||||
@@ -93,4 +88,26 @@ func (m *MockAlbumRepo) CountAll(...model.QueryOptions) (int64, error) {
|
||||
return int64(len(m.all)), nil
|
||||
}
|
||||
|
||||
func (m *MockAlbumRepo) GetTouchedAlbums(libID int) (model.AlbumCursor, error) {
|
||||
if m.err {
|
||||
return nil, errors.New("unexpected error")
|
||||
}
|
||||
return func(yield func(model.Album, error) bool) {
|
||||
for _, a := range m.data {
|
||||
if a.ID == "error" {
|
||||
if !yield(*a, errors.New("error")) {
|
||||
break
|
||||
}
|
||||
continue
|
||||
}
|
||||
if a.LibraryID != libID {
|
||||
continue
|
||||
}
|
||||
if !yield(*a, nil) {
|
||||
break
|
||||
}
|
||||
}
|
||||
}, nil
|
||||
}
|
||||
|
||||
var _ model.AlbumRepository = (*MockAlbumRepo)(nil)
|
||||
|
||||
@@ -4,9 +4,8 @@ import (
|
||||
"errors"
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
|
||||
"github.com/navidrome/navidrome/model"
|
||||
"github.com/navidrome/navidrome/model/id"
|
||||
)
|
||||
|
||||
func CreateMockArtistRepo() *MockArtistRepo {
|
||||
@@ -55,7 +54,7 @@ func (m *MockArtistRepo) Put(ar *model.Artist, columsToUpdate ...string) error {
|
||||
return errors.New("error")
|
||||
}
|
||||
if ar.ID == "" {
|
||||
ar.ID = uuid.NewString()
|
||||
ar.ID = id.NewRandom()
|
||||
}
|
||||
m.data[ar.ID] = ar
|
||||
return nil
|
||||
|
||||
222
tests/mock_data_store.go
Normal file
222
tests/mock_data_store.go
Normal file
@@ -0,0 +1,222 @@
|
||||
package tests
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/navidrome/navidrome/model"
|
||||
)
|
||||
|
||||
type MockDataStore struct {
|
||||
RealDS model.DataStore
|
||||
MockedLibrary model.LibraryRepository
|
||||
MockedFolder model.FolderRepository
|
||||
MockedGenre model.GenreRepository
|
||||
MockedAlbum model.AlbumRepository
|
||||
MockedArtist model.ArtistRepository
|
||||
MockedMediaFile model.MediaFileRepository
|
||||
MockedTag model.TagRepository
|
||||
MockedUser model.UserRepository
|
||||
MockedProperty model.PropertyRepository
|
||||
MockedPlayer model.PlayerRepository
|
||||
MockedPlaylist model.PlaylistRepository
|
||||
MockedShare model.ShareRepository
|
||||
MockedTranscoding model.TranscodingRepository
|
||||
MockedUserProps model.UserPropsRepository
|
||||
MockedScrobbleBuffer model.ScrobbleBufferRepository
|
||||
MockedRadio model.RadioRepository
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Library(ctx context.Context) model.LibraryRepository {
|
||||
if db.MockedLibrary == nil {
|
||||
if db.RealDS != nil {
|
||||
db.MockedLibrary = db.RealDS.Library(ctx)
|
||||
} else {
|
||||
db.MockedLibrary = &MockLibraryRepo{}
|
||||
}
|
||||
}
|
||||
return db.MockedLibrary
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Folder(ctx context.Context) model.FolderRepository {
|
||||
if db.MockedFolder == nil {
|
||||
if db.RealDS != nil {
|
||||
db.MockedFolder = db.RealDS.Folder(ctx)
|
||||
} else {
|
||||
db.MockedFolder = struct{ model.FolderRepository }{}
|
||||
}
|
||||
}
|
||||
return db.MockedFolder
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Tag(ctx context.Context) model.TagRepository {
|
||||
if db.MockedTag == nil {
|
||||
if db.RealDS != nil {
|
||||
db.MockedTag = db.RealDS.Tag(ctx)
|
||||
} else {
|
||||
db.MockedTag = struct{ model.TagRepository }{}
|
||||
}
|
||||
}
|
||||
return db.MockedTag
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Album(ctx context.Context) model.AlbumRepository {
|
||||
if db.MockedAlbum == nil {
|
||||
if db.RealDS != nil {
|
||||
db.MockedAlbum = db.RealDS.Album(ctx)
|
||||
} else {
|
||||
db.MockedAlbum = CreateMockAlbumRepo()
|
||||
}
|
||||
}
|
||||
return db.MockedAlbum
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Artist(ctx context.Context) model.ArtistRepository {
|
||||
if db.MockedArtist == nil {
|
||||
if db.RealDS != nil {
|
||||
db.MockedArtist = db.RealDS.Artist(ctx)
|
||||
} else {
|
||||
db.MockedArtist = CreateMockArtistRepo()
|
||||
}
|
||||
}
|
||||
return db.MockedArtist
|
||||
}
|
||||
|
||||
func (db *MockDataStore) MediaFile(ctx context.Context) model.MediaFileRepository {
|
||||
if db.MockedMediaFile == nil {
|
||||
if db.RealDS != nil {
|
||||
db.MockedMediaFile = db.RealDS.MediaFile(ctx)
|
||||
} else {
|
||||
db.MockedMediaFile = CreateMockMediaFileRepo()
|
||||
}
|
||||
}
|
||||
return db.MockedMediaFile
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Genre(ctx context.Context) model.GenreRepository {
|
||||
if db.MockedGenre == nil {
|
||||
if db.RealDS != nil {
|
||||
db.MockedGenre = db.RealDS.Genre(ctx)
|
||||
} else {
|
||||
db.MockedGenre = &MockedGenreRepo{}
|
||||
}
|
||||
}
|
||||
return db.MockedGenre
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Playlist(ctx context.Context) model.PlaylistRepository {
|
||||
if db.MockedPlaylist == nil {
|
||||
if db.RealDS != nil {
|
||||
db.MockedPlaylist = db.RealDS.Playlist(ctx)
|
||||
} else {
|
||||
db.MockedPlaylist = &MockPlaylistRepo{}
|
||||
}
|
||||
}
|
||||
return db.MockedPlaylist
|
||||
}
|
||||
|
||||
func (db *MockDataStore) PlayQueue(ctx context.Context) model.PlayQueueRepository {
|
||||
if db.RealDS != nil {
|
||||
return db.RealDS.PlayQueue(ctx)
|
||||
}
|
||||
return struct{ model.PlayQueueRepository }{}
|
||||
}
|
||||
|
||||
func (db *MockDataStore) UserProps(ctx context.Context) model.UserPropsRepository {
|
||||
if db.MockedUserProps == nil {
|
||||
if db.RealDS != nil {
|
||||
db.MockedUserProps = db.RealDS.UserProps(ctx)
|
||||
} else {
|
||||
db.MockedUserProps = &MockedUserPropsRepo{}
|
||||
}
|
||||
}
|
||||
return db.MockedUserProps
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Property(ctx context.Context) model.PropertyRepository {
|
||||
if db.MockedProperty == nil {
|
||||
if db.RealDS != nil {
|
||||
db.MockedProperty = db.RealDS.Property(ctx)
|
||||
} else {
|
||||
db.MockedProperty = &MockedPropertyRepo{}
|
||||
}
|
||||
}
|
||||
return db.MockedProperty
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Share(ctx context.Context) model.ShareRepository {
|
||||
if db.MockedShare == nil {
|
||||
if db.RealDS != nil {
|
||||
db.MockedShare = db.RealDS.Share(ctx)
|
||||
} else {
|
||||
db.MockedShare = &MockShareRepo{}
|
||||
}
|
||||
}
|
||||
return db.MockedShare
|
||||
}
|
||||
|
||||
func (db *MockDataStore) User(ctx context.Context) model.UserRepository {
|
||||
if db.MockedUser == nil {
|
||||
if db.RealDS != nil {
|
||||
db.MockedUser = db.RealDS.User(ctx)
|
||||
} else {
|
||||
db.MockedUser = CreateMockUserRepo()
|
||||
}
|
||||
}
|
||||
return db.MockedUser
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Transcoding(ctx context.Context) model.TranscodingRepository {
|
||||
if db.MockedTranscoding == nil {
|
||||
if db.RealDS != nil {
|
||||
db.MockedTranscoding = db.RealDS.Transcoding(ctx)
|
||||
} else {
|
||||
db.MockedTranscoding = struct{ model.TranscodingRepository }{}
|
||||
}
|
||||
}
|
||||
return db.MockedTranscoding
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Player(ctx context.Context) model.PlayerRepository {
|
||||
if db.MockedPlayer == nil {
|
||||
if db.RealDS != nil {
|
||||
db.MockedPlayer = db.RealDS.Player(ctx)
|
||||
} else {
|
||||
db.MockedPlayer = struct{ model.PlayerRepository }{}
|
||||
}
|
||||
}
|
||||
return db.MockedPlayer
|
||||
}
|
||||
|
||||
func (db *MockDataStore) ScrobbleBuffer(ctx context.Context) model.ScrobbleBufferRepository {
|
||||
if db.MockedScrobbleBuffer == nil {
|
||||
if db.RealDS != nil {
|
||||
db.MockedScrobbleBuffer = db.RealDS.ScrobbleBuffer(ctx)
|
||||
} else {
|
||||
db.MockedScrobbleBuffer = CreateMockedScrobbleBufferRepo()
|
||||
}
|
||||
}
|
||||
return db.MockedScrobbleBuffer
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Radio(ctx context.Context) model.RadioRepository {
|
||||
if db.MockedRadio == nil {
|
||||
if db.RealDS != nil {
|
||||
db.MockedRadio = db.RealDS.Radio(ctx)
|
||||
} else {
|
||||
db.MockedRadio = CreateMockedRadioRepo()
|
||||
}
|
||||
}
|
||||
return db.MockedRadio
|
||||
}
|
||||
|
||||
func (db *MockDataStore) WithTx(block func(model.DataStore) error) error {
|
||||
return block(db)
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Resource(context.Context, any) model.ResourceRepository {
|
||||
return struct{ model.ResourceRepository }{}
|
||||
}
|
||||
|
||||
func (db *MockDataStore) GC(context.Context) error {
|
||||
return nil
|
||||
}
|
||||
38
tests/mock_library_repo.go
Normal file
38
tests/mock_library_repo.go
Normal file
@@ -0,0 +1,38 @@
|
||||
package tests
|
||||
|
||||
import (
|
||||
"github.com/navidrome/navidrome/model"
|
||||
"golang.org/x/exp/maps"
|
||||
)
|
||||
|
||||
type MockLibraryRepo struct {
|
||||
model.LibraryRepository
|
||||
data map[int]model.Library
|
||||
Err error
|
||||
}
|
||||
|
||||
func (m *MockLibraryRepo) SetData(data model.Libraries) {
|
||||
m.data = make(map[int]model.Library)
|
||||
for _, d := range data {
|
||||
m.data[d.ID] = d
|
||||
}
|
||||
}
|
||||
|
||||
func (m *MockLibraryRepo) GetAll(...model.QueryOptions) (model.Libraries, error) {
|
||||
if m.Err != nil {
|
||||
return nil, m.Err
|
||||
}
|
||||
return maps.Values(m.data), nil
|
||||
}
|
||||
|
||||
func (m *MockLibraryRepo) GetPath(id int) (string, error) {
|
||||
if m.Err != nil {
|
||||
return "", m.Err
|
||||
}
|
||||
if lib, ok := m.data[id]; ok {
|
||||
return lib.Path, nil
|
||||
}
|
||||
return "", model.ErrNotFound
|
||||
}
|
||||
|
||||
var _ model.LibraryRepository = &MockLibraryRepo{}
|
||||
@@ -1,13 +1,14 @@
|
||||
package tests
|
||||
|
||||
import (
|
||||
"cmp"
|
||||
"errors"
|
||||
"maps"
|
||||
"slices"
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
"github.com/navidrome/navidrome/model"
|
||||
"github.com/navidrome/navidrome/model/id"
|
||||
"github.com/navidrome/navidrome/utils/slice"
|
||||
)
|
||||
|
||||
@@ -52,6 +53,16 @@ func (m *MockMediaFileRepo) Get(id string) (*model.MediaFile, error) {
|
||||
return nil, model.ErrNotFound
|
||||
}
|
||||
|
||||
func (m *MockMediaFileRepo) GetWithParticipants(id string) (*model.MediaFile, error) {
|
||||
if m.err {
|
||||
return nil, errors.New("error")
|
||||
}
|
||||
if d, ok := m.data[id]; ok {
|
||||
return d, nil
|
||||
}
|
||||
return nil, model.ErrNotFound
|
||||
}
|
||||
|
||||
func (m *MockMediaFileRepo) GetAll(...model.QueryOptions) (model.MediaFiles, error) {
|
||||
if m.err {
|
||||
return nil, errors.New("error")
|
||||
@@ -67,12 +78,23 @@ func (m *MockMediaFileRepo) Put(mf *model.MediaFile) error {
|
||||
return errors.New("error")
|
||||
}
|
||||
if mf.ID == "" {
|
||||
mf.ID = uuid.NewString()
|
||||
mf.ID = id.NewRandom()
|
||||
}
|
||||
m.data[mf.ID] = mf
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *MockMediaFileRepo) Delete(id string) error {
|
||||
if m.err {
|
||||
return errors.New("error")
|
||||
}
|
||||
if _, ok := m.data[id]; !ok {
|
||||
return model.ErrNotFound
|
||||
}
|
||||
delete(m.data, id)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *MockMediaFileRepo) IncPlayCount(id string, timestamp time.Time) error {
|
||||
if m.err {
|
||||
return errors.New("error")
|
||||
@@ -101,4 +123,38 @@ func (m *MockMediaFileRepo) FindByAlbum(artistId string) (model.MediaFiles, erro
|
||||
return res, nil
|
||||
}
|
||||
|
||||
func (m *MockMediaFileRepo) GetMissingAndMatching(libId int) (model.MediaFileCursor, error) {
|
||||
if m.err {
|
||||
return nil, errors.New("error")
|
||||
}
|
||||
var res model.MediaFiles
|
||||
for _, a := range m.data {
|
||||
if a.LibraryID == libId && a.Missing {
|
||||
res = append(res, *a)
|
||||
}
|
||||
}
|
||||
|
||||
for _, a := range m.data {
|
||||
if a.LibraryID == libId && !(*a).Missing && slices.IndexFunc(res, func(mediaFile model.MediaFile) bool {
|
||||
return mediaFile.PID == a.PID
|
||||
}) != -1 {
|
||||
res = append(res, *a)
|
||||
}
|
||||
}
|
||||
slices.SortFunc(res, func(i, j model.MediaFile) int {
|
||||
return cmp.Or(
|
||||
cmp.Compare(i.PID, j.PID),
|
||||
cmp.Compare(i.ID, j.ID),
|
||||
)
|
||||
})
|
||||
|
||||
return func(yield func(model.MediaFile, error) bool) {
|
||||
for _, a := range res {
|
||||
if !yield(a, nil) {
|
||||
break
|
||||
}
|
||||
}
|
||||
}, nil
|
||||
}
|
||||
|
||||
var _ model.MediaFileRepository = (*MockMediaFileRepo)(nil)
|
||||
|
||||
@@ -1,134 +0,0 @@
|
||||
package tests
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/navidrome/navidrome/model"
|
||||
)
|
||||
|
||||
type MockDataStore struct {
|
||||
MockedGenre model.GenreRepository
|
||||
MockedAlbum model.AlbumRepository
|
||||
MockedArtist model.ArtistRepository
|
||||
MockedMediaFile model.MediaFileRepository
|
||||
MockedUser model.UserRepository
|
||||
MockedProperty model.PropertyRepository
|
||||
MockedPlayer model.PlayerRepository
|
||||
MockedPlaylist model.PlaylistRepository
|
||||
MockedShare model.ShareRepository
|
||||
MockedTranscoding model.TranscodingRepository
|
||||
MockedUserProps model.UserPropsRepository
|
||||
MockedScrobbleBuffer model.ScrobbleBufferRepository
|
||||
MockedRadioBuffer model.RadioRepository
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Album(context.Context) model.AlbumRepository {
|
||||
if db.MockedAlbum == nil {
|
||||
db.MockedAlbum = CreateMockAlbumRepo()
|
||||
}
|
||||
return db.MockedAlbum
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Artist(context.Context) model.ArtistRepository {
|
||||
if db.MockedArtist == nil {
|
||||
db.MockedArtist = CreateMockArtistRepo()
|
||||
}
|
||||
return db.MockedArtist
|
||||
}
|
||||
|
||||
func (db *MockDataStore) MediaFile(context.Context) model.MediaFileRepository {
|
||||
if db.MockedMediaFile == nil {
|
||||
db.MockedMediaFile = CreateMockMediaFileRepo()
|
||||
}
|
||||
return db.MockedMediaFile
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Library(context.Context) model.LibraryRepository {
|
||||
return struct{ model.LibraryRepository }{}
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Genre(context.Context) model.GenreRepository {
|
||||
if db.MockedGenre == nil {
|
||||
db.MockedGenre = &MockedGenreRepo{}
|
||||
}
|
||||
return db.MockedGenre
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Playlist(context.Context) model.PlaylistRepository {
|
||||
if db.MockedPlaylist == nil {
|
||||
db.MockedPlaylist = &MockPlaylistRepo{}
|
||||
}
|
||||
return db.MockedPlaylist
|
||||
}
|
||||
|
||||
func (db *MockDataStore) PlayQueue(context.Context) model.PlayQueueRepository {
|
||||
return struct{ model.PlayQueueRepository }{}
|
||||
}
|
||||
|
||||
func (db *MockDataStore) UserProps(context.Context) model.UserPropsRepository {
|
||||
if db.MockedUserProps == nil {
|
||||
db.MockedUserProps = &MockedUserPropsRepo{}
|
||||
}
|
||||
return db.MockedUserProps
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Property(context.Context) model.PropertyRepository {
|
||||
if db.MockedProperty == nil {
|
||||
db.MockedProperty = &MockedPropertyRepo{}
|
||||
}
|
||||
return db.MockedProperty
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Share(context.Context) model.ShareRepository {
|
||||
if db.MockedShare == nil {
|
||||
db.MockedShare = &MockShareRepo{}
|
||||
}
|
||||
return db.MockedShare
|
||||
}
|
||||
|
||||
func (db *MockDataStore) User(context.Context) model.UserRepository {
|
||||
if db.MockedUser == nil {
|
||||
db.MockedUser = CreateMockUserRepo()
|
||||
}
|
||||
return db.MockedUser
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Transcoding(context.Context) model.TranscodingRepository {
|
||||
if db.MockedTranscoding != nil {
|
||||
return db.MockedTranscoding
|
||||
}
|
||||
return struct{ model.TranscodingRepository }{}
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Player(context.Context) model.PlayerRepository {
|
||||
if db.MockedPlayer != nil {
|
||||
return db.MockedPlayer
|
||||
}
|
||||
return struct{ model.PlayerRepository }{}
|
||||
}
|
||||
|
||||
func (db *MockDataStore) ScrobbleBuffer(ctx context.Context) model.ScrobbleBufferRepository {
|
||||
if db.MockedScrobbleBuffer == nil {
|
||||
db.MockedScrobbleBuffer = CreateMockedScrobbleBufferRepo()
|
||||
}
|
||||
return db.MockedScrobbleBuffer
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Radio(ctx context.Context) model.RadioRepository {
|
||||
if db.MockedRadioBuffer == nil {
|
||||
db.MockedRadioBuffer = CreateMockedRadioRepo()
|
||||
}
|
||||
return db.MockedRadioBuffer
|
||||
}
|
||||
|
||||
func (db *MockDataStore) WithTx(block func(db model.DataStore) error) error {
|
||||
return block(db)
|
||||
}
|
||||
|
||||
func (db *MockDataStore) Resource(ctx context.Context, m interface{}) model.ResourceRepository {
|
||||
return struct{ model.ResourceRepository }{}
|
||||
}
|
||||
|
||||
func (db *MockDataStore) GC(ctx context.Context, rootFolder string) error {
|
||||
return nil
|
||||
}
|
||||
@@ -3,8 +3,8 @@ package tests
|
||||
import (
|
||||
"errors"
|
||||
|
||||
"github.com/google/uuid"
|
||||
"github.com/navidrome/navidrome/model"
|
||||
"github.com/navidrome/navidrome/model/id"
|
||||
)
|
||||
|
||||
type MockedRadioRepo struct {
|
||||
@@ -78,7 +78,7 @@ func (m *MockedRadioRepo) Put(radio *model.Radio) error {
|
||||
return errors.New("error")
|
||||
}
|
||||
if radio.ID == "" {
|
||||
radio.ID = uuid.NewString()
|
||||
radio.ID = id.NewRandom()
|
||||
}
|
||||
m.data[radio.ID] = radio
|
||||
return nil
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
User = "deluan"
|
||||
Password = "wordpass"
|
||||
DbPath = "file::memory:?cache=shared"
|
||||
MusicFolder = "./tests/fixtures"
|
||||
DataFolder = "data/tests"
|
||||
ScanSchedule="0"
|
||||
|
||||
38
tests/test_helpers.go
Normal file
38
tests/test_helpers.go
Normal file
@@ -0,0 +1,38 @@
|
||||
package tests
|
||||
|
||||
import (
|
||||
"context"
|
||||
"io/fs"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/navidrome/navidrome/db"
|
||||
"github.com/navidrome/navidrome/model/id"
|
||||
)
|
||||
|
||||
type testingT interface {
|
||||
TempDir() string
|
||||
}
|
||||
|
||||
func TempFileName(t testingT, prefix, suffix string) string {
|
||||
return filepath.Join(t.TempDir(), prefix+id.NewRandom()+suffix)
|
||||
}
|
||||
|
||||
func TempFile(t testingT, prefix, suffix string) (fs.File, string, error) {
|
||||
name := TempFileName(t, prefix, suffix)
|
||||
f, err := os.Create(name)
|
||||
return f, name, err
|
||||
}
|
||||
|
||||
// ClearDB deletes all tables and data from the database
|
||||
// https://stackoverflow.com/questions/525512/drop-all-tables-command
|
||||
func ClearDB() error {
|
||||
_, err := db.Db().ExecContext(context.Background(), `
|
||||
PRAGMA writable_schema = 1;
|
||||
DELETE FROM sqlite_master;
|
||||
PRAGMA writable_schema = 0;
|
||||
VACUUM;
|
||||
PRAGMA integrity_check;
|
||||
`)
|
||||
return err
|
||||
}
|
||||
Reference in New Issue
Block a user