From e17954b120603c8480219ed67ca18f27300ea014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Sun, 28 Apr 2024 15:58:09 +0300 Subject: [PATCH 1/3] Add SyncConfig re-import from SyncPluginInterface --- plextraktsync/sync/plugin/SyncPluginInterface.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plextraktsync/sync/plugin/SyncPluginInterface.py b/plextraktsync/sync/plugin/SyncPluginInterface.py index 543f584eca..2f5b9371c6 100644 --- a/plextraktsync/sync/plugin/SyncPluginInterface.py +++ b/plextraktsync/sync/plugin/SyncPluginInterface.py @@ -5,6 +5,7 @@ from plextraktsync.plugin import hookspec if TYPE_CHECKING: + from plextraktsync.config.SyncConfig import SyncConfig # noqa: F401 from plextraktsync.media.Media import Media from plextraktsync.plan.Walker import Walker from plextraktsync.sync.plugin import SyncPluginManager From 8937fa56a865337739610fe5442923e283a72333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Sun, 28 Apr 2024 15:58:50 +0300 Subject: [PATCH 2/3] Skip type for unused sync parameter --- plextraktsync/sync/AddCollectionPlugin.py | 2 +- plextraktsync/sync/TraktListsPlugin.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plextraktsync/sync/AddCollectionPlugin.py b/plextraktsync/sync/AddCollectionPlugin.py index ed3eaeeb09..3ede1e20e7 100644 --- a/plextraktsync/sync/AddCollectionPlugin.py +++ b/plextraktsync/sync/AddCollectionPlugin.py @@ -19,7 +19,7 @@ def enabled(config: SyncConfig): return config.plex_to_trakt["collection"] @classmethod - def factory(cls, sync: Sync): + def factory(cls, sync): return cls() @hookimpl diff --git a/plextraktsync/sync/TraktListsPlugin.py b/plextraktsync/sync/TraktListsPlugin.py index b19d16f4a6..9479be423d 100644 --- a/plextraktsync/sync/TraktListsPlugin.py +++ b/plextraktsync/sync/TraktListsPlugin.py @@ -25,12 +25,12 @@ def __init__(self): self.add_to_lists = None @staticmethod - def enabled(config: SyncConfig): + def enabled(config): # Use True for now, would need to keep in sync with other plugins return True @classmethod - def factory(cls, sync: Sync): + def factory(cls, sync): return cls() @hookimpl(trylast=True) From 09eb90cd41a7ef1b0908d6deb335c831b57abd78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Sun, 28 Apr 2024 15:59:02 +0300 Subject: [PATCH 3/3] Import types from SyncPluginInterface --- plextraktsync/sync/AddCollectionPlugin.py | 4 +--- plextraktsync/sync/ClearCollectedPlugin.py | 5 ++--- plextraktsync/sync/LikedListsPlugin.py | 7 +++---- plextraktsync/sync/SyncRatingsPlugin.py | 5 +---- plextraktsync/sync/SyncWatchedPlugin.py | 4 +--- plextraktsync/sync/TraktListsPlugin.py | 6 +----- plextraktsync/sync/WatchListPlugin.py | 9 +++------ plextraktsync/sync/WatchProgressPlugin.py | 4 ++-- 8 files changed, 14 insertions(+), 30 deletions(-) diff --git a/plextraktsync/sync/AddCollectionPlugin.py b/plextraktsync/sync/AddCollectionPlugin.py index 3ede1e20e7..e0f44e4d47 100644 --- a/plextraktsync/sync/AddCollectionPlugin.py +++ b/plextraktsync/sync/AddCollectionPlugin.py @@ -6,9 +6,7 @@ from plextraktsync.plugin import hookimpl if TYPE_CHECKING: - from plextraktsync.config.SyncConfig import SyncConfig - from plextraktsync.media.Media import Media - from plextraktsync.sync.Sync import Sync + from .plugin.SyncPluginInterface import Media, SyncConfig class AddCollectionPlugin: diff --git a/plextraktsync/sync/ClearCollectedPlugin.py b/plextraktsync/sync/ClearCollectedPlugin.py index a2dc7d513f..f781d16cf8 100644 --- a/plextraktsync/sync/ClearCollectedPlugin.py +++ b/plextraktsync/sync/ClearCollectedPlugin.py @@ -7,12 +7,11 @@ from plextraktsync.plugin import hookimpl if TYPE_CHECKING: - from plextraktsync.config.SyncConfig import SyncConfig - from plextraktsync.sync.plugin import SyncPluginManager - from plextraktsync.sync.Sync import Sync from plextraktsync.trakt.TraktApi import TraktApi from plextraktsync.trakt.types import TraktMedia + from .plugin.SyncPluginInterface import Sync, SyncConfig, SyncPluginManager + class ClearCollectedPlugin: logger = logging.getLogger(__name__) diff --git a/plextraktsync/sync/LikedListsPlugin.py b/plextraktsync/sync/LikedListsPlugin.py index b1d533cb65..cdcbbc167c 100644 --- a/plextraktsync/sync/LikedListsPlugin.py +++ b/plextraktsync/sync/LikedListsPlugin.py @@ -6,11 +6,10 @@ from plextraktsync.plugin import hookimpl if TYPE_CHECKING: - from plextraktsync.config.SyncConfig import SyncConfig - from plextraktsync.sync.Sync import Sync from plextraktsync.trakt.TraktApi import TraktApi - from plextraktsync.trakt.TraktUserListCollection import \ - TraktUserListCollection + + from .plugin.SyncPluginInterface import (Sync, SyncConfig, + TraktUserListCollection) class LikedListsPlugin: diff --git a/plextraktsync/sync/SyncRatingsPlugin.py b/plextraktsync/sync/SyncRatingsPlugin.py index cd6287015f..41ef14281e 100644 --- a/plextraktsync/sync/SyncRatingsPlugin.py +++ b/plextraktsync/sync/SyncRatingsPlugin.py @@ -6,10 +6,7 @@ from plextraktsync.plugin import hookimpl if TYPE_CHECKING: - from plextraktsync.config.SyncConfig import SyncConfig - from plextraktsync.media.Media import Media - from plextraktsync.plan.Walker import Walker - from plextraktsync.sync.Sync import Sync + from .plugin.SyncPluginInterface import Media, Sync, SyncConfig, Walker class SyncRatingsPlugin: diff --git a/plextraktsync/sync/SyncWatchedPlugin.py b/plextraktsync/sync/SyncWatchedPlugin.py index 1fa9d0e98e..cefb99d4ad 100644 --- a/plextraktsync/sync/SyncWatchedPlugin.py +++ b/plextraktsync/sync/SyncWatchedPlugin.py @@ -6,9 +6,7 @@ from plextraktsync.plugin import hookimpl if TYPE_CHECKING: - from plextraktsync.config.SyncConfig import SyncConfig - from plextraktsync.media.Media import Media - from plextraktsync.sync.Sync import Sync + from .plugin.SyncPluginInterface import Media, Sync, SyncConfig class SyncWatchedPlugin: diff --git a/plextraktsync/sync/TraktListsPlugin.py b/plextraktsync/sync/TraktListsPlugin.py index 9479be423d..c29516cf8e 100644 --- a/plextraktsync/sync/TraktListsPlugin.py +++ b/plextraktsync/sync/TraktListsPlugin.py @@ -7,11 +7,7 @@ from plextraktsync.plugin import hookimpl if TYPE_CHECKING: - from plextraktsync.config.SyncConfig import SyncConfig - from plextraktsync.media.Media import Media - from plextraktsync.sync.Sync import Sync - from plextraktsync.trakt.TraktUserListCollection import \ - TraktUserListCollection + from .plugin.SyncPluginInterface import Media, TraktUserListCollection class TraktListsPlugin: diff --git a/plextraktsync/sync/WatchListPlugin.py b/plextraktsync/sync/WatchListPlugin.py index e5f09583c5..850cc92d73 100644 --- a/plextraktsync/sync/WatchListPlugin.py +++ b/plextraktsync/sync/WatchListPlugin.py @@ -8,14 +8,11 @@ from plextraktsync.plugin import hookimpl if TYPE_CHECKING: - from plextraktsync.config.SyncConfig import SyncConfig - from plextraktsync.media.Media import Media - from plextraktsync.plan.Walker import Walker from plextraktsync.plex.PlexApi import PlexApi - from plextraktsync.sync.Sync import Sync from plextraktsync.trakt.TraktApi import TraktApi - from plextraktsync.trakt.TraktUserListCollection import \ - TraktUserListCollection + + from .plugin.SyncPluginInterface import (Media, Sync, SyncConfig, + TraktUserListCollection, Walker) class WatchListPlugin: diff --git a/plextraktsync/sync/WatchProgressPlugin.py b/plextraktsync/sync/WatchProgressPlugin.py index cd79738d9f..54cca561dc 100644 --- a/plextraktsync/sync/WatchProgressPlugin.py +++ b/plextraktsync/sync/WatchProgressPlugin.py @@ -8,10 +8,10 @@ from plextraktsync.plugin import hookimpl if TYPE_CHECKING: - from plextraktsync.config.SyncConfig import SyncConfig - from plextraktsync.sync.Sync import Sync from plextraktsync.trakt.TraktApi import TraktApi + from .plugin.SyncPluginInterface import Sync, SyncConfig + class WatchProgressPlugin: logger = logging.getLogger(__name__)