showtime-cli 0.3.19__tar.gz → 0.3.22__tar.gz

{showtime-cli-0.3.19/showtime_cli.egg-info → showtime_cli-0.3.22}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: showtime-cli
-Version: 0.3.19
+Version: 0.3.22
 Summary: Command line show tracker using the TVMaze public API
 Home-page: https://github.com/aquilax/showtime
 Author: Evgeniy Vasilev
@@ -16,15 +16,27 @@ 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.0.7
+Requires-Dist: cmd2==2.5.11
+Requires-Dist: urllib3==2.5.0
 Requires-Dist: ratelimit==2.2.1
-Requires-Dist: tinydb==4.8.0
+Requires-Dist: tinydb==4.8.2
 Requires-Dist: terminaltables==3.1.10
-Requires-Dist: python-dateutil==2.8.2
-Requires-Dist: typing-extensions==4.8.0
+Requires-Dist: python-dateutil==2.9.0.post0
+Requires-Dist: typing-extensions==4.12.2
 Provides-Extra: test
 Requires-Dist: tox; extra == "test"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 # showtime
 

{showtime-cli-0.3.19 → showtime_cli-0.3.22}/pyproject.toml

@@ -13,26 +13,29 @@ 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
+    [tox]
+    env_list = 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]

showtime_cli-0.3.22/requirements.txt

@@ -0,0 +1,7 @@
+cmd2==2.5.11
+urllib3==2.5.0
+ratelimit==2.2.1
+tinydb==4.8.2
+terminaltables==3.1.10
+python-dateutil==2.9.0.post0
+typing-extensions==4.12.2

{showtime-cli-0.3.19 → showtime_cli-0.3.22}/setup.py

@@ -35,13 +35,13 @@ setup(
         'Topic :: Utilities',
     ],
     install_requires=[
-        'cmd2==2.4.3',
-        'urllib3==2.0.7',
+        'cmd2==2.5.11',
+        'urllib3==2.5.0',
         'ratelimit==2.2.1',
-        'tinydb==4.8.0',
+        'tinydb==4.8.2',
         'terminaltables==3.1.10',
-        'python-dateutil==2.8.2',
-        'typing-extensions==4.8.0',
+        'python-dateutil==2.9.0.post0',
+        'typing-extensions==4.12.2',
     ],
     extras_require={
         'test': ['tox'],

{showtime-cli-0.3.19 → showtime_cli-0.3.22}/showtime/__init__.py

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

{showtime-cli-0.3.19 → showtime_cli-0.3.22}/showtime/api.py

@@ -26,7 +26,8 @@ def show_to_model(show: Dict) -> TVMazeShow:
         name=show['name'],
         premiered=show['premiered'],
         status=show['status'],
-        url=show['url']
+        url=show['url'],
+        externals=show['externals']
     )
 
 

{showtime-cli-0.3.19 → showtime_cli-0.3.22}/showtime/command.py

@@ -152,7 +152,18 @@ class Showtime(Cmd):
         self.output.pfeedback('Syncing shows...')
         self.app.sync(on_show_sync=self.output.status_on_show_sync,
                       on_episode_insert=self.output.status_on_episode_insert,
-                      on_episode_update=self.output.status_on_episode_update)
+                      on_episode_update=self.output.status_on_episode_update,
+                      all=False)
+        self.output.pfeedback('Done')
+
+    @cmd2.with_category(EPISODE_CATEGORY)
+    def do_sync_all(self, _: Statement) -> None:
+        """Synchronize episodes with TVMaze [sync]"""
+        self.output.pfeedback('Syncing shows...')
+        self.app.sync(on_show_sync=self.output.status_on_show_sync,
+                      on_episode_insert=self.output.status_on_episode_insert,
+                      on_episode_update=self.output.status_on_episode_update,
+                      all=True)
         self.output.pfeedback('Done')
 
     @cmd2.with_category(EPISODE_CATEGORY)
@@ -344,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.19 → showtime_cli-0.3.22}/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'
@@ -39,7 +39,8 @@ class Database(TinyDB):
                 'id': tv_maze_show.id,
                 'name': tv_maze_show.name,
                 'premiered': tv_maze_show.premiered,
-                'status': tv_maze_show.status
+                'status': tv_maze_show.status,
+                'externals': tv_maze_show.externals,
             })
         return ShowId(tv_maze_show.id)
 
@@ -48,7 +49,8 @@ class Database(TinyDB):
         return self.table(SHOW).update({
             'name': tv_maze_show.name,
             'premiered': tv_maze_show.premiered,
-            'status': tv_maze_show.status
+            'status': tv_maze_show.status,
+            'externals': tv_maze_show.externals,
         }, where('id') == show_id)
 
     def add_episode(self, show_id: ShowId, episode: TVMazeEpisode) -> EpisodeId:
@@ -152,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.19 → showtime_cli-0.3.22}/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]
 
@@ -153,6 +153,29 @@ 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'
+        ])
+        for show in shows:
+            data.append([
+                str(show['id']),
+                show['name'],
+                show['premiered'],
+                show['status'],
+                str(show['total']),
+                str(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.19 → showtime_cli-0.3.22}/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)
 
 
@@ -157,10 +157,12 @@ class ShowtimeApp():
     def sync(self,
              on_show_sync: Union[Callable[[Show], None], None] = None,
              on_episode_insert: Union[Callable[[TVMazeEpisode], None], None] = None,
-             on_episode_update: Union[Callable[[TVMazeEpisode], None], None] = None):
+             on_episode_update: Union[Callable[[TVMazeEpisode], None], None] = None,
+             all=False):
         """Updates episode information for followed shows from tvmaze"""
         with transaction(self.database) as transacted_db:
-            shows = transacted_db.get_active_shows()
+            shows = transacted_db.get_shows() if all else transacted_db.get_active_shows()
+
             for show in shows:
                 show_id = ShowId(show['id'])
                 if on_show_sync:
@@ -255,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.19 → showtime_cli-0.3.22}/showtime/types.py

@@ -1,7 +1,7 @@
 """Showtime Types Module"""
 
 from enum import Enum
-from typing import NamedTuple
+from typing import NamedTuple, Dict
 from typing_extensions import TypedDict
 
 ShowId = int
@@ -16,6 +16,7 @@ class TVMazeShow(NamedTuple):
     premiered: str
     status: str
     url: str
+    externals: Dict
 
 
 class TVMazeEpisode(NamedTuple):
@@ -42,6 +43,13 @@ class Show(TypedDict):
     name: str
     premiered: Date
     status: str
+    externals: Dict
+
+
+class ShowWithCount(Show):
+    """DB Show with episode counts"""
+    total: int
+    seen: int
 
 
 class Episode(TypedDict):

{showtime-cli-0.3.19 → showtime_cli-0.3.22/showtime_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: showtime-cli
-Version: 0.3.19
+Version: 0.3.22
 Summary: Command line show tracker using the TVMaze public API
 Home-page: https://github.com/aquilax/showtime
 Author: Evgeniy Vasilev
@@ -16,15 +16,27 @@ 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.0.7
+Requires-Dist: cmd2==2.5.11
+Requires-Dist: urllib3==2.5.0
 Requires-Dist: ratelimit==2.2.1
-Requires-Dist: tinydb==4.8.0
+Requires-Dist: tinydb==4.8.2
 Requires-Dist: terminaltables==3.1.10
-Requires-Dist: python-dateutil==2.8.2
-Requires-Dist: typing-extensions==4.8.0
+Requires-Dist: python-dateutil==2.9.0.post0
+Requires-Dist: typing-extensions==4.12.2
 Provides-Extra: test
 Requires-Dist: tox; extra == "test"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 # showtime
 

{showtime-cli-0.3.19 → showtime_cli-0.3.22}/showtime_cli.egg-info/SOURCES.txt

@@ -3,7 +3,6 @@ MANIFEST.in
 README.md
 pyproject.toml
 requirements.txt
-setup.cfg
 setup.py
 showtime/__init__.py
 showtime/api.py

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

@@ -0,0 +1,10 @@
+cmd2==2.5.11
+urllib3==2.5.0
+ratelimit==2.2.1
+tinydb==4.8.2
+terminaltables==3.1.10
+python-dateutil==2.9.0.post0
+typing-extensions==4.12.2
+
+[test]
+tox

showtime-cli-0.3.19/requirements.txt

@@ -1,7 +0,0 @@
-cmd2==2.4.3
-urllib3==2.0.7
-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.19/showtime_cli.egg-info/requires.txt

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