Skip to content

Commit

Permalink
Merge branch 'main' of github.com:lyarenei/jellyfin-plugin-lastfm int…
Browse files Browse the repository at this point in the history
…o backups

# Conflicts:
#	build.yaml
  • Loading branch information
lyarenei committed Dec 7, 2024
2 parents dcc4bc0 + c9438e4 commit e4a07a4
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 246 deletions.
29 changes: 16 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,16 @@ recommended to use the "main" repository, which will always contain the latest v
latest major Jellyfin server. Otherwise you can use the specific ones to avoid breakage with the server version you are
using.

| Jellyfin version | Repo URL |
|------------------------|-------------------------------------------------------|
| Latest major (10.9.x) | `https://repo.xkrivo.net/jellyfin/manifest.json` |
| 10.8.x | `https://repo.xkrivo.net/jellyfin-10-8/manifest.json` |
| Unstable - development | `https://repo.xkrivo.net/jellyfin-dev/manifest.json` |
| Jellyfin version | Repo URL |
|--------------------------------|-------------------------------------------------------|
| Latest major version | `https://repo.xkrivo.net/jellyfin/manifest.json` |
| Jellyfin 10.9.x | `https://repo.xkrivo.net/jellyfin-10-9/manifest.json` |
| Jellyfin 10.8.x | `https://repo.xkrivo.net/jellyfin-10-8/manifest.json` |
| Unstable - development builds | `https://repo.xkrivo.net/jellyfin-dev/manifest.json` |

The development repo should not be used, unless you are fine with all the risks of running unstable releases of software
or you have been explicitly asked to (for example when testing fixes or new features).
The development repo is listed here just for the sake of completeness.
It should not be used, unless you are fine with all the risks of running unstable releases of software or you have been
explicitly asked to.

### Adding the repository

Expand All @@ -68,12 +70,13 @@ plugin [configuration](doc/configuration.md).

Plugin and Jellyfin versions compatibility table:

| Plugin | Jellyfin | Status |
|---------|----------|-------------|
| 1.x.y.z | 10.7.a | Unsupported |
| 2.x.y.z | 10.8.a | Unsupported |
| 3.x.y.z | 10.8.a | Unsupported |
| 4.x.y.z | 10.9.a | Active |
| Plugin | Jellyfin | Status |
|---------|----------|---------------|
| 1.x.y.z | 10.7.a | Unsupported |
| 2.x.y.z | 10.8.a | Unsupported |
| 3.x.y.z | 10.8.a | Unsupported |
| 4.x.y.z | 10.9.a | Bugfixes only |
| 5.x.y.z | 10.10.a | Active |

## Configuration

Expand Down
4 changes: 2 additions & 2 deletions build.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
name: "ListenBrainz"
guid: "59B20823-AAFE-454C-A393-17427F518631"
version: "4.1.0.6"
targetAbi: "10.9.0.0"
version: "5.1.0.0"
targetAbi: "10.10.0.0"
framework: "net8.0"
overview: "Track your music habits with ListenBrainz."
description: >
Expand Down
3 changes: 1 addition & 2 deletions doc/how-it-works.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# How does the plugin work

Here is a general description of how particular plugin features work. The plugin configuration is documented separately
and can be found [here](configuration.md). If you are upgrading from versions 2 and below, it might be worth to check
out the [migration documentation](migration.md) as well.
and can be found [here](configuration.md).

## Sending listens

Expand Down
40 changes: 0 additions & 40 deletions doc/migration.md

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public static Listen AsListen(this Audio item, long? timestamp = null, AudioItem
SubmissionClient = Plugin.FullName,
SubmissionClientVersion = Plugin.Version,
ReleaseMbid = item.ProviderIds.GetValueOrDefault("MusicBrainzAlbum"),
ArtistMbids = item.ProviderIds.GetValueOrDefault("MusicBrainzArtist")?.Split(';', '/', ',').Select(s => s.Trim()).ToArray(),
ArtistMbids = item.ProviderIds.GetValueOrDefault("MusicBrainzArtist")?.Split(';', '/', ',', (char)0x1F).Select(s => s.Trim()).ToArray(),
ReleaseGroupMbid = item.ProviderIds.GetValueOrDefault("MusicBrainzReleaseGroup"),
RecordingMbid = itemMetadata?.RecordingMbid,
TrackMbid = item.ProviderIds.GetValueOrDefault("MusicBrainzTrack"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Jellyfin.Controller" Version="10.9.0" />
<PackageReference Include="Jellyfin.Data" Version="10.9.0" />
<PackageReference Include="Jellyfin.Model" Version="10.9.0" />
<PackageReference Include="Jellyfin.Controller" Version="10.10.0" />
<PackageReference Include="Jellyfin.Data" Version="10.10.0" />
<PackageReference Include="Jellyfin.Model" Version="10.10.0" />
<PackageReference Include="SerilogAnalyzer" Version="0.15.0" />
<PackageReference Include="SmartAnalyzers.ExceptionAnalyzer" Version="1.0.10" />
<PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ private async Task HandleFavoriteSync(IProgress<double> progress, UserConfig use

var items = _libraryManager
.GetItemList(q, allowedLibraries.ToList())
.Where(i => !_userDataManager.GetUserData(userConfig.JellyfinUserId, i).IsFavorite)
.Where(i => !_userDataManager.GetUserData(user, i).IsFavorite)
.Where(i => i.ProviderIds.GetValueOrDefault("MusicBrainzTrack") is not null)
.ToList();

Expand Down
184 changes: 0 additions & 184 deletions src/Jellyfin.Plugin.ListenBrainz/Tasks/MigrationTask.cs

This file was deleted.

0 comments on commit e4a07a4

Please sign in to comment.