changeset 2425:f6e40619cf27

reformat
author drewp@bigasterisk.com
date Thu, 23 May 2024 16:42:17 -0700
parents 4b8f8fabeb2f
children 90792e984249
files src/light9/ascoltami/player.py src/light9/ascoltami/webapp.py
diffstat 2 files changed, 14 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/src/light9/ascoltami/player.py	Thu May 23 16:40:28 2024 -0700
+++ b/src/light9/ascoltami/player.py	Thu May 23 16:42:17 2024 -0700
@@ -1,10 +1,15 @@
-#!/usr/bin/python
 """
 alternate to the mpd music player, for ascoltami
 """
 
-import time, logging, traceback
-from gi.repository import Gst # type: ignore
+import logging
+import time
+import traceback
+from dataclasses import dataclass
+from pathlib import Path
+
+from gi.repository import Gst
+from rdflib import URIRef
 from twisted.internet import task
 from light9.metrics import metrics
 log = logging.getLogger()
@@ -40,8 +45,7 @@
             self.pollForMessages()
 
             t = self.currentTime()
-            log.debug("watch %s < %s < %s", self._lastWatchTime,
-                      self._autoStopTime, t)
+            log.debug("watch %s < %s < %s", self._lastWatchTime, self._autoStopTime, t)
             if self._lastWatchTime < self._autoStopTime < t:
                 log.info("autostop")
                 self.pause()
@@ -94,10 +98,7 @@
                     self.setupAutostop()
 
     def seek(self, t):
-        isSeekable = self.playbin.seek_simple(
-            Gst.Format.TIME,
-            Gst.SeekFlags.FLUSH | Gst.SeekFlags.ACCURATE | Gst.SeekFlags.SKIP,
-            t * Gst.SECOND)
+        isSeekable = self.playbin.seek_simple(Gst.Format.TIME, Gst.SeekFlags.FLUSH | Gst.SeekFlags.ACCURATE | Gst.SeekFlags.SKIP, t * Gst.SECOND)
         if not isSeekable:
             raise ValueError('seek_simple failed')
         self._playStartTime = time.time()
@@ -154,14 +155,7 @@
         """json-friendly object describing the interesting states of
         the player nodes"""
         success, state, pending = self.playbin.get_state(timeout=0)
-        return {
-            "current": {
-                "name": state.value_nick
-            },
-            "pending": {
-                "name": state.value_nick
-            }
-        }
+        return {"current": {"name": state.value_nick}, "pending": {"name": state.value_nick}}
 
     def pause(self):
         self.pipeline.set_state(Gst.State.PAUSED)
@@ -174,8 +168,7 @@
             return False
         pos = self.currentTime()
         autoStop = self.duration() - self.autoStopOffset
-        return not self.isPlaying() and abs(
-            pos - autoStop) < 1  # i've seen .4 difference here
+        return not self.isPlaying() and abs(pos - autoStop) < 1  # i've seen .4 difference here
 
     def resume(self):
         self.pipeline.set_state(Gst.State.PLAYING)
--- a/src/light9/ascoltami/webapp.py	Thu May 23 16:40:28 2024 -0700
+++ b/src/light9/ascoltami/webapp.py	Thu May 23 16:42:17 2024 -0700
@@ -7,11 +7,11 @@
 from typing import cast
 
 from rdflib import RDFS, Graph, URIRef
-from light9.ascoltami.player import Player
 from sse_starlette.sse import EventSourceResponse
 from starlette.requests import Request
 from starlette.responses import JSONResponse, PlainTextResponse
 
+from light9.ascoltami.player import Player
 from light9.namespaces import L9
 from light9.showconfig import getSongsFromShow, showUri, songOnDisk
 
@@ -96,6 +96,7 @@
 async def timeStream(request: Request):
     graph = cast(Graph, request.app.state.graph)
     player = cast(Player, request.app.state.player)
+
     async def event_generator():
         last_sent = None
         last_sent_time = 0.0