From cc15fb4ef8b225408e5ae8350f956544ee8add5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 21 May 2024 20:33:22 +0300 Subject: [PATCH] Revert "Dumb change" This reverts commit dd25ada4c2804f4fc0bb1e8014e943b4fb5ab8f2. --- src/plexfuse/control/ControlListener.py | 2 +- src/plexfuse/fs/PlexFS.py | 10 +++++----- src/plexfuse/fs/main.py | 2 +- src/plexfuse/plex/PlexApi.py | 2 +- src/plexfuse/vfs/PlexVFS.py | 8 ++++---- src/plexfuse/vfs/entry/ControlSockEntry.py | 2 +- src/plexfuse/vfs/entry/FileEntry.py | 2 +- src/plexfuse/vfs/entry/PathEntry.py | 2 +- src/plexfuse/vfs/entry/PlexMatchEntry.py | 2 +- src/plexfuse/vfs/entry/SectionEntry.py | 2 +- src/plexfuse/vfs/entry/SubtitleEntry.py | 2 +- src/plexfuse/vfs/entry/SymlinkEntry.py | 2 +- tests/test_socket_control.py | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/plexfuse/control/ControlListener.py b/src/plexfuse/control/ControlListener.py index f252abd..ace6fb4 100644 --- a/src/plexfuse/control/ControlListener.py +++ b/src/plexfuse/control/ControlListener.py @@ -7,7 +7,7 @@ from typing import TYPE_CHECKING if TYPE_CHECKING: - from src.plexfuse.control.Control import Control + from plexfuse.control.Control import Control class ControlListener: diff --git a/src/plexfuse/fs/PlexFS.py b/src/plexfuse/fs/PlexFS.py index ea766aa..4764b41 100644 --- a/src/plexfuse/fs/PlexFS.py +++ b/src/plexfuse/fs/PlexFS.py @@ -4,21 +4,21 @@ import fuse +from plexfuse.control.Control import Control from plexfuse.control.ControlListener import ControlListener +from plexfuse.fs.FsOptions import FsOptions +from plexfuse.fs.plex_errno import plex_errno from plexfuse.fs.PlexDirectory import PlexDirectory +from plexfuse.fs.PlexFile import PlexFile from plexfuse.fs.RefCountedDict import RefCountedDict from plexfuse.fs.retry import retry from plexfuse.normalize import normalize +from plexfuse.plex.Monitor import Monitor from plexfuse.plex.PlexApi import PlexApi from plexfuse.sentry import sentry from plexfuse.TimeoutLock import TimeoutLock from plexfuse.vfs.entry.DirEntry import DirEntry from plexfuse.vfs.PlexVFS import PlexVFS -from src.plexfuse.control.Control import Control -from src.plexfuse.fs.FsOptions import FsOptions -from src.plexfuse.fs.plex_errno import plex_errno -from src.plexfuse.fs.PlexFile import PlexFile -from src.plexfuse.plex.Monitor import Monitor class PlexFS(fuse.Fuse): diff --git a/src/plexfuse/fs/main.py b/src/plexfuse/fs/main.py index 6c9def3..9e525a5 100644 --- a/src/plexfuse/fs/main.py +++ b/src/plexfuse/fs/main.py @@ -9,9 +9,9 @@ import fuse +from plexfuse.__version__ import __version__ from plexfuse.fs.PlexFS import PlexFS from plexfuse.plex.PlexApi import PlexApi -from src.plexfuse.__version__ import __version__ fuse.fuse_python_api = (0, 2) diff --git a/src/plexfuse/plex/PlexApi.py b/src/plexfuse/plex/PlexApi.py index d519120..e219936 100644 --- a/src/plexfuse/plex/PlexApi.py +++ b/src/plexfuse/plex/PlexApi.py @@ -10,10 +10,10 @@ from plexapi.exceptions import BadRequest, NotFound from plexapi.server import PlexServer +from plexfuse.cache.HttpCache import HttpCache from plexfuse.vfs.entry.LibraryEntry import LibraryEntry from plexfuse.vfs.entry.MovieEntry import MovieEntry from plexfuse.vfs.entry.SectionEntry import SectionEntry -from src.plexfuse.cache.HttpCache import HttpCache if TYPE_CHECKING: from plexapi.video import Show diff --git a/src/plexfuse/vfs/PlexVFS.py b/src/plexfuse/vfs/PlexVFS.py index a79d2e5..c6b25f2 100644 --- a/src/plexfuse/vfs/PlexVFS.py +++ b/src/plexfuse/vfs/PlexVFS.py @@ -3,12 +3,12 @@ from collections import UserDict from typing import TYPE_CHECKING +from plexfuse.control.ControlVFS import ControlVFS from plexfuse.vfs.ChunkedFile import ChunkedFile from plexfuse.vfs.entry.DirEntry import DirEntry -from src.plexfuse.control.ControlVFS import ControlVFS -from src.plexfuse.vfs.entry.FileEntry import FileEntry -from src.plexfuse.vfs.entry.PlexMatchEntry import PlexMatchEntry -from src.plexfuse.vfs.entry.SubtitleEntry import SubtitleEntry +from plexfuse.vfs.entry.FileEntry import FileEntry +from plexfuse.vfs.entry.PlexMatchEntry import PlexMatchEntry +from plexfuse.vfs.entry.SubtitleEntry import SubtitleEntry if TYPE_CHECKING: from plexfuse.plex.PlexApi import PlexApi diff --git a/src/plexfuse/vfs/entry/ControlSockEntry.py b/src/plexfuse/vfs/entry/ControlSockEntry.py index 17a67f8..8e1e121 100644 --- a/src/plexfuse/vfs/entry/ControlSockEntry.py +++ b/src/plexfuse/vfs/entry/ControlSockEntry.py @@ -1,6 +1,6 @@ from __future__ import annotations -from src.plexfuse.vfs.entry.SymlinkEntry import SymlinkEntry +from plexfuse.vfs.entry.SymlinkEntry import SymlinkEntry class ControlSockEntry(SymlinkEntry): diff --git a/src/plexfuse/vfs/entry/FileEntry.py b/src/plexfuse/vfs/entry/FileEntry.py index b737b1b..3814bd1 100644 --- a/src/plexfuse/vfs/entry/FileEntry.py +++ b/src/plexfuse/vfs/entry/FileEntry.py @@ -2,7 +2,7 @@ from typing import TYPE_CHECKING -from src.plexfuse.vfs.entry.AttrEntry import AttrEntry +from plexfuse.vfs.entry.AttrEntry import AttrEntry if TYPE_CHECKING: from plexapi.media import MediaPart diff --git a/src/plexfuse/vfs/entry/PathEntry.py b/src/plexfuse/vfs/entry/PathEntry.py index 8a23f50..c397472 100644 --- a/src/plexfuse/vfs/entry/PathEntry.py +++ b/src/plexfuse/vfs/entry/PathEntry.py @@ -2,7 +2,7 @@ from pathlib import Path -from src.plexfuse.vfs.entry.AttrEntry import AttrEntry +from plexfuse.vfs.entry.AttrEntry import AttrEntry class PathEntry(AttrEntry): diff --git a/src/plexfuse/vfs/entry/PlexMatchEntry.py b/src/plexfuse/vfs/entry/PlexMatchEntry.py index 04f3e3e..19d08d4 100644 --- a/src/plexfuse/vfs/entry/PlexMatchEntry.py +++ b/src/plexfuse/vfs/entry/PlexMatchEntry.py @@ -3,7 +3,7 @@ from functools import cached_property from typing import TYPE_CHECKING -from src.plexfuse.vfs.entry.AttrEntry import AttrEntry +from plexfuse.vfs.entry.AttrEntry import AttrEntry if TYPE_CHECKING: from plexapi.media import Guid diff --git a/src/plexfuse/vfs/entry/SectionEntry.py b/src/plexfuse/vfs/entry/SectionEntry.py index 732b535..35ffe97 100644 --- a/src/plexfuse/vfs/entry/SectionEntry.py +++ b/src/plexfuse/vfs/entry/SectionEntry.py @@ -6,7 +6,7 @@ from plexfuse.normalize import normalize from plexfuse.vfs.entry.EpisodeEntry import EpisodeEntry from plexfuse.vfs.entry.MovieEntry import MovieEntry -from src.plexfuse.vfs.entry.SeasonEntry import SeasonEntry +from plexfuse.vfs.entry.SeasonEntry import SeasonEntry if TYPE_CHECKING: from plexfuse.plex.types import SectionTypes diff --git a/src/plexfuse/vfs/entry/SubtitleEntry.py b/src/plexfuse/vfs/entry/SubtitleEntry.py index 2ec2eed..b862e55 100644 --- a/src/plexfuse/vfs/entry/SubtitleEntry.py +++ b/src/plexfuse/vfs/entry/SubtitleEntry.py @@ -5,8 +5,8 @@ from plexapi.exceptions import NotFound from plexfuse.plex.PlexApi import PlexApi +from plexfuse.vfs.entry.AttrEntry import AttrEntry from plexfuse.vfs.Playable import Playable -from src.plexfuse.vfs.entry.AttrEntry import AttrEntry class SubtitleEntry(AttrEntry): diff --git a/src/plexfuse/vfs/entry/SymlinkEntry.py b/src/plexfuse/vfs/entry/SymlinkEntry.py index 9c49d41..9ce5787 100644 --- a/src/plexfuse/vfs/entry/SymlinkEntry.py +++ b/src/plexfuse/vfs/entry/SymlinkEntry.py @@ -2,7 +2,7 @@ import stat -from src.plexfuse.vfs.entry.AttrEntry import AttrEntry +from plexfuse.vfs.entry.AttrEntry import AttrEntry class SymlinkEntry(AttrEntry): diff --git a/tests/test_socket_control.py b/tests/test_socket_control.py index 6896886..ecf9b7e 100644 --- a/tests/test_socket_control.py +++ b/tests/test_socket_control.py @@ -1,10 +1,10 @@ from time import sleep +from plexfuse.control.Control import Control from plexfuse.control.ControlListener import ControlListener from plexfuse.fs.PlexFS import PlexFS from plexfuse.plex.PlexApi import PlexApi from plexfuse.vfs.PlexVFS import PlexVFS -from src.plexfuse.control.Control import Control def test_socket_control():