Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add M3U library provider #2156

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/mopidy/m3u/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from mopidy import backend
from mopidy.types import UriScheme

from . import playlists
from . import library, playlists

if TYPE_CHECKING:
from mopidy.audio import AudioProxy
Expand All @@ -24,3 +24,4 @@ def __init__(
) -> None:
super().__init__()
self.playlists = playlists.M3UPlaylistsProvider(self, config)
self.library = library.M3ULibraryProvider(self, self.playlists)
12 changes: 12 additions & 0 deletions src/mopidy/m3u/library.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
from mopidy import backend

from . import playlists, translator


class M3ULibraryProvider(backend.LibraryProvider):
def __init__(self, backend, playlist_provider: playlists.M3UPlaylistsProvider):
super().__init__(backend)
self.playlist_provider = playlist_provider

def lookup(self, uri):
return translator.refs_to_tracks(self.playlist_provider.get_items(uri))

Check warning on line 12 in src/mopidy/m3u/library.py

View check run for this annotation

Codecov / codecov/patch

src/mopidy/m3u/library.py#L12

Added line #L12 was not covered by tests
10 changes: 7 additions & 3 deletions src/mopidy/m3u/translator.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ def path_to_ref(path: Path) -> Ref:
return Ref.playlist(uri=path_to_uri(path), name=name_from_path(path))


def refs_to_tracks(refs: Iterable[Ref | Track] | None)-> list[Track]:
if refs is None:
refs = []
return [Track(uri=item.uri, name=item.name) for item in refs]


def load_items(
fp: IO[str],
basedir: Path,
Expand Down Expand Up @@ -96,11 +102,9 @@ def playlist(
items: Iterable[Ref | Track] | None = None,
mtime: float | None = None,
) -> Playlist:
if items is None:
items = []
return Playlist(
uri=path_to_uri(path),
name=name_from_path(path),
tracks=[Track(uri=item.uri, name=item.name) for item in items],
tracks=refs_to_tracks(items),
last_modified=(int(mtime * 1000) if mtime else None),
)