From: Christian Heller Date: Tue, 10 Dec 2024 14:30:39 +0000 (+0100) Subject: Reorganize playlist page to only use JS API, smaller changes along the other template... X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/%7B%7B%20web_path%20%7D%7D/%7B%7Bdb.prefix%7D%7D/static/conditions?a=commitdiff_plain;h=691f3f02a419928765f1cb65819dfd1c33e4a625;p=ytplom Reorganize playlist page to only use JS API, smaller changes along the other templates too. --- diff --git a/src/templates/_base.tmpl b/src/templates/_base.tmpl index 90deafb..9f19af6 100644 --- a/src/templates/_base.tmpl +++ b/src/templates/_base.tmpl @@ -4,8 +4,54 @@ +{{ macros.link_if("playlist" != selected, page_names.playlist) }} +Â· {{ macros.link_if("files" != selected, page_names.files) }} +Â· {{ macros.link_if("yt_queries" != selected, page_names.yt_queries, "queries") }} +| + + + + +

{% block body %} {% endblock %} diff --git a/src/templates/_macros.tmpl b/src/templates/_macros.tmpl index 8c407c1..9c70226 100644 --- a/src/templates/_macros.tmpl +++ b/src/templates/_macros.tmpl @@ -1,64 +1,5 @@ -{% macro _link_if(cond, target, display_name = false ) %}{% if cond %}{% endif %}{% if display_name %}{{display_name}}{% else %}{{target}}{% endif %}{% if cond %}{% endif %}{% endmacro %} - - -{% macro nav_head(page_names, redir_target, player_state, selected="") %} - -

-{% endmacro %} - - -{% macro file_data_form(file, unused_tags, page_names, redir_target, flag_names=[], playlist_view=false) %} -

- - -{% if playlist_view %} - -{% endif %} - -{% if not playlist_view %} - -{% endif %} - - - - - -{% if not playlist_view %} - - - - -{% endif %} -

current selection

path:

{% if playlist_view %}{% endif %}{{file.rel_path}}{% if playlist_view %}{% endif %}

present:

{% if file.present %}yes{% else %}no{% endif %}

YouTube ID:

tags

+ + + +

+ + +

playlist

- +

diff --git a/src/templates/yt_queries.tmpl b/src/templates/yt_queries.tmpl index 477b7b2..bd527f3 100644 --- a/src/templates/yt_queries.tmpl +++ b/src/templates/yt_queries.tmpl @@ -2,7 +2,6 @@ {% block body %} -{{ macros.nav_head(page_names, redir_target, player_state, "yt_queries") }}

quota: {{quota_count}}/100000

diff --git a/src/templates/yt_result.tmpl b/src/templates/yt_result.tmpl index 6537246..6e14dc4 100644 --- a/src/templates/yt_result.tmpl +++ b/src/templates/yt_result.tmpl @@ -2,7 +2,6 @@ {% block body %} -{{ macros.nav_head(page_names, redir_target, player_state) }} diff --git a/src/templates/yt_results.tmpl b/src/templates/yt_results.tmpl index c3fa034..057bb8a 100644 --- a/src/templates/yt_results.tmpl +++ b/src/templates/yt_results.tmpl @@ -2,7 +2,6 @@ {% block body %} -{{ macros.nav_head(page_names, redir_target, player_state) }}

query: {{query}}

title:	{{video_data.title}}
thumbnail:

{% for video in videos %} diff --git a/src/ytplom/db.py b/src/ytplom/db.py index 549df4a..bcc8b30 100644 --- a/src/ytplom/db.py +++ b/src/ytplom/db.py @@ -31,6 +31,9 @@ class Hash: def __init__(self, as_bytes: bytes) -> None: self.bytes = as_bytes + def __hash__(self) -> int: + return int.from_bytes(self.bytes) + def __eq__(self, other): if not isinstance(other, Hash): return False diff --git a/src/ytplom/http.py b/src/ytplom/http.py index f378da3..90c3ef0 100644 --- a/src/ytplom/http.py +++ b/src/ytplom/http.py @@ -1,6 +1,6 @@ """Collect directly HTTP-related elements.""" -from http.server import HTTPServer, BaseHTTPRequestHandler -from json import dumps as json_dumps +from http.server import ThreadingHTTPServer, BaseHTTPRequestHandler +from json import dumps as json_dumps, loads as json_loads from pathlib import Path from time import sleep from typing import Any, Generator, Optional, TypeAlias @@ -11,8 +11,7 @@ from jinja2 import ( # type: ignore Environment as JinjaEnv, FileSystemLoader as JinjaFSLoader) from ytplom.db import Hash, DbConn from ytplom.misc import ( - FilterStr, FlagName, PlayerUpdateId, QueryId, QueryText, Tag, UrlStr, - YoutubeId, + FilterStr, FlagName, QueryId, QueryText, Tag, UrlStr, YoutubeId, FILE_FLAGS, PATH_THUMBNAILS, YOUTUBE_URL_PREFIX, ensure_expected_dirs, Config, DownloadsManager, Player, QuotaLog, VideoFile, YoutubeQuery, @@ -21,7 +20,6 @@ from ytplom.misc import ( from ytplom.primitives import NotFoundException, PATH_APP_DATA # type definitions for mypy - _PageNames: TypeAlias = dict[str, Path] _ReqDict: TypeAlias = dict[str, list[str]] _TemplateContext: TypeAlias = dict[str, Any] @@ -42,10 +40,11 @@ _NAME_TEMPLATE_PLAYLIST = Path('playlist.tmpl') # page names PAGE_NAMES: _PageNames = { 'download': Path('dl'), + 'events': Path('events'), 'file': Path('file'), + 'file_tags': Path('file_tags'), 'files': Path('files'), - 'last_update': Path('last_playlist_update.json'), - 'missing': Path('missing.json'), + 'missing': Path('missing'), 'player': Path('player'), 'playlist': Path('playlist'), 'thumbnails': Path('thumbnails'), @@ -54,16 +53,23 @@ PAGE_NAMES: _PageNames = { 'yt_queries': Path('yt_queries') } +# misc +_HEADER_CONTENT_TYPE = 'Content-Type' +_HEADER_APP_JSON = 'application/json' + class _ReqMap: - """Wrapper over parse_qs results, i.e. HTTP postvars or query params.""" + """Wrapper over dictionary-like HTTP postings.""" - def __init__(self, map_as_str: str) -> None: + def __init__(self, map_as_str: str, is_json: bool = False) -> None: + self.is_json = is_json self.as_str = map_as_str @property def as_dict(self) -> _ReqDict: - """Return as parse_qs-resulting dictionary.""" + """Return parsed to dictionary.""" + if self.is_json: + return json_loads(self.as_str) return parse_qs(self.as_str) @property @@ -71,10 +77,14 @@ class _ReqMap: """Return single .as_dict key, implicitly assuming there's only one.""" return list(self.as_dict.keys())[0] - def single_value(self, key: str) -> str: + def first_for(self, key: str) -> str: """Return .as_dict[key][0] if possible, else ''.""" return self.as_dict.get(key, [''])[0] + def all_for(self, key: str) -> list[str]: + """Return all values mapped to key.""" + return self.as_dict.get(key, []) + def key_starting_with(self, start: str) -> Generator: """From .as_dict yield key starting with start.""" for k in self.as_dict: @@ -82,8 +92,8 @@ class _ReqMap: yield k -class Server(HTTPServer): - """Extension of HTTPServer providing for Player and DownloadsManager.""" +class Server(ThreadingHTTPServer): + """Extension of parent server providing for Player and DownloadsManager.""" def __init__(self, config: Config, *args, **kwargs) -> None: super().__init__((config.host, config.port), _TaskHandler, @@ -101,7 +111,7 @@ class _TaskHandler(BaseHTTPRequestHandler): server: Server def _send_http(self, - content: bytes = b'', + content: str | bytes = b'', headers: Optional[list[tuple[str, str]]] = None, code: int = 200 ) -> None: @@ -111,6 +121,8 @@ class _TaskHandler(BaseHTTPRequestHandler): self.send_header(header_tuple[0], header_tuple[1]) self.end_headers() if content: + if isinstance(content, str): + content = bytes(content, 'utf8') self.wfile.write(content) def _redirect(self, target: Path) -> None: @@ -118,46 +130,44 @@ class _TaskHandler(BaseHTTPRequestHandler): def do_POST(self) -> None: # pylint:disable=invalid-name """Map POST requests to handlers for various paths.""" - url = urlparse(self.path) - toks_url = Path(url.path).parts + toks_url = Path(urlparse(self.path).path).parts page_name = Path(toks_url[1] if len(toks_url) > 1 else '') - body_length = int(self.headers['content-length']) - postvars = _ReqMap(self.rfile.read(body_length).decode()) - if PAGE_NAMES['player'] == page_name: - self._receive_player_command(postvars.as_dict) - elif PAGE_NAMES['playlist'] == page_name: - self._receive_playlist_command(postvars.single_key, url.query) - elif PAGE_NAMES['files'] == page_name: + postvars = _ReqMap( + self.rfile.read(int(self.headers['content-length'])).decode(), + _HEADER_APP_JSON == self.headers[_HEADER_CONTENT_TYPE]) + if PAGE_NAMES['files'] == page_name: self._receive_files_command(postvars) elif PAGE_NAMES['file'] == page_name: - self._receive_file_data(Hash.from_b64(toks_url[2]), - postvars.as_dict) + self._receive_file_data(Hash.from_b64(toks_url[2]), postvars) + elif PAGE_NAMES['file_tags'] == page_name: + self._receive_file_tags(Hash.from_b64(toks_url[2]), postvars) elif PAGE_NAMES['yt_queries'] == page_name: - self._receive_yt_query(QueryText(postvars.single_value('query'))) + self._receive_yt_query(QueryText(postvars.first_for('query'))) + elif PAGE_NAMES['player'] == page_name: + self._receive_player_command(postvars) - def _receive_player_command(self, postvars: _ReqDict) -> None: - if 'pause' in postvars.keys(): + def _receive_player_command(self, postvars: _ReqMap) -> None: + command = postvars.first_for('command') + if 'pause' == command: self.server.player.toggle_pause() - elif 'prev' in postvars.keys(): + elif 'prev' == command: self.server.player.prev() - elif 'next' in postvars.keys(): + elif 'next' == command: self.server.player.next() - elif 'stop' in postvars.keys(): + elif 'stop' == command: self.server.player.toggle_run() - self._redirect(Path(postvars['redir_target'][0])) - - def _receive_playlist_command(self, command: str, params_str: str) -> None: - if 'reload' == command: - self.server.player.clear() + elif 'reload' == command: + self.server.player.reload() elif command.startswith('jump_'): self.server.player.jump_to(int(command.split('_')[1])) - elif command.startswith('up'): + elif command.startswith('up_'): self.server.player.move_entry(int(command.split('_')[1])) elif command.startswith('down_'): self.server.player.move_entry(int(command.split('_')[1]), False) - sleep(0.5) # avoid redir happening before current_file update - self._redirect(Path('/') - .joinpath(f'{PAGE_NAMES["playlist"]}?{params_str}')) + for k in [k for k in ('filter_path', 'filter_tags') + if k in postvars.as_dict]: + setattr(self.server.player, k, postvars.as_dict[k]) + self._send_http('OK', code=200) def _receive_files_command(self, postvars: _ReqMap) -> None: for k in postvars.key_starting_with('play_'): @@ -165,18 +175,26 @@ class _TaskHandler(BaseHTTPRequestHandler): file = VideoFile.get_one( conn, Hash.from_b64(k.split('_', 1)[1])) self.server.player.inject_and_play(file) - self._redirect(Path(postvars.as_dict['redir_target'][0])) + self._redirect(Path(postvars.first_for('redir_target'))) - def _receive_file_data(self, digest: Hash, postvars: _ReqDict) -> None: - flag_names = [FlagName(f) for f in postvars.get('flags', [])] + def _receive_file_tags(self, digest: Hash, postvars: _ReqMap) -> None: with DbConn() as conn: file = VideoFile.get_one(conn, digest) - file.set_flags([FILE_FLAGS[name] for name in flag_names]) - file.tags = [Tag(t) for t in postvars.get('tags', [])] + file.tags = {Tag(t) for t in postvars.all_for('tags')} + file.save(conn) + conn.commit() + self._send_http('OK', code=200) + + def _receive_file_data(self, digest: Hash, postvars: _ReqMap) -> None: + with DbConn() as conn: + file = VideoFile.get_one(conn, digest) + file.set_flags({FILE_FLAGS[FlagName(name)] + for name in postvars.all_for('flags')}) + file.tags = {Tag(t) for t in postvars.all_for('tags')} file.save(conn) conn.commit() file.ensure_absence_if_deleted() - self._redirect(Path(postvars['redir_target'][0])) + self._redirect(Path(postvars.first_for('redir_target'))) def _receive_yt_query(self, query_txt: QueryText) -> None: with DbConn() as conn: @@ -209,29 +227,23 @@ class _TaskHandler(BaseHTTPRequestHandler): self._send_yt_query_page(QueryId(toks_url[2])) elif PAGE_NAMES['yt_queries'] == page_name: self._send_yt_queries_index_and_search() - elif PAGE_NAMES['last_update'] == page_name: - self._send_last_playlist_update() + elif PAGE_NAMES['events'] == page_name: + self._send_events(_ReqMap(url.query)) else: # e.g. for / - self._send_playlist(_ReqMap(url.query)) + self._send_playlist() except NotFoundException as e: - self._send_http(bytes(str(e), 'utf8'), code=404) + self._send_http(str(e), code=404) def _send_rendered_template(self, tmpl_name: Path, tmpl_ctx: _TemplateContext ) -> None: tmpl = self.server.jinja.get_template(str(tmpl_name)) + tmpl_ctx['selected'] = tmpl_ctx.get('selected', '') tmpl_ctx['redir_target'] = self.path tmpl_ctx['background_color'] = self.server.config.background_color tmpl_ctx['page_names'] = PAGE_NAMES - tmpl_ctx['player_state'] = { - 'running': self.server.player.is_running, - 'paused': self.server.player.is_paused, - 'title': (self.server.player.current_file_cached.rel_path - if self.server.player.current_file_cached - else 'none')} - html = tmpl.render(**tmpl_ctx) - self._send_http(bytes(html, 'utf8')) + self._send_http(tmpl.render(**tmpl_ctx)) def _send_thumbnail(self, filename: Path) -> None: ensure_expected_dirs([PATH_THUMBNAILS]) @@ -246,8 +258,7 @@ class _TaskHandler(BaseHTTPRequestHandler): raise NotFoundException from e raise e with path_thumbnail.open('rb') as f: - img = f.read() - self._send_http(img, [('Content-type', 'image/jpg')]) + self._send_http(f.read(), [(_HEADER_CONTENT_TYPE, 'image/jpg')]) def _send_or_download_video(self, video_id: YoutubeId) -> None: try: @@ -260,25 +271,24 @@ class _TaskHandler(BaseHTTPRequestHandler): .joinpath(video_id)) return with file_data.full_path.open('rb') as video_file: - video = video_file.read() - self._send_http(content=video) + self._send_http(content=video_file.read()) def _send_yt_query_page(self, query_id: QueryId) -> None: with DbConn() as conn: query = YoutubeQuery.get_one(conn, str(query_id)) results = YoutubeVideo.get_all_for_query(conn, query_id) - self._send_rendered_template( - _NAME_TEMPLATE_RESULTS, - {'query': query.text, 'videos': results}) + self._send_rendered_template(_NAME_TEMPLATE_RESULTS, + {'query': query.text, 'videos': results}) def _send_yt_queries_index_and_search(self) -> None: with DbConn() as conn: quota_count = QuotaLog.current(conn) queries_data = YoutubeQuery.get_all(conn) queries_data.sort(key=lambda q: q.retrieved_at, reverse=True) - self._send_rendered_template( - _NAME_TEMPLATE_QUERIES, - {'queries': queries_data, 'quota_count': quota_count}) + self._send_rendered_template(_NAME_TEMPLATE_QUERIES, + {'queries': queries_data, + 'quota_count': quota_count, + 'selected': 'yt_queries'}) def _send_yt_result(self, video_id: YoutubeId) -> None: conn = DbConn() @@ -312,52 +322,85 @@ class _TaskHandler(BaseHTTPRequestHandler): 'unused_tags': unused_tags}) def _send_files_index(self, params: _ReqMap) -> None: - filter_path = FilterStr(params.single_value('filter_path')) - filter_tags = FilterStr(params.single_value('filter_tags')) - show_absent = bool(params.single_value('show_absent')) + filter_path = FilterStr(params.first_for('filter_path')) + filter_tags = FilterStr(params.first_for('filter_tags')) + show_absent = bool(params.first_for('show_absent')) with DbConn() as conn: files = VideoFile.get_filtered( conn, filter_path, filter_tags, show_absent) files.sort(key=lambda t: t.rel_path) - self._send_rendered_template( - _NAME_TEMPLATE_FILES, - {'files': files, - 'filter_path': filter_path, - 'filter_tags': filter_tags, - 'show_absent': show_absent}) + self._send_rendered_template(_NAME_TEMPLATE_FILES, + {'files': files, + 'selected': 'files', + 'filter_path': filter_path, + 'filter_tags': filter_tags, + 'show_absent': show_absent}) def _send_missing_json(self) -> None: with DbConn() as conn: missing = [str(f.rel_path) for f in VideoFile.get_all(conn) if f.missing] - self._send_http(bytes(json_dumps(missing), 'utf8'), - headers=[('Content-type', 'application/json')]) - - def _send_last_playlist_update(self) -> None: - payload: dict[str, PlayerUpdateId] = { - 'last_update': self.server.player.last_update} - self._send_http(bytes(json_dumps(payload), 'utf8'), - headers=[('Content-type', 'application/json')]) - - def _send_playlist(self, params: _ReqMap) -> None: - filter_path = FilterStr(params.single_value('filter_path')) - filter_tags = FilterStr(params.single_value('filter_tags')) - if self.server.player.empty or filter_path or filter_tags: - self.server.player.load_files_and_start(filter_path, filter_tags) - current_file, unused_tags = None, set() - with DbConn() as conn: - if self.server.player.current_file_cached: - current_file = VideoFile.get_one( - conn, self.server.player.current_file_cached.digest) - unused_tags = current_file.unused_tags(conn) + self._send_http(json_dumps(missing), + headers=[(_HEADER_CONTENT_TYPE, _HEADER_APP_JSON)]) + + def _send_playlist(self) -> None: + if self.server.player.empty: + self.server.player.load_files_and_start() self._send_rendered_template( _NAME_TEMPLATE_PLAYLIST, - {'last_update': self.server.player.last_update, - 'running': self.server.player.is_running, - 'paused': self.server.player.is_paused, - 'current_file': current_file, - 'filter_path': filter_path, - 'filter_tags': filter_tags, - 'unused_tags': unused_tags, - 'files_w_idx': list(enumerate(self.server.player.files)) - }) + {'selected': 'playlist', + 'filter_path': self.server.player.filter_path, + 'filter_tags': self.server.player.filter_tags}) + + def _send_events(self, params: _ReqMap) -> None: + self._send_http(headers=[(_HEADER_CONTENT_TYPE, 'text/event-stream'), + ('Cache-Control', 'no-cache'), + ('Connection', 'keep-alive')]) + playing: Optional[VideoFile] = None + last_sent = '' + while True: + if not self.server.player.current_digest: + playing = None + elif ((not playing) + or (playing.digest != self.server.player.current_digest)): + with DbConn() as conn: + playing = VideoFile.get_one( + conn, self.server.player.current_digest) + last_playing_update = ( + VideoFile.last_updates_since_start.get(playing.digest, '') + if playing + else '') + if playing and last_playing_update > playing.last_update: + with DbConn() as conn: + playing = VideoFile.get_one(conn, playing.digest) + last_update = max(self.server.player.last_update, + last_playing_update) + if last_sent < last_update: + last_sent = last_update + data = { + 'last_update': self.server.player.last_update, + 'running': self.server.player.is_running, + 'paused': self.server.player.is_paused, + 'title': str(playing.rel_path) if playing else 'none'} + if 'playlist' in params.as_dict: + data['playlist_files'] = [ + {'rel_path': str(f.rel_path), 'digest': f.digest.b64} + for f in self.server.player.files] + data['link_prefix'] = str(PAGE_NAMES['file']) + if playing: + with DbConn() as conn: + unused_tags = playing.unused_tags(conn) + data['current_file'] = { + 'digest': playing.digest.b64, + 'rel_path': str(playing.rel_path), + 'yt_id': playing.yt_id, + 'tags': list(playing.tags), + 'unused_tags': list(unused_tags)} + data['yt_link_prefix'] = str(PAGE_NAMES['yt_result']) + try: + self.wfile.write( + f'data: {json_dumps(data)}\n\n'.encode()) + self.wfile.flush() + except BrokenPipeError: + return + sleep(0.25) diff --git a/src/ytplom/misc.py b/src/ytplom/misc.py index 4bd492d..815821d 100644 --- a/src/ytplom/misc.py +++ b/src/ytplom/misc.py @@ -4,7 +4,7 @@ from typing import NewType, Optional, Self, TypeAlias from os import chdir, environ from random import shuffle -from time import time, sleep +from time import sleep from datetime import datetime, timedelta from json import loads as json_loads from urllib.request import urlretrieve @@ -42,7 +42,6 @@ FlagName = NewType('FlagName', str) FlagsInt = NewType('FlagsInt', int) Tag = NewType('Tag', str) AmountDownloads = NewType('AmountDownloads', int) -PlayerUpdateId = NewType('PlayerUpdateId', str) UrlStr = NewType('UrlStr', str) FilesWithIndex: TypeAlias = list[tuple[int, 'VideoFile']] @@ -255,7 +254,8 @@ class VideoFile(DbData): last_update: DatetimeStr rel_path: Path digest: Hash - tags: list[Tag] + tags: set[Tag] + last_updates_since_start: dict[Hash, DatetimeStr] = {} def __init__(self, digest: Optional[Hash], @@ -268,7 +268,8 @@ class VideoFile(DbData): self.rel_path = rel_path self.digest = digest if digest else Hash.from_file(self.full_path) self.flags = flags - self.tags = [Tag(t) for t in tags_str.split(',')] if tags_str else [] + self.tags = set([Tag(t) for t in tags_str.split(',')] + if tags_str else []) self.yt_id = yt_id if last_update is None: self._renew_last_update() @@ -282,7 +283,7 @@ class VideoFile(DbData): def _renew_last_update(self): self.last_update = DatetimeStr(datetime.now().strftime(TIMESTAMP_FMT)) - self._hash_on_last_update = hash(self) + self.last_updates_since_start[self.digest] = self.last_update def save(self, conn: BaseDbConn) -> Cursor: """Extend super().save by new .last_update if sufficient changes.""" @@ -348,7 +349,7 @@ class VideoFile(DbData): """Return if file absent despite absence of 'delete' flag.""" return not (self.is_flag_set(FlagName('delete')) or self.present) - def set_flags(self, flags: list[FlagsInt]) -> None: + def set_flags(self, flags: set[FlagsInt]) -> None: """Set .flags to bitwise OR of FlagsInt in flags.""" self.flags = FlagsInt(0) for flag in flags: @@ -408,10 +409,12 @@ class Player: _idx: int def __init__(self) -> None: - self.last_update = PlayerUpdateId('') + self.last_update = DatetimeStr('') self._mpv: Optional[MPV] = None self._kill_queue: Queue = Queue() self._monitoring_kill = False + self.filter_path = FilterStr('') + self.filter_tags = FilterStr('') self.load_files_and_start() def _monitor_kill(self) -> None: @@ -434,15 +437,13 @@ class Player: Thread(target=kill_on_queue_get, daemon=True).start() - def load_files_and_start(self, - filter_path: FilterStr = FilterStr(''), - filter_tags: FilterStr = FilterStr('') - ) -> None: + def load_files_and_start(self) -> None: """Collect filtered files into playlist, start player.""" with DbConn() as conn: known_files = { - f.full_path: f for f - in VideoFile.get_filtered(conn, filter_path, filter_tags)} + f.full_path: f for f + in VideoFile.get_filtered( + conn, self.filter_path, self.filter_tags)} self.files = [known_files[p] for p in PATH_DOWNLOADS.iterdir() if p in known_files and p.is_file() @@ -452,7 +453,7 @@ class Player: self._start_mpv() def _signal_update(self) -> None: - self.last_update = PlayerUpdateId(f'{self._idx}:{time()}') + self.last_update = DatetimeStr(datetime.now().strftime(TIMESTAMP_FMT)) def _start_mpv(self) -> None: self._mpv = MPV(input_default_bindings=True, @@ -486,6 +487,7 @@ class Player: self._signal_update() def _play_at_index(self): + self._signal_update() if self._mpv: self._mpv.command('playlist-play-index', self._idx) @@ -495,11 +497,11 @@ class Player: return 0 == len(self.files) @property - def current_file_cached(self) -> Optional[VideoFile]: - """Return cached version of the currently playing file.""" + def current_digest(self) -> Optional[Hash]: + """Return hash digest ID of currently playing file.""" if not self.files: return None - return self.files[self._idx] + return self.files[self._idx].digest @property def is_running(self) -> bool: @@ -560,11 +562,13 @@ class Player: self._mpv.command('playlist-remove', i1) self._mpv.command('loadfile', path, 'insert-at', i0) self.files[i0], self.files[i1] = self.files[i1], self.files[i0] + self._signal_update() - def clear(self) -> None: - """Close MPV, empty filenames.""" + def reload(self) -> None: + """Close MPV, empty filenames, restart.""" self._kill_mpv() self.files.clear() + self.load_files_and_start() def inject_and_play(self, file: VideoFile) -> None: """Inject file after current title, then jump to it."""