showtime-cli 0.3.20__tar.gz → 0.3.24__tar.gz

showtime_cli-0.3.24/PKG-INFO

@@ -0,0 +1,46 @@
+Metadata-Version: 2.4
+Name: showtime-cli
+Version: 0.3.24
+Summary: Command line show tracker using the TVMaze public API
+Author-email: Evgeniy Vasilev <aquilax@gmail.com>
+License: MIT
+Project-URL: Homepage, https://github.com/aquilax/showtime
+Project-URL: Repository, https://github.com/aquilax/showtime
+Keywords: tv,commandline,application,show,tvmaze
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console
+Classifier: Intended Audience :: End Users/Desktop
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Natural Language :: English
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Topic :: Utilities
+Requires-Python: >=3.12
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: cmd2==4.2.1
+Requires-Dist: ratelimit==2.2.1
+Requires-Dist: tinydb==4.9.0
+Requires-Dist: terminaltables==3.1.10
+Requires-Dist: python-dateutil==2.9.0.post0
+Requires-Dist: typing-extensions==4.16.0
+Provides-Extra: test
+Requires-Dist: pytest>=7.0; extra == "test"
+Requires-Dist: pytest-cov>=4.0; extra == "test"
+Requires-Dist: mypy>=1.0; extra == "test"
+Requires-Dist: ratelimit-stubs>=0.2; extra == "test"
+Requires-Dist: types-python-dateutil>=2.8; extra == "test"
+Requires-Dist: types-requests>=2.28; extra == "test"
+Requires-Dist: tox>=4.0; extra == "test"
+Requires-Dist: interrogate>=1.5; extra == "test"
+Dynamic: license-file
+
+# showtime
+
+Small command line interactive tv show tracker using the TvMaze API.
+
+## Installation
+
+```sh
+pip install showtime-cli
+```

showtime_cli-0.3.24/pyproject.toml

@@ -0,0 +1,123 @@
+[build-system]
+requires = ["setuptools>=68.0.0", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "showtime-cli"
+version = "0.3.24"
+description = "Command line show tracker using the TVMaze public API"
+readme = "README.md"
+requires-python = ">=3.12"
+license = {text = "MIT"}
+authors = [{name = "Evgeniy Vasilev", email = "aquilax@gmail.com"}]
+keywords = ["tv", "commandline", "application", "show", "tvmaze"]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Environment :: Console",
+    "Intended Audience :: End Users/Desktop",
+    "License :: OSI Approved :: MIT License",
+    "Natural Language :: English",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.12",
+    "Topic :: Utilities",
+]
+dependencies = [
+    "cmd2==4.2.1",
+    "ratelimit==2.2.1",
+    "tinydb==4.9.0",
+    "terminaltables==3.1.10",
+    "python-dateutil==2.9.0.post0",
+    "typing-extensions==4.16.0",
+]
+
+[project.urls]
+Homepage = "https://github.com/aquilax/showtime"
+Repository = "https://github.com/aquilax/showtime"
+
+[project.scripts]
+showtime = "showtime.command:main"
+
+[project.optional-dependencies]
+test = [
+    "pytest>=7.0",
+    "pytest-cov>=4.0",
+    "mypy>=1.0",
+    "ratelimit-stubs>=0.2",
+    "types-python-dateutil>=2.8",
+    "types-requests>=2.28",
+    "tox>=4.0",
+    "interrogate>=1.5",
+]
+
+[tool.setuptools]
+packages = ["showtime"]
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+norecursedirs = "tests/helpers"
+addopts = "-v --tb=short"
+
+[tool.coverage.run]
+source = ["showtime"]
+branch = true
+
+[tool.coverage.report]
+exclude_lines = [
+    "pragma: no cover",
+    "def __repr__",
+    "raise AssertionError",
+    "raise NotImplementedError",
+    "if __name__ == .__main__.:",
+    "if TYPE_CHECKING:",
+    "class .*\\bProtocol\\):",
+    "@(abc\\.)?abstractmethod",
+]
+precision = 2
+
+[tool.mypy]
+python_version = "3.12"
+warn_return_any = true
+warn_unused_configs = true
+disallow_untyped_defs = false
+disallow_incomplete_defs = false
+check_untyped_defs = true
+no_implicit_optional = true
+warn_redundant_casts = true
+warn_unused_ignores = true
+warn_no_return = true
+strict_optional = true
+plugins = "tinydb.mypy_plugin"
+
+[tool.ruff]
+target-version = "py312"
+line-length = 120
+lint.select = [
+    "E",    # pycodestyle errors
+    "W",    # pycodestyle warnings
+    "F",    # Pyflakes
+    "I",    # isort
+    "B",    # flake8-bugbear
+    "C4",   # flake8-comprehensions
+    "UP",   # pyupgrade
+]
+lint.ignore = [
+    "E501",  # Line too long (handled by formatter)
+]
+
+[tool.ruff.lint.isort]
+known-first-party = ["showtime"]
+
+[tool.ruff.format]
+line-length = 120
+
+[tool.interrogate]
+ignore-init-method = true
+ignore-init-module = false
+ignore-magic = false
+ignore-semiprivate = false
+ignore-private = false
+ignore-module = false
+fail-under = 95
+exclude = ["setup.py", "docs"]
+verbose = 0
+quiet = false

{showtime-cli-0.3.20 → showtime_cli-0.3.24}/showtime/__init__.py

@@ -1,4 +1,4 @@
 """Common module information"""
 
-__version__ = '0.3.20'
+__version__ = '0.3.22'
 __url__ = 'https://github.com/aquilax/showtime'

{showtime-cli-0.3.20 → showtime_cli-0.3.24}/showtime/api.py

@@ -1,8 +1,10 @@
 """API client module"""
 
+from dataclasses import dataclass
 import json
-from typing import Dict, List, Optional
-import urllib3
+from urllib.parse import urlencode, urlparse, urlunparse
+import urllib.request
+from typing import Any, Dict, List, Optional
 
 from showtime.types import ShowId, TVMazeEpisode, TVMazeShow
 
@@ -31,10 +33,37 @@ def show_to_model(show: Dict) -> TVMazeShow:
     )
 
 
+def search_to_model(show_wrapped) -> TVMazeShow:
+    return show_to_model(show_wrapped['show'])
+
+
+@dataclass
+class HTTPResponse:
+    data: str
+
+
+class HTTPClient():
+    """HTTP Client"""
+
+    def request(self, _method: str, url: str, fields: dict[str, str]={}) -> Any:
+        headers = {
+            "User-Agent": "showtime-cli",
+            "Accept": "application/json"
+        }
+
+        url_parts = list(urlparse(url))
+        url_parts[4] = urlencode(fields)
+        final_url = urlunparse(url_parts)
+        print(final_url)
+        request = urllib.request.Request(final_url, headers=headers)
+        with urllib.request.urlopen(request) as response:
+            return HTTPResponse(data=response.read())
+
+
 class Api():
     """API Client"""
 
-    def __init__(self, http: urllib3.PoolManager) -> None:
+    def __init__(self, http: HTTPClient) -> None:
         self.http = http
 
     def episodes_list(self, show_id: ShowId) -> List[TVMazeEpisode]:
@@ -53,8 +82,10 @@ class Api():
         """returns list of shows matching search string"""
         response = self.http.request('GET', f"{API_BASE_URL}/search/shows", fields={'q': query})
         raw_shows = json.loads(response.data.decode('utf-8'))
-        return list(map(show_to_model, raw_shows))
+        return list(map(search_to_model, raw_shows))
 
 
 def get_default_pool_manager():
-    return urllib3.PoolManager(maxsize=1, block=True, headers={'user-agent': 'showtime-cli'})
+    return HTTPClient()
+
+

{showtime-cli-0.3.20 → showtime_cli-0.3.24}/showtime/command.py

@@ -355,6 +355,13 @@ class Showtime(Cmd):
         summary_table = self.output.summary_table(month_totals)
         self.output.ppaged(summary_table)
 
+    @cmd2.with_category(SHOW_CATEGORY)
+    def do_unfinished(self, _: Statement) -> None:
+        """Show list of unfinished shows"""
+        unfinished_shows = self.app.show_get_unfinished()
+        unfinished_shows_table = self.output.unfinished_shows_table(unfinished_shows)
+        self.output.ppaged(unfinished_shows_table)
+
 
 def main() -> None:
     api = Api(get_default_pool_manager())

{showtime-cli-0.3.20 → showtime_cli-0.3.24}/showtime/database.py

@@ -11,7 +11,7 @@ from tinydb.queries import QueryLike
 from tinydb.storages import JSONStorage, MemoryStorage
 
 from showtime.types import (Episode, EpisodeId, Show, ShowId, ShowStatus,
-                            TVMazeEpisode, TVMazeShow)
+                            TVMazeEpisode, TVMazeShow, ShowWithCount)
 
 SHOW = 'show'
 EPISODE = 'episode'
@@ -154,6 +154,22 @@ class Database(TinyDB):
         shows = self.table(SHOW).search(where('id').one_of(show_ids))
         return cast(List[Show], shows)
 
+    def _get_shows_episodes_totals(self) -> List[ShowWithCount]:
+        all_shows = [{**show, 'total': 0, 'seen': 0} for show in self.table(SHOW)]
+        all_shows_keyed = {show['id']: show for show in all_shows}
+        for episode in self.table(EPISODE):
+            show_id = episode['show_id']
+            all_shows_keyed[show_id]['total'] += 1
+            if episode['watched'] != '':
+                all_shows_keyed[show_id]['seen'] += 1
+        return cast(List[ShowWithCount], all_shows_keyed.values())
+
+    def get_unfinished_shows(self) -> List[ShowWithCount]:
+        """Returns list of unfinished shows"""
+        all_shows_totals = self._get_shows_episodes_totals()
+        unfinished_shows = [show for show in all_shows_totals if show['total'] > show['seen']]
+        return sorted(unfinished_shows, key=lambda item: item['premiered'] or "")
+
 
 def get_direct_write_db(file_name: str) -> Database:
     """Returns database instance with direct interface"""

{showtime-cli-0.3.20 → showtime_cli-0.3.24}/showtime/output.py

@@ -6,7 +6,7 @@ from typing import Callable, Dict, List
 from terminaltables import AsciiTable as Table  # type: ignore
 
 from showtime.types import (DecoratedEpisode, Episode, Show, TVMazeEpisode,
-                            TVMazeShow)
+                            TVMazeShow, ShowWithCount)
 
 PrintFunction = Callable[[str], None]
 
@@ -77,7 +77,7 @@ class Output():
                 show.status,
                 show.url
             ])
-        return Table(data, title='Search Results').table
+        return str(Table(data, title='Search Results').table)
 
     def format_episodes(self, show: Show, episodes: List[Episode]) -> str:
         """Formats as table list of episodes"""
@@ -153,6 +153,31 @@ class Output():
         title = 'Followed shows'
         return str(Table(data, title=title).table)
 
+    def unfinished_shows_table(self, shows: List[ShowWithCount]) -> str:
+        """formats list of shows with episodes count as a table"""
+        data = []
+        data.append([
+            'ID',
+            'Name',
+            'Premiered',
+            'Status',
+            'Episodes',
+            'Watched',
+            'Unwatched',
+        ])
+        for show in shows:
+            data.append([
+                str(show['id']),
+                show['name'],
+                show['premiered'],
+                show['status'],
+                str(show['total']),
+                str(show['seen']),
+                str(show['total']-show['seen'])
+            ])
+        title = 'Unfinished shows'
+        return str(Table(data, title=title).table)
+
     def completed_shows_table(self, shows: List[Show]) -> str:
         """formats list of completed shows as a table"""
         data = []

{showtime-cli-0.3.20 → showtime_cli-0.3.24}/showtime/showtime.py

@@ -8,7 +8,7 @@ from ratelimit import limits, sleep_and_retry
 from showtime.api import Api
 from showtime.config import Config
 from showtime.database import Database, transaction, NOT_WATCHED_VALUE
-from showtime.types import (DecoratedEpisode, Episode, EpisodeId, Show, ShowId,
+from showtime.types import (DecoratedEpisode, Episode, EpisodeId, Show, ShowId, ShowWithCount,
                             TVMazeEpisode, TVMazeShow)
 
 
@@ -16,7 +16,7 @@ from showtime.types import (DecoratedEpisode, Episode, EpisodeId, Show, ShowId,
 @limits(calls=20, period=10)
 def _get_episodes(api: Api, show_id: ShowId) -> List[TVMazeEpisode]:
     """Downloads show information from API"""
-    return cast(List[TVMazeEpisode], api.episodes_list(show_id))
+    return api.episodes_list(show_id)
 
 
 def needs_update(episode: Episode, tv_maze_episode: TVMazeEpisode):
@@ -257,3 +257,7 @@ class ShowtimeApp():
     def episodes_get_watched(self) -> List[Episode]:
         """Returns all watched episodes"""
         return self.database.get_watched_episodes()
+
+    def show_get_unfinished(self) -> List[ShowWithCount]:
+        """Returns list of unfinished shows"""
+        return self.database.get_unfinished_shows()

{showtime-cli-0.3.20 → showtime_cli-0.3.24}/showtime/types.py

@@ -46,6 +46,12 @@ class Show(TypedDict):
     externals: Dict
 
 
+class ShowWithCount(Show):
+    """DB Show with episode counts"""
+    total: int
+    seen: int
+
+
 class Episode(TypedDict):
     """DB Episode"""
     id: EpisodeId

showtime_cli-0.3.24/showtime_cli.egg-info/PKG-INFO

@@ -0,0 +1,46 @@
+Metadata-Version: 2.4
+Name: showtime-cli
+Version: 0.3.24
+Summary: Command line show tracker using the TVMaze public API
+Author-email: Evgeniy Vasilev <aquilax@gmail.com>
+License: MIT
+Project-URL: Homepage, https://github.com/aquilax/showtime
+Project-URL: Repository, https://github.com/aquilax/showtime
+Keywords: tv,commandline,application,show,tvmaze
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console
+Classifier: Intended Audience :: End Users/Desktop
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Natural Language :: English
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Topic :: Utilities
+Requires-Python: >=3.12
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: cmd2==4.2.1
+Requires-Dist: ratelimit==2.2.1
+Requires-Dist: tinydb==4.9.0
+Requires-Dist: terminaltables==3.1.10
+Requires-Dist: python-dateutil==2.9.0.post0
+Requires-Dist: typing-extensions==4.16.0
+Provides-Extra: test
+Requires-Dist: pytest>=7.0; extra == "test"
+Requires-Dist: pytest-cov>=4.0; extra == "test"
+Requires-Dist: mypy>=1.0; extra == "test"
+Requires-Dist: ratelimit-stubs>=0.2; extra == "test"
+Requires-Dist: types-python-dateutil>=2.8; extra == "test"
+Requires-Dist: types-requests>=2.28; extra == "test"
+Requires-Dist: tox>=4.0; extra == "test"
+Requires-Dist: interrogate>=1.5; extra == "test"
+Dynamic: license-file
+
+# showtime
+
+Small command line interactive tv show tracker using the TvMaze API.
+
+## Installation
+
+```sh
+pip install showtime-cli
+```

{showtime-cli-0.3.20 → showtime_cli-0.3.24}/showtime_cli.egg-info/SOURCES.txt

@@ -1,10 +1,6 @@
 LICENSE
-MANIFEST.in
 README.md
 pyproject.toml
-requirements.txt
-setup.cfg
-setup.py
 showtime/__init__.py
 showtime/api.py
 showtime/command.py

showtime_cli-0.3.24/showtime_cli.egg-info/requires.txt

@@ -0,0 +1,16 @@
+cmd2==4.2.1
+ratelimit==2.2.1
+tinydb==4.9.0
+terminaltables==3.1.10
+python-dateutil==2.9.0.post0
+typing-extensions==4.16.0
+
+[test]
+pytest>=7.0
+pytest-cov>=4.0
+mypy>=1.0
+ratelimit-stubs>=0.2
+types-python-dateutil>=2.8
+types-requests>=2.28
+tox>=4.0
+interrogate>=1.5

showtime-cli-0.3.20/MANIFEST.in

@@ -1,4 +0,0 @@
-include README.md
-include LICENSE
-include *.txt
-recursive-include docs *.txt

showtime-cli-0.3.20/PKG-INFO

@@ -1,37 +0,0 @@
-Metadata-Version: 2.1
-Name: showtime-cli
-Version: 0.3.20
-Summary: Command line show tracker using the TVMaze public API
-Home-page: https://github.com/aquilax/showtime
-Author: Evgeniy Vasilev
-Author-email: aquilax@gmail.com
-License: MIT
-Keywords: tv commandline application show tvmaze
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Console
-Classifier: Intended Audience :: End Users/Desktop
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Natural Language :: English
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Topic :: Utilities
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: cmd2==2.4.3
-Requires-Dist: urllib3==2.1.0
-Requires-Dist: ratelimit==2.2.1
-Requires-Dist: tinydb==4.8.0
-Requires-Dist: terminaltables==3.1.10
-Requires-Dist: python-dateutil==2.8.2
-Requires-Dist: typing-extensions==4.8.0
-Provides-Extra: test
-Requires-Dist: tox; extra == "test"
-
-# showtime
-
-Small command line interactive tv show tracker using the TvMaze API.
-
-## Installation
-
-```sh
-pip install showtime-cli
-```

showtime-cli-0.3.20/pyproject.toml

@@ -1,52 +0,0 @@
-[build-system]
-requires = ["setuptools>=40.8.0", "wheel"]
-build-backend = "setuptools.build_meta"
-
-[tool.pytest.ini_options]
-norecursedirs = "tests/helpers"
-
-[tool.pylint.format]
-max-line-length = 120
-
-[tool.autopep8]
-max_line_length = 120
-
-[tool.tox]
-legacy_tox_ini = """
-[tox]
-envlist = py311,mypy,doc
-[testenv]
-deps =
-    pytest
-    pytest-cov
-    cmd2_ext_test
-commands = pytest
-[testenv:mypy]
-deps =
-    mypy
-    ratelimit-stubs
-    types-python-dateutil
-    types-requests
-    types-urllib3
-commands = mypy -p showtime
-[testenv:doc]
-deps = interrogate
-skip_install = true
-commands = interrogate --quiet --fail-under 80 showtime
-"""
-
-[tool.interrogate]
-ignore-init-method = true
-ignore-init-module = false
-ignore-magic = false
-ignore-semiprivate = false
-ignore-private = false
-ignore-module = false
-fail-under = 95
-exclude = ["setup.py", "docs"]
-verbose = 0
-quiet = false
-
-
-[tool.mypy]
-plugins = "tinydb.mypy_plugin"

showtime-cli-0.3.20/requirements.txt

@@ -1,7 +0,0 @@
-cmd2==2.4.3
-urllib3==2.1.0
-ratelimit==2.2.1
-tinydb==4.8.0
-terminaltables==3.1.10
-python-dateutil==2.8.2
-typing-extensions==4.8.0

showtime-cli-0.3.20/setup.py

@@ -1,55 +0,0 @@
-from setuptools import setup
-from os import path
-
-here = path.abspath(path.dirname(__file__))
-
-module_data = {}
-with open(path.join(here, "showtime", "__init__.py")) as fp:
-    exec(fp.read(), module_data)
-
-# Get the long description from the README file
-with open(path.join(here, 'README.md'), encoding='utf-8') as f:
-    long_description = f.read()
-
-setup(
-    name='showtime-cli',
-    version=module_data['__version__'],
-    packages=[
-        'showtime',
-    ],
-    author='Evgeniy Vasilev',
-    author_email='aquilax@gmail.com',
-    license='MIT',
-    description='Command line show tracker using the TVMaze public API',
-    long_description=long_description,
-    long_description_content_type='text/markdown',
-    url=module_data['__url__'],
-    keywords='tv commandline application show tvmaze',
-    classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Environment :: Console',
-        'Intended Audience :: End Users/Desktop',
-        'License :: OSI Approved :: MIT License',
-        'Natural Language :: English',
-        'Programming Language :: Python :: 3 :: Only',
-        'Topic :: Utilities',
-    ],
-    install_requires=[
-        'cmd2==2.4.3',
-        'urllib3==2.1.0',
-        'ratelimit==2.2.1',
-        'tinydb==4.8.0',
-        'terminaltables==3.1.10',
-        'python-dateutil==2.8.2',
-        'typing-extensions==4.8.0',
-    ],
-    extras_require={
-        'test': ['tox'],
-    },
-    entry_points={
-        'console_scripts':
-        [
-            'showtime = showtime.command:main'
-        ]
-    }
-)

showtime-cli-0.3.20/showtime_cli.egg-info/PKG-INFO

@@ -1,37 +0,0 @@
-Metadata-Version: 2.1
-Name: showtime-cli
-Version: 0.3.20
-Summary: Command line show tracker using the TVMaze public API
-Home-page: https://github.com/aquilax/showtime
-Author: Evgeniy Vasilev
-Author-email: aquilax@gmail.com
-License: MIT
-Keywords: tv commandline application show tvmaze
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Console
-Classifier: Intended Audience :: End Users/Desktop
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Natural Language :: English
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Topic :: Utilities
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: cmd2==2.4.3
-Requires-Dist: urllib3==2.1.0
-Requires-Dist: ratelimit==2.2.1
-Requires-Dist: tinydb==4.8.0
-Requires-Dist: terminaltables==3.1.10
-Requires-Dist: python-dateutil==2.8.2
-Requires-Dist: typing-extensions==4.8.0
-Provides-Extra: test
-Requires-Dist: tox; extra == "test"
-
-# showtime
-
-Small command line interactive tv show tracker using the TvMaze API.
-
-## Installation
-
-```sh
-pip install showtime-cli
-```

showtime-cli-0.3.20/showtime_cli.egg-info/requires.txt

@@ -1,10 +0,0 @@
-cmd2==2.4.3
-urllib3==2.1.0
-ratelimit==2.2.1
-tinydb==4.8.0
-terminaltables==3.1.10
-python-dateutil==2.8.2
-typing-extensions==4.8.0
-
-[test]
-tox