[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,14 +7,12 @@ assignees: ''
 
 ---
 
-Before opening an issue make sure that there are no duplicates and that you are
+Before opening an issue make sure that there are no duplicates and that you are on the latest version.
-on the latest version.
 **Describe the bug**
 A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
-
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -27,14 +25,13 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **iSponsorBlockTV server (please complete the following information):**
-
+ - OS: [e.g. Docker on linux Arm64, windows]
-- OS: [e.g. Docker on linux Arm64, windows]
+ - Python version [e.g. 3.7] (no need to fill if running on docker
-- Python version [e.g. 3.7] (no need to fill if running on docker
 
 **Apple TV (please complete the following information):**
+ - Device: [e.g. Apple TV 4]
+ - OS: [e.g. tvOS 15.4]
 
-- Device: [e.g. Apple TV 4]
-- OS: [e.g. tvOS 15.4]
 
 **Additional context**
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -8,15 +8,13 @@ assignees: ''
 ---
 
 **Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-frustrated when [...]
 
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
 
 **Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've
+A clear and concise description of any alternative solutions or features you've considered.
-considered.
 
 **Additional context**
 Add any other context or screenshots about the feature request here.

.github/dependabot.yml

@@ -1,19 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
-
-version: 2
-updates:
-  - package-ecosystem: "pip"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/workflows/build_docker_images.yml

@@ -21,8 +21,6 @@ permissions:
 
 jobs:
   build:
-    env:
-        DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
     runs-on: ubuntu-latest
     steps:
       # Get the repository's code
@@ -34,9 +32,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: |
+          images: ghcr.io/dmunozv04/isponsorblocktv, dmunozv04/isponsorblocktv
-            ghcr.io/${{ github.repository }}
-            ${{ env.DOCKERHUB_USERNAME && 'dmunozv04/isponsorblocktv' || '' }}
           tags: |
             type=raw,value=develop,priority=900,enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
             type=ref,enable=true,priority=600,prefix=pr-,suffix=,event=pr
@@ -68,12 +64,13 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
         with:
           context: .
           platforms: linux/amd64, linux/arm64, linux/arm/v7
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
+          cache-from: type=registry,ref=ghcr.io/dmunozv04/isponsorblocktv:buildcache
-          cache-to: type=gha,mode=max
+          # Only cache if it's not a pull request
+          cache-to: ${{ github.event_name != 'pull_request' && 'type=registry,ref=ghcr.io/dmunozv04/isponsorblocktv:buildcache,mode=max' || '' }}

.github/workflows/release.yml

@@ -57,7 +57,7 @@ jobs:
 
 
   build-binaries:
-    name: Build binaries for ${{ matrix.job.release_suffix }} (${{ matrix.job.os }})
+    name: Build binaries for ${{ matrix.job.target }} (${{ matrix.job.os }})
     needs:
       - build-sdist-and-wheel
     runs-on: ${{ matrix.job.os }}
@@ -70,26 +70,20 @@ jobs:
           os: ubuntu-latest
           cross: true
           release_suffix: x86_64-linux
-        - target: x86_64-unknown-linux-gnu
-          os: ubuntu-latest
-          cross: true
-          cpu_variant: v1
-          release_suffix: x86_64-linux-v1
         - target: aarch64-unknown-linux-gnu
           os: ubuntu-latest
           cross: true
           release_suffix: aarch64-linux
         # Windows
         - target: x86_64-pc-windows-msvc
-          os: windows-latest
+          os: windows-2022
           release_suffix: x86_64-windows
         # macOS
         - target: aarch64-apple-darwin
-          os: macos-latest
+          os: macos-14
           release_suffix: aarch64-osx
         - target: x86_64-apple-darwin
-          os: macos-latest
+          os: macos-12
-          cross: true
           release_suffix: x86_64-osx
 
     env:
@@ -98,9 +92,8 @@ jobs:
       HATCH_BUILD_LOCATION: dist
       CARGO: cargo
       CARGO_BUILD_TARGET: ${{ matrix.job.target }}
-      PYAPP_DISTRIBUTION_VARIANT_CPU: ${{ matrix.job.cpu_variant }}
       PYAPP_REPO: pyapp # Use local copy of pyapp (needed for cross-compiling)
-      PYAPP_VERSION: v0.24.0
+      PYAPP_VERSION: v0.23.0
 
     steps:
     - name: Checkout
@@ -186,8 +179,6 @@ jobs:
 
 
   publish-to-release:
-    permissions:
-      contents: write
     needs:
       - build-sdist-and-wheel
       - build-binaries

.markdownlintignore

@@ -1 +0,0 @@
-LICENSE.md

.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 # Inspired by textual pre-commit config
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v4.3.0
     hooks:
       - id: check-ast  # simply checks whether the files parse as valid python
       - id: check-builtin-literals  # requires literal syntax when initializing empty or zero python builtin types
@@ -18,14 +18,22 @@ repos:
       - id: end-of-file-fixer  # ensures that a file is either empty, or ends with one newline
       - id: mixed-line-ending  # replaces or checks mixed line ending
       - id: trailing-whitespace  # checks for trailing whitespace
-  - repo: https://github.com/astral-sh/ruff-pre-commit
+  - repo: https://github.com/pycqa/isort
-    rev: v0.9.6
+    rev: 5.12.0
     hooks:
-      - id: ruff
+      - id: isort
-        args: [ --fix, --exit-non-zero-on-fix ]
+        name: isort (python)
-      - id: ruff-format
+        language_version: '3.11'
-  - repo: https://github.com/igorshubovych/markdownlint-cli
+        args: ["--profile", "black", "--filter-files"]
-    rev: v0.44.0
+  - repo: https://github.com/psf/black
+    rev: 23.1.0
     hooks:
-      - id: markdownlint
+      - id: black
-        args: ["--fix"]
+        language_version: '3.11'
+        args: ["--preview"]
+  - repo: https://github.com/hadialqattan/pycln  # removes unused imports
+    rev: v2.3.0
+    hooks:
+      - id: pycln
+        language_version: "3.11"
+        args: [--all]

Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM python:3.13-alpine3.21 AS base
+FROM python:3.11-alpine3.19 AS base
 
 FROM base AS compiler
 
@@ -19,9 +19,9 @@ RUN apk add --no-cache gcc musl-dev && \
     pip install -r requirements.txt && \
     pip uninstall -y pip wheel && \
     apk del gcc musl-dev && \
-    python3 -m compileall -b -f /usr/local/lib/python3.13/site-packages && \
+    python3 -m compileall -b -f /usr/local/lib/python3.11/site-packages && \
-    find /usr/local/lib/python3.13/site-packages -name "*.py" -type f -delete && \
+    find /usr/local/lib/python3.11/site-packages -name "*.py" -type f -delete && \
-    find /usr/local/lib/python3.13/ -name "__pycache__" -type d -exec rm -rf {} +
+    find /usr/local/lib/python3.11/ -name "__pycache__" -type d -exec rm -rf {} +
 
 FROM base
 

LICENSE.md

@@ -657,7 +657,7 @@ notice like this when it starts in an interactive mode:
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
-The hypothetical commands `show w' and`show c' should show the appropriate
+The hypothetical commands `show w' and `show c' should show the appropriate
 parts of the General Public License.  Of course, your program's commands
 might be different; for a GUI interface, you would use an "about box".
 

README.md

@@ -1,21 +1,14 @@
 # iSponsorBlockTV
-
+Skip sponsor segments in YouTube videos playing on a YouTube TV device (see below for compatibility details).
-[![ghcr.io Pulls](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fipitio.github.io%2Fbackage%2Fdmunozv04%2FiSponsorBlockTV%2Fisponsorblocktv.json&query=downloads&logo=github&label=ghcr.io%20pulls&style=flat)](https://ghcr.io/dmunozv04/isponsorblocktv)
-[![Docker Pulls](https://img.shields.io/docker/pulls/dmunozv04/isponsorblocktv?logo=docker&style=flat)](https://hub.docker.com/r/dmunozv04/isponsorblocktv/)
-[![GitHub Release](https://img.shields.io/github/v/release/dmunozv04/isponsorblocktv?logo=GitHub&style=flat)](https://github.com/dmunozv04/iSponsorBlockTV/releases/latest)
-[![GitHub Repo stars](https://img.shields.io/github/stars/dmunozv04/isponsorblocktv?style=flat)](https://github.com/dmunozv04/isponsorblocktv)
-
-Skip sponsor segments in YouTube videos playing on a YouTube TV device (see
-below for compatibility details).
 
 This project is written in asynchronous python and should be pretty quick.
 
 ## Installation
-
 Check the [wiki](https://github.com/dmunozv04/iSponsorBlockTV/wiki/Installation)
 
-## Compatibility
+Warning: docker armv7 builds have been deprecated. Amd64 and arm64 builds are still available.
 
+## Compatibility
 Legend: ✅ = Working, ❌ = Not working, ❔ = Not tested
 
 Open an issue/pull request if you have tested a device that isn't listed here.
@@ -36,33 +29,24 @@ Open an issue/pull request if you have tested a device that isn't listed here.
 | Playstation 4/5    |   ✅    |
 
 ## Usage
-
 Run iSponsorBlockTV on a computer that has network access.
-Auto discovery will require the computer to be on the same network as the device
+Auto discovery will require the computer to be on the same network as the device during setup.
-during setup.
+The device can also be manually added to iSponsorBlockTV with a YouTube TV code. This code can be found in the settings page of your YouTube application.
-The device can also be manually added to iSponsorBlockTV with a YouTube TV code.
-This code can be found in the settings page of your YouTube application.
 
-It connects to the device, watches its activity and skips any sponsor segment
+It connects to the device, watches its activity and skips any sponsor segment using the [SponsorBlock](https://sponsor.ajay.app/) API.
-using the [SponsorBlock](https://sponsor.ajay.app/) API.
 It can also skip/mute YouTube ads.
 
 ## Libraries used
-
+- [pyytlounge](https://github.com/FabioGNR/pyytlounge) Used to interact with the device
-- [pyytlounge](https://github.com/FabioGNR/pyytlounge) Used to interact with the
-  device
 - asyncio and [aiohttp](https://github.com/aio-libs/aiohttp)
 - [async-cache](https://github.com/iamsinghrajat/async-cache)
-- [Textual](https://github.com/textualize/textual/) Used for the amazing new
+- [Textual](https://github.com/textualize/textual/) Used for the amazing new graphical configurator
-  graphical configurator
 - [ssdp](https://github.com/codingjoe/ssdp) Used for auto discovery
 
 ## Projects using this project
-
 - [Home Assistant Addon](https://github.com/bertybuttface/addons/tree/main/isponsorblocktv)
 
 ## Contributing
-
 1. Fork it (<https://github.com/dmunozv04/iSponsorBlockTV/fork>)
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
@@ -70,13 +54,8 @@ It can also skip/mute YouTube ads.
 5. Create a new Pull Request
 
 ## Contributors
-
 - [dmunozv04](https://github.com/dmunozv04) - creator and maintainer
-- [HaltCatchFire](https://github.com/HaltCatchFire) - updated dependencies and
+- [HaltCatchFire](https://github.com/HaltCatchFire) - updated dependencies and improved skip logic
-  improved skip logic
+- [Oxixes](https://github.com/oxixes) - added support for channel whitelist and minor improvements
-- [Oxixes](https://github.com/oxixes) - added support for channel whitelist and
-  minor improvements
-
 ## License
-
 [![GNU GPLv3](https://www.gnu.org/graphics/gplv3-127x51.png)](https://www.gnu.org/licenses/gpl-3.0.en.html)

config.json.template

@@ -13,7 +13,6 @@
     "mute_ads": true,
     "skip_ads": true,
     "auto_play": true,
-    "join_name": "iSponsorBlockTV",
     "apikey": "",
     "channel_whitelist": [
         {"id": "",

pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "iSponsorBlockTV"
-version = "2.3.1"
+version = "2.1.0"
 authors = [
     {"name" = "dmunozv04"}
 ]
 description = "SponsorBlock client for all YouTube TV clients"
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.7"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",

requirements.txt

@@ -1,10 +1,11 @@
-aiohttp==3.11.12
+aiohttp==3.9.5
 appdirs==1.4.4
+argparse==1.4.0
 async-cache==1.1.1
-pyytlounge==2.1.2
+pyytlounge==2.0.0
-rich==13.9.4
+rich==13.7.1
 ssdp==1.3.0
-textual==1.0.0
+textual==0.58.0
-textual-slider==0.2.0
+textual-slider==0.1.1
-xmltodict==0.14.2
+xmltodict==0.13.0
-rich_click==1.8.5
+rich_click==1.8.3

src/iSponsorBlockTV/config_setup.py

@@ -45,14 +45,9 @@ def get_yn_input(prompt):
         print("Invalid input. Please enter 'y' or 'n'.")
 
 
-async def create_web_session():
+async def pair_device():
-    return aiohttp.ClientSession()
-
-
-async def pair_device(web_session: aiohttp.ClientSession):
     try:
-        lounge_controller = ytlounge.YtLoungeApi()
+        lounge_controller = ytlounge.YtLoungeApi("iSponsorBlockTV")
-        await lounge_controller.change_web_session(web_session)
         pairing_code = input(PAIRING_CODE_PROMPT)
         pairing_code = int(
             pairing_code.replace("-", "").replace(" ", "")
@@ -76,7 +71,7 @@ async def pair_device(web_session: aiohttp.ClientSession):
 def main(config, debug: bool) -> None:
     print("Welcome to the iSponsorBlockTV cli setup wizard")
     loop = asyncio.get_event_loop_policy().get_event_loop()
-    web_session = loop.run_until_complete(create_web_session())
+    web_session = aiohttp.ClientSession()
     if debug:
         loop.set_debug(True)
     asyncio.set_event_loop(loop)
@@ -93,7 +88,9 @@ def main(config, debug: bool) -> None:
     devices = config.devices
     choice = get_yn_input(ADD_MORE_DEVICES_PROMPT.format(num_devices=len(devices)))
     while choice == "y":
-        device = loop.run_until_complete(pair_device(web_session))
+        task = loop.create_task(pair_device())
+        loop.run_until_complete(task)
+        device = task.result()
         if device:
             devices.append(device)
         choice = get_yn_input(ADD_MORE_DEVICES_PROMPT.format(num_devices=len(devices)))

src/iSponsorBlockTV/dial_client.py

@@ -1,5 +1,4 @@
 """Send out an M-SEARCH request and listening for responses."""
-
 import asyncio
 import socket
 

src/iSponsorBlockTV/helpers.py

@@ -9,6 +9,7 @@ from appdirs import user_data_dir
 
 from . import config_setup, main, setup_wizard
 from .constants import config_file_blacklist_keys
+from .service.service_helpers import service
 
 
 class Device:
@@ -42,7 +43,6 @@ class Config:
         self.mute_ads = False
         self.skip_ads = False
         self.auto_play = True
-        self.join_name = "iSponsorBlockTV"
         self.__load()
 
     def validate(self):
@@ -214,6 +214,8 @@ pyapp_group.add_command(
 if os.getenv("PYAPP"):
     cli.add_command(pyapp_group)
 
+cli.add_command(service)
+
 
 def app_start():
     cli(obj={})

src/iSponsorBlockTV/macos_install.py

@@ -1,57 +0,0 @@
-import os
-import plistlib
-
-from . import config_setup
-
-"""Not updated to V2 yet, should still work. Here be dragons"""
-default_plist = {
-    "Label": "com.dmunozv04iSponsorBlockTV",
-    "RunAtLoad": True,
-    "StartInterval": 20,
-    "EnvironmentVariables": {"PYTHONUNBUFFERED": "YES"},
-    "StandardErrorPath": "",  # Fill later
-    "StandardOutPath": "",
-    "ProgramArguments": "",
-    "WorkingDirectory": "",
-}
-
-
-def create_plist(path):
-    plist = default_plist
-    plist["ProgramArguments"] = [path + "/iSponsorBlockTV-macos"]
-    plist["StandardErrorPath"] = path + "/iSponsorBlockTV.error.log"
-    plist["StandardOutPath"] = path + "/iSponsorBlockTV.out.log"
-    plist["WorkingDirectory"] = path
-    launchd_path = os.path.expanduser("~/Library/LaunchAgents/")
-    path_to_save = launchd_path + "com.dmunozv04.iSponsorBlockTV.plist"
-
-    with open(path_to_save, "wb") as fp:
-        plistlib.dump(plist, fp)
-
-
-def run_setup(file):
-    config = {}
-    config_setup.main(config, file, debug=False)
-
-
-def main():
-    correct_path = os.path.expanduser("~/iSponsorBlockTV")
-    if os.path.isfile(correct_path + "/iSponsorBlockTV-macos"):
-        print("Program is on the right path")
-        print("The launch daemon will now be installed")
-        create_plist(correct_path)
-        run_setup(correct_path + "/config.json")
-        print(
-            "Launch daemon installed. Please restart the computer to enable it or"
-            " use:\n launchctl load"
-            " ~/Library/LaunchAgents/com.dmunozv04.iSponsorBlockTV.plist"
-        )
-    else:
-        if not os.path.exists(correct_path):
-            os.makedirs(correct_path)
-        print(
-            "Please move the program to the correct path: "
-            + correct_path
-            + "opening now on finder..."
-        )
-        os.system("open -R " + correct_path)

src/iSponsorBlockTV/main.py

@@ -27,9 +27,9 @@ class DeviceListener:
             logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
         )
         self.logger.addHandler(sh)
-        self.logger.info("Starting device")
+        self.logger.info(f"Starting device")
         self.lounge_controller = ytlounge.YtLoungeApi(
-            device.screen_id, config, api_helper, self.logger
+            device.screen_id, config, api_helper, self.logger, self.web_session
         )
 
     # Ensures that we have a valid auth token
@@ -38,14 +38,14 @@ class DeviceListener:
             await asyncio.sleep(60 * 60 * 24)  # Refresh every 24 hours
             try:
                 await self.lounge_controller.refresh_auth()
-            except BaseException:
+            except:
                 # traceback.print_exc()
                 pass
 
     async def is_available(self):
         try:
             return await self.lounge_controller.is_available()
-        except BaseException:
+        except:
             # traceback.print_exc()
             return False
 
@@ -57,20 +57,20 @@ class DeviceListener:
                 try:
                     self.logger.debug("Refreshing auth")
                     await lounge_controller.refresh_auth()
-                except BaseException:
+                except:
                     await asyncio.sleep(10)
             while not (await self.is_available()) and not self.cancelled:
                 await asyncio.sleep(10)
             try:
                 await lounge_controller.connect()
-            except BaseException:
+            except:
                 pass
             while not lounge_controller.connected() and not self.cancelled:
                 # Doesn't connect to the device if it's a kids profile (it's broken)
                 await asyncio.sleep(10)
                 try:
                     await lounge_controller.connect()
-                except BaseException:
+                except:
                     pass
             self.logger.info(
                 "Connected to device %s (%s)", lounge_controller.screen_name, self.name
@@ -79,14 +79,14 @@ class DeviceListener:
                 self.logger.info("Subscribing to lounge")
                 sub = await lounge_controller.subscribe_monitored(self)
                 await sub
-            except BaseException:
+            except:
                 pass
 
     # Method called on playback state change
     async def __call__(self, state):
         try:
             self.task.cancel()
-        except BaseException:
+        except:
             pass
         time_start = time.time()
         self.task = asyncio.create_task(self.process_playstatus(state, time_start))
@@ -131,71 +131,40 @@ class DeviceListener:
         await asyncio.create_task(self.api_helper.mark_viewed_segments(uuids))
         await asyncio.create_task(self.lounge_controller.seek_to(position))
 
+    # Stops the connection to the device
     async def cancel(self):
         self.cancelled = True
-        await self.lounge_controller.disconnect()
+        try:
-        if self.task:
             self.task.cancel()
-        if self.lounge_controller.subscribe_task_watchdog:
+        except Exception:
-            self.lounge_controller.subscribe_task_watchdog.cancel()
+            pass
-        if self.lounge_controller.subscribe_task:
-            self.lounge_controller.subscribe_task.cancel()
-        await asyncio.gather(
-            self.task,
-            self.lounge_controller.subscribe_task_watchdog,
-            self.lounge_controller.subscribe_task,
-            return_exceptions=True,
-        )
-
-    async def initialize_web_session(self):
-        await self.lounge_controller.change_web_session(self.web_session)
 
 
-async def finish(devices, web_session, tcp_connector):
+async def finish(devices):
-    await asyncio.gather(
+    for i in devices:
-        *(device.cancel() for device in devices), return_exceptions=True
+        await i.cancel()
-    )
-    await web_session.close()
-    await tcp_connector.close()
 
 
-def handle_signal(signum, frame):
+def main(config, debug):
-    raise KeyboardInterrupt()
-
-
-async def main_async(config, debug):
     loop = asyncio.get_event_loop_policy().get_event_loop()
     tasks = []  # Save the tasks so the interpreter doesn't garbage collect them
     devices = []  # Save the devices to close them later
     if debug:
         loop.set_debug(True)
+    asyncio.set_event_loop(loop)
     tcp_connector = aiohttp.TCPConnector(ttl_dns_cache=300)
-    web_session = aiohttp.ClientSession(connector=tcp_connector)
+    web_session = aiohttp.ClientSession(loop=loop, connector=tcp_connector)
     api_helper = api_helpers.ApiHelper(config, web_session)
     for i in config.devices:
         device = DeviceListener(api_helper, config, i, debug, web_session)
         devices.append(device)
-        await device.initialize_web_session()
         tasks.append(loop.create_task(device.loop()))
         tasks.append(loop.create_task(device.refresh_auth_loop()))
-    signal(SIGTERM, handle_signal)
+    signal(SIGINT, lambda s, f: loop.stop())
-    signal(SIGINT, handle_signal)
+    signal(SIGTERM, lambda s, f: loop.stop())
-    try:
+    loop.run_forever()
-        await asyncio.gather(*tasks)
+    print("Cancelling tasks and exiting...")
-    except KeyboardInterrupt:
+    loop.run_until_complete(finish(devices))
-        print("Cancelling tasks and exiting...")
+    loop.run_until_complete(web_session.close())
-        await finish(devices, web_session, tcp_connector)
+    loop.run_until_complete(tcp_connector.close())
-        for task in tasks:
-            task.cancel()
-        await asyncio.gather(*tasks, return_exceptions=True)
-    finally:
-        await web_session.close()
-        await tcp_connector.close()
-        loop.close()
-        print("Exited")
-
-
-def main(config, debug):
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(main_async(config, debug))
     loop.close()

src/iSponsorBlockTV/service/service_helpers.py

@@ -0,0 +1,76 @@
+import os
+import sys
+
+import rich_click as click
+
+from .service_managers import select_service_manager
+
+
+@click.group()
+@click.pass_context
+def service(ctx):
+    """Manage the program as a service (executable only)"""
+    ctx.ensure_object(dict)
+    if os.getenv("PYAPP") is None:
+        print(
+            "Service commands are only available in the executable version of the"
+            " program"
+        )
+        sys.exit(1)
+    ctx.obj["service_manager"] = select_service_manager()(os.getenv("PYAPP"))
+
+
+@service.command()
+@click.pass_context
+def start(ctx):
+    """Start the service"""
+    ctx.obj["service_manager"].start()
+
+
+@service.command()
+@click.pass_context
+def stop(ctx):
+    """Stop the service"""
+    ctx.obj["service_manager"].stop()
+
+
+@service.command()
+@click.pass_context
+def restart(ctx):
+    """Restart the service"""
+    ctx.obj["service_manager"].restart()
+
+
+@service.command()
+@click.pass_context
+def status(ctx):
+    """Get the status of the service"""
+    ctx.obj["service_manager"].status()
+
+
+@service.command()
+@click.pass_context
+def install(ctx):
+    """Install the service"""
+    ctx.obj["service_manager"].install()
+
+
+@service.command()
+@click.pass_context
+def uninstall(ctx):
+    """Uninstall the service"""
+    ctx.obj["service_manager"].uninstall()
+
+
+@service.command()
+@click.pass_context
+def enable(ctx):
+    """Enable the service"""
+    ctx.obj["service_manager"].enable()
+
+
+@service.command()
+@click.pass_context
+def disable(ctx):
+    """Disable the service"""
+    ctx.obj["service_manager"].disable()

src/iSponsorBlockTV/service/service_managers.py

@@ -0,0 +1,107 @@
+import os
+import plistlib
+import subprocess
+from platform import system
+
+from appdirs import user_log_dir
+
+
+def select_service_manager() -> "ServiceManager":
+    platform = system()
+    if platform == "Darwin":
+        return Launchd
+    elif platform == "Linux":
+        return Systemd
+    else:
+        raise NotImplementedError("Unsupported platform")
+
+
+class ServiceManager:
+    def __init__(self, executable_path, *args, **kwargs):
+        self.executable_path = executable_path
+
+    def start(self):
+        pass
+
+    def stop(self):
+        pass
+
+    def restart(self):
+        pass
+
+    def status(self):
+        pass
+
+    def install(self):
+        pass
+
+    def uninstall(self):
+        pass
+
+    def enable(self):
+        pass
+
+    def disable(self):
+        pass
+
+
+class Launchd(ServiceManager):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.service_name = "com.dmunozv04.iSponsorBlockTV"
+        self.service_path = (
+            os.path.expanduser("~/Library/LaunchAgents/") + self.service_name + ".plist"
+        )
+
+    def start(self):
+        subprocess.run(["launchctl", "start", self.service_name])
+
+    def stop(self):
+        subprocess.run(["launchctl", "stop", self.service_name])
+
+    def restart(self):
+        subprocess.run(["launchctl", "restart", self.service_name])
+
+    def status(self):
+        subprocess.run(["launchctl", "list", self.service_name])
+
+    def install(self):
+        if os.path.exists(self.service_path):
+            print("Service already installed")
+            return
+        logs_dir = user_log_dir("iSponsorBlockTV", "dmunozv04")
+        # ensure the logs directory exists
+        os.makedirs(logs_dir, exist_ok=True)
+        plist = {
+            "Label": "com.dmunozv04.iSponsorBlockTV",
+            "RunAtLoad": True,
+            "StartInterval": 20,
+            "EnvironmentVariables": {"PYTHONUNBUFFERED": "YES"},
+            "StandardErrorPath": logs_dir + "/iSponsorBlockTV.err",
+            "StandardOutPath": logs_dir + "/iSponsorBlockTV.out",
+            "Program": self.executable_path,
+        }
+        with open(self.service_path, "wb") as fp:
+            plistlib.dump(plist, fp)
+        print("Service installed")
+        self.enable()
+
+    def uninstall(self):
+        self.disable()
+        # Remove the file
+        try:
+            os.remove(self.service_path)
+            print("Service uninstalled")
+        except FileNotFoundError:
+            print("Service not found")
+
+    def enable(self):
+        subprocess.run(["launchctl", "load", self.service_path])
+
+    def disable(self):
+        subprocess.run(["launchctl", "stop", self.service_name])
+        subprocess.run(["launchctl", "unload", self.service_path])
+
+
+class Systemd(ServiceManager):
+    pass

src/iSponsorBlockTV/setup-wizard-style.tcss

@@ -21,13 +21,9 @@
     scrollbar-gutter: stable;
 }
 
-.button-small {
+.small-button{
     height: 3;
-    border: none;
+
-    border-top: none;
-    border-bottom: none;
-    offset: 0 -1;
-    padding: 0;
 }
 
 .button-100 {
@@ -110,14 +106,13 @@ EditDevice {
 }
 
 Element {
-    background: $panel-darken-1;
+    background: $panel;
     border-top: solid $panel-lighten-2;
     layout: horizontal;
     height: 2;
     width: 100%;
     margin: 0 1 0 1;
     padding: 0;
-
 }
 Element > .element-name {
     offset: 0 -1;
@@ -125,11 +120,7 @@ Element > .element-name {
     width: 100%;
     align: left middle;
     text-align: left;
-    background: $panel-darken-1;
+
-    &:hover {
-        background: $panel-lighten-1;
-        border-top: tall $panel-lighten-3;
-    }
 }
 Element > .element-remove {
     dock: right;
@@ -141,7 +132,7 @@ Element > .element-remove {
     margin: 0 1 0 0;
 }
 
-#add-device, #add-channel {
+#add-device {
     text-style: bold;
     width: 100%;
     align: left middle;
@@ -149,11 +140,6 @@ Element > .element-remove {
     dock: left;
 
     text-align: left;
-    background: $panel-darken-1;
-    &:hover {
-        background: $panel-lighten-1;
-        border-top: tall $panel-lighten-3;
-    }
 }
 #add-device-button-container{
     height: 1;

src/iSponsorBlockTV/setup_wizard.py

@@ -84,15 +84,12 @@ class Element(Static):
     def compose(self) -> ComposeResult:
         yield Button(
             label=self.element_name,
-            classes="element-name button-small",
+            classes="element-name",
             disabled=True,
             id="element-name",
         )
         yield Button(
-            "Remove",
+            "Remove", classes="element-remove", variant="error", id="element-remove"
-            classes="element-remove button-small",
-            variant="error",
-            id="element-remove",
         )
 
     def on_mount(self) -> None:
@@ -105,6 +102,7 @@ class Device(Element):
     """A device element."""
 
     def process_values_from_data(self):
+        print(self.element_data)
         if "name" in self.element_data and self.element_data["name"]:
             self.element_name = self.element_data["name"]
         else:
@@ -287,8 +285,7 @@ class AddDevice(ModalWithClickExit):
                             " computer\nIf it isn't showing up, try restarting the"
                             " app.\nIf running in docker, make sure to use"
                             " `--network=host`\nTo refresh the list, close and open the"
-                            " dialog again\n[b][u]If it still doesn't work, "
+                            " dialog again"
-                            "pair using a pairing code (it's much more reliable)"
                         ),
                         classes="subtitle",
                     )
@@ -331,18 +328,17 @@ class AddDevice(ModalWithClickExit):
 
     @on(Input.Changed, "#pairing-code-input")
     def changed_pairing_code(self, event: Input.Changed):
-        self.query_one(
+        self.query_one("#add-device-pin-add-button").disabled = (
-            "#add-device-pin-add-button"
+            not event.validation_result.is_valid
-        ).disabled = not event.validation_result.is_valid
+        )
 
     @on(Input.Submitted, "#pairing-code-input")
     @on(Button.Pressed, "#add-device-pin-add-button")
     async def handle_add_device_pin(self) -> None:
         self.query_one("#add-device-pin-add-button").disabled = True
         lounge_controller = ytlounge.YtLoungeApi(
-            "iSponsorBlockTV",
+            "iSponsorBlockTV", web_session=self.web_session
         )
-        await lounge_controller.change_web_session(self.web_session)
         pairing_code = self.query_one("#pairing-code-input").value
         pairing_code = int(
             pairing_code.replace("-", "").replace(" ", "")
@@ -351,7 +347,7 @@ class AddDevice(ModalWithClickExit):
         paired = False
         try:
             paired = await lounge_controller.pair(pairing_code)
-        except BaseException:
+        except:
             pass
         if paired:
             device = {
@@ -381,9 +377,9 @@ class AddDevice(ModalWithClickExit):
 
     @on(SelectionList.SelectedChanged, "#dial-devices-list")
     def changed_device_list(self, event: SelectionList.SelectedChanged):
-        self.query_one(
+        self.query_one("#add-device-dial-add-button").disabled = (
-            "#add-device-dial-add-button"
+            not event.selection_list.selected
-        ).disabled = not event.selection_list.selected
+        )
 
 
 class AddChannel(ModalWithClickExit):
@@ -480,6 +476,7 @@ class AddChannel(ModalWithClickExit):
 
     @on(Button.Pressed, "#add-channel-switch-buttons > *")
     def handle_switch_buttons(self, event: Button.Pressed) -> None:
+        button_ = event.button.id
         self.query_one("#add-channel-switcher").current = event.button.id.replace(
             "-button", "-container"
         )
@@ -499,7 +496,7 @@ class AddChannel(ModalWithClickExit):
         self.query_one("#channel-search-results").remove_children()
         try:
             channels_list = await self.api_helper.search_channels(channel_name)
-        except BaseException:
+        except:
             self.query_one("#add-channel-info").update(
                 "[#ff0000]Failed to search for channel"
             )
@@ -588,7 +585,7 @@ class EditDevice(ModalWithClickExit):
                 )
 
     def on_slider_changed(self, event: Slider.Changed) -> None:
-        offset_input = self.query_one("#device-offset-input")
+        offset_input = self.query_one("#device-offset-offset_input")
         with offset_input.prevent(Input.Changed):
             offset_input.value = str(event.slider.value)
 
@@ -622,9 +619,7 @@ class DevicesManager(Vertical):
     def compose(self) -> ComposeResult:
         yield Label("Devices", classes="title")
         with Horizontal(id="add-device-button-container"):
-            yield Button(
+            yield Button("Add Device", id="add-device", classes="button-100")
-                "Add Device", id="add-device", classes="button-100 button-small"
-            )
         for device in self.devices:
             yield Device(device, tooltip="Click to edit")
 
@@ -818,9 +813,7 @@ class ChannelWhitelistManager(Vertical):
             id="warning-no-key",
         )
         with Horizontal(id="add-channel-button-container"):
-            yield Button(
+            yield Button("Add Channel", id="add-channel", classes="button-100")
-                "Add Channel", id="add-channel", classes="button-100 button-small"
-            )
         for channel in self.config.channel_whitelist:
             yield Channel(channel)
 
@@ -950,7 +943,7 @@ class ISponsorBlockTVSetupMainScreen(Screen):
             self.app.query_one("#warning-no-key").display = (
                 not event.input.value
             ) and self.config.channel_whitelist
-        except BaseException:
+        except:
             pass
 
 

src/iSponsorBlockTV/ytlounge.py

@@ -1,6 +1,5 @@
 import asyncio
 import json
-from typing import Any, List
 
 import pyytlounge
 from aiohttp import ClientSession
@@ -13,14 +12,15 @@ create_task = asyncio.create_task
 class YtLoungeApi(pyytlounge.YtLoungeApi):
     def __init__(
         self,
-        screen_id=None,
+        screen_id,
         config=None,
         api_helper=None,
         logger=None,
+        web_session: ClientSession = None,
     ):
-        super().__init__(
+        super().__init__("iSponsorBlockTV", logger=logger)
-            config.join_name if config else "iSponsorBlockTV", logger=logger
+        if web_session is not None:
-        )
+            self.session = web_session  # And use the one we passed
         self.auth.screen_id = screen_id
         self.auth.lounge_id_token = None
         self.api_helper = api_helper
@@ -35,7 +35,6 @@ class YtLoungeApi(pyytlounge.YtLoungeApi):
             self.mute_ads = config.mute_ads
             self.skip_ads = config.skip_ads
             self.auto_play = config.auto_play
-        self._command_mutex = asyncio.Lock()
 
     # Ensures that we still are subscribed to the lounge
     async def _watchdog(self):
@@ -44,7 +43,7 @@ class YtLoungeApi(pyytlounge.YtLoungeApi):
         )  # YouTube sends at least a message every 30 seconds (no-op or any other)
         try:
             self.subscribe_task.cancel()
-        except BaseException:
+        except Exception:
             pass
 
     # Subscribe to the lounge and start the watchdog
@@ -52,19 +51,19 @@ class YtLoungeApi(pyytlounge.YtLoungeApi):
         self.callback = callback
         try:
             self.subscribe_task_watchdog.cancel()
-        except BaseException:
+        except:
             pass  # No watchdog task
         self.subscribe_task = asyncio.create_task(super().subscribe(callback))
         self.subscribe_task_watchdog = asyncio.create_task(self._watchdog())
         return self.subscribe_task
 
     # Process a lounge subscription event
-    def _process_event(self, event_type: str, args: List[Any]):
+    def _process_event(self, event_id: int, event_type: str, args):
-        self.logger.debug(f"process_event({event_type}, {args})")
+        self.logger.debug(f"process_event({event_id}, {event_type}, {args})")
         # (Re)start the watchdog
         try:
             self.subscribe_task_watchdog.cancel()
-        except BaseException:
+        except:
             pass
         finally:
             self.subscribe_task_watchdog = asyncio.create_task(self._watchdog())
@@ -146,16 +145,13 @@ class YtLoungeApi(pyytlounge.YtLoungeApi):
                 self.shorts_disconnected = False
                 create_task(self.play_video(video_id_saved))
         elif event_type == "loungeScreenDisconnected":
-            if args:  # Sometimes it's empty
+            data = args[0]
-                data = args[0]
+            if data["reason"] == "disconnectedByUserScreenInitiated":  # Short playing?
-                if (
+                self.shorts_disconnected = True
-                    data["reason"] == "disconnectedByUserScreenInitiated"
-                ):  # Short playing?
-                    self.shorts_disconnected = True
         elif event_type == "onAutoplayModeChanged":
             create_task(self.set_auto_play_mode(self.auto_play))
 
-        super()._process_event(event_type, args)
+        super()._process_event(event_id, event_type, args)
 
     # Set the volume to a specific value (0-100)
     async def set_volume(self, volume: int) -> None:
@@ -185,16 +181,3 @@ class YtLoungeApi(pyytlounge.YtLoungeApi):
 
     async def play_video(self, video_id: str) -> bool:
         return await self._command("setPlaylist", {"videoId": video_id})
-
-    # Test to wrap the command function in a mutex to avoid race conditions with
-    # the _command_offset (TODO: move to upstream if it works)
-    async def _command(self, command: str, command_parameters: dict = None) -> bool:
-        async with self._command_mutex:
-            return await super()._command(command, command_parameters)
-
-    async def change_web_session(self, web_session: ClientSession):
-        if self.session is not None:
-            await self.session.close()
-        if self.conn is not None:
-            await self.conn.close()
-        self.session = web_session