oldnews 0.1.0__tar.gz → 0.2.0__tar.gz

{oldnews-0.1.0 → oldnews-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oldnews
-Version: 0.1.0
+Version: 0.2.0
 Summary: A terminal-based client for TheOldReader
 Keywords: atom,client,Google Reader,RSS,TheOldReader,terminal,news-reader,news
 Author: Dave Pearson
@@ -10,7 +10,6 @@ Classifier: Development Status :: 3 - Alpha
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
@@ -21,7 +20,7 @@ Requires-Dist: textual>=6.3.0
 Requires-Dist: textual-enhanced>=1.2.0
 Requires-Dist: typedal>=4.2.2
 Requires-Dist: xdg-base-dirs>=6.0.2
-Requires-Python: >=3.11
+Requires-Python: >=3.12
 Project-URL: Homepage, https://github.com/davep/oldnews
 Project-URL: Repository, https://github.com/davep/oldnews
 Project-URL: Documentation, https://oldnews.davep.dev/

{oldnews-0.1.0 → oldnews-0.2.0}/pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "oldnews"
-version = "0.1.0"
+version = "0.2.0"
 description = "A terminal-based client for TheOldReader"
 readme = "README.md"
 authors = [
     { name = "Dave Pearson", email = "davep@davep.org" }
 ]
-requires-python = ">=3.11"
+requires-python = ">=3.12"
 license = "GPL-3.0-or-later"
 keywords = [
     "atom",
@@ -31,7 +31,6 @@ classifiers = [
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3 :: Only",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: 3.14",

{oldnews-0.1.0 → oldnews-0.2.0}/src/oldnews/commands/__init__.py

@@ -8,6 +8,7 @@ from .main import (
     Next,
     NextUnread,
     OpenArticle,
+    OpenOrigin,
     Previous,
     PreviousUnread,
     RefreshFromTheOldReader,
@@ -22,6 +23,7 @@ __all__ = [
     "Next",
     "NextUnread",
     "OpenArticle",
+    "OpenOrigin",
     "Previous",
     "PreviousUnread",
     "RefreshFromTheOldReader",

{oldnews-0.1.0 → oldnews-0.2.0}/src/oldnews/commands/main.py

@@ -63,6 +63,13 @@ class OpenArticle(Command):
     BINDING_KEY = "o"
 
 
+##############################################################################
+class OpenOrigin(Command):
+    """Open the origin for the current article in the web browser"""
+
+    BINDING_KEY = "O"
+
+
 ##############################################################################
 class MarkAllRead(Command):
     """Mark all unread articles in the current category as read"""

{oldnews-0.1.0 → oldnews-0.2.0}/src/oldnews/data/__init__.py

@@ -12,6 +12,7 @@ from .config import (
 from .db import initialise_database
 from .last_grab import last_grabbed_data_at, remember_we_last_grabbed_at
 from .local_articles import (
+    clean_old_read_articles,
     get_local_articles,
     get_unread_article_ids,
     locally_mark_article_ids_read,
@@ -27,6 +28,7 @@ from .navigation_state import get_navigation_state, save_navigation_state
 # Exports.
 __all__ = [
     "Configuration",
+    "clean_old_read_articles",
     "get_auth_token",
     "get_local_articles",
     "get_local_folders",

{oldnews-0.1.0 → oldnews-0.2.0}/src/oldnews/data/db.py

@@ -3,11 +3,14 @@
 ##############################################################################
 # Python imports.
 from pathlib import Path
+from typing import Any
 
 ##############################################################################
 # TypeDAL imports.
-from typedal import TypeDAL, TypedTable
+from typedal import TypeDAL, TypedField, TypedTable
 from typedal.config import TypeDALConfig
+from typedal.helpers import get_field
+from typedal.types import Field
 
 ##############################################################################
 # Local imports.
@@ -30,7 +33,9 @@ def db_file() -> Path:
 
 
 ##############################################################################
-def _safely_index(table: type[TypedTable], name: str, field: str) -> None:
+def _safely_index(
+    table: type[TypedTable], name: str, field: str | Field | TypedField[Any]
+) -> None:
     """Create an index on a type, but handle errors.
 
     Args:
@@ -45,7 +50,9 @@ def _safely_index(table: type[TypedTable], name: str, field: str) -> None:
         just missed it.
     """
     try:
-        table.create_index(name, field)
+        table.create_index(
+            name, get_field(field) if isinstance(field, TypedField) else field
+        )
     except RuntimeError:
         pass
 
@@ -74,12 +81,11 @@ def initialise_database() -> TypeDAL:
     )
 
     dal.define(LocalArticleCategory)
-    # TODO: Need to make `field` more open.
-    # _safely_index(
-    #     LocalArticleCategory,
-    #     "idx_local_article_category_article",
-    #     LocalArticleCategory.article,
-    # )
+    _safely_index(
+        LocalArticleCategory,
+        "idx_local_article_category_article",
+        LocalArticleCategory.article,
+    )
     _safely_index(
         LocalArticleCategory,
         "idx_local_article_category_category",

{oldnews-0.1.0 → oldnews-0.2.0}/src/oldnews/data/local_articles.py

@@ -2,7 +2,7 @@
 
 ##############################################################################
 # Python imports.
-from datetime import datetime
+from datetime import datetime, timedelta
 from html import unescape
 from typing import Iterable, Iterator, cast
 
@@ -85,7 +85,7 @@ class LocalArticle(TypedTable):
 class LocalArticleCategory(TypedTable):
     """A local copy of the categories associated with an article."""
 
-    article: LocalArticle
+    article: TypedField[LocalArticle]
     """The article that this category belongs to."""
     category: str
     """The category."""
@@ -95,7 +95,7 @@ class LocalArticleCategory(TypedTable):
 class LocalArticleAlternate(TypedTable):
     """A local copy of the alternate URLs associated with an article."""
 
-    article: LocalArticle
+    article: TypedField[LocalArticle]
     """The article that this alternate belongs to."""
     href: str
     """The URL of the alternate."""
@@ -333,4 +333,19 @@ def get_unread_article_ids() -> list[str]:
     ]
 
 
+##############################################################################
+def clean_old_read_articles(cutoff: timedelta) -> int:
+    """Clean up articles that are older than the given cutoff time."""
+    assert LocalArticle._db is not None
+    read = get_local_read_article_ids()
+    retire_time = datetime.now() - cutoff
+    cleaned = len(
+        LocalArticle.where(
+            (LocalArticle.published < retire_time) & LocalArticle.id.belongs(read)
+        ).delete()
+    )
+    LocalArticle._db.commit()
+    return cleaned
+
+
 ### local_articles.py ends here

{oldnews-0.1.0 → oldnews-0.2.0}/src/oldnews/providers/main.py

@@ -18,6 +18,7 @@ from ..commands import (
     Next,
     NextUnread,
     OpenArticle,
+    OpenOrigin,
     Previous,
     PreviousUnread,
     RefreshFromTheOldReader,
@@ -41,6 +42,7 @@ class MainCommands(CommandsProvider):
         yield from self.maybe(Previous)
         yield from self.maybe(PreviousUnread)
         yield from self.maybe(OpenArticle)
+        yield from self.maybe(OpenOrigin)
         yield from self.maybe(MarkAllRead)
         yield ToggleShowAll()
         yield RefreshFromTheOldReader()

{oldnews-0.1.0 → oldnews-0.2.0}/src/oldnews/screens/main.py

@@ -44,6 +44,7 @@ from ..commands import (
     Next,
     NextUnread,
     OpenArticle,
+    OpenOrigin,
     Previous,
     PreviousUnread,
     RefreshFromTheOldReader,
@@ -51,6 +52,7 @@ from ..commands import (
 )
 from ..data import (
     LocalUnread,
+    clean_old_read_articles,
     get_local_articles,
     get_local_folders,
     get_local_subscriptions,
@@ -145,6 +147,7 @@ class Main(EnhancedScreen[None]):
         Previous,
         PreviousUnread,
         OpenArticle,
+        OpenOrigin,
         ChangeTheme,
     ]
 
@@ -236,7 +239,7 @@ class Main(EnhancedScreen[None]):
             # but okay let's be defensive... (when I can come up with a nice
             # little MRE I'll report it).
             return True
-        if action == OpenArticle.action_name():
+        if action in (OpenArticle.action_name(), OpenOrigin.action_name()):
             return self.article is not None
         if action in (Next.action_name(), Previous.action_name()):
             return self.articles is not None
@@ -245,6 +248,12 @@ class Main(EnhancedScreen[None]):
             PreviousUnread.action_name(),
             MarkAllRead.action_name(),
         ):
+            # If we're inside the navigation panel...
+            if self.query_one(Navigation).has_focus:
+                # ...we just care if there's anything unread somewhere.
+                return any(total for total in self.unread.values())
+            # Otherwise we care if we can see a current list of articles and
+            # if there's something unread amongst them.
             return self.articles is not None and any(
                 article.is_unread for article in self.articles
             )
@@ -296,6 +305,10 @@ class Main(EnhancedScreen[None]):
             self.post_message(self.NewFolders(folders))
         if subscriptions := get_local_subscriptions():
             self.post_message(self.NewSubscriptions(subscriptions))
+        if cleaned := clean_old_read_articles(
+            timedelta(days=load_configuration().local_history)
+        ):
+            self.notify(f"Old read articles cleaned from local storage: {cleaned}")
         if unread := get_local_unread(folders, subscriptions):
             self.post_message(self.NewUnread(unread))
         # If we've never grabbed data from ToR before, or if it's been long enough...
@@ -487,14 +500,18 @@ class Main(EnhancedScreen[None]):
 
     def action_next_unread_command(self) -> None:
         """Go to the next unread article in the currently-viewed category."""
-        if self.article is None:
+        if (navigation := self.query_one(Navigation)).has_focus:
+            navigation.highlight_next_unread_category()
+        elif self.article is None:
             self.query_one(ArticleList).highlight_next_unread_article()
         else:
             self.query_one(ArticleList).select_next_unread_article()
 
     def action_previous_unread_command(self) -> None:
         """Go to the previous unread article in the currently-viewed category"""
-        if self.article is None:
+        if (navigation := self.query_one(Navigation)).has_focus:
+            navigation.highlight_previous_unread_category()
+        elif self.article is None:
             self.query_one(ArticleList).highlight_previous_unread_article()
         else:
             self.query_one(ArticleList).select_previous_unread_article()
@@ -546,5 +563,17 @@ class Main(EnhancedScreen[None]):
                     severity="error",
                 )
 
+    def action_open_origin_command(self) -> None:
+        """Open the origin of the current article in the web browser."""
+        if self.article is not None:
+            if self.article.origin.html_url:
+                open_url(self.article.origin.html_url)
+            else:
+                self.notify(
+                    "No URL available for the article's origin",
+                    severity="error",
+                    title="Can't visit",
+                )
+
 
 ### main.py ends here

oldnews-0.2.0/src/oldnews/widgets/_after_highlight.py

@@ -0,0 +1,53 @@
+"""Support code for OptionLists that want to find things."""
+
+##############################################################################
+# Python imports.
+from typing import Callable, Iterator, Literal
+
+##############################################################################
+# Textual imports.
+from textual.widgets import OptionList
+
+##############################################################################
+type HighlightDirection = Literal["next", "previous"]
+"""Type of a unread search direction."""
+
+
+##############################################################################
+def options_after_highlight[T](
+    option_list: OptionList,
+    options: list[T],
+    direction: HighlightDirection,
+    option_filter: Callable[[T], bool] | None = None,
+) -> Iterator[T]:
+    """Return a list of `OptionList` options after the highlight.
+
+    Args:
+        option_list: The `OptionList` to work against.
+        options: The options from the given option list.
+        direction: The direction to consider as 'after'.
+        option_filter: Optional filter to apply to the list.
+
+    Returns:
+        An iterator of options.
+
+    Notes:
+        If there is no highlight, we default at position 0.
+
+        The options are taken as a parameter, rather than just been pulled
+        out of `option_list`, so that you have a chance to `cast` the list
+        to the desired type, which in turn ensures that the return type
+        matches.
+    """
+    option_filter = option_filter or (lambda _: True)
+    highlight = option_list.highlighted or 0
+    options = list(reversed(options)) if direction == "previous" else options
+    highlight = (len(options) - highlight - 1) if direction == "previous" else highlight
+    return (
+        option
+        for option in [*options[highlight:], *options[0:highlight]][1:]
+        if option_filter(option)
+    )
+
+
+### _after_highlight.py ends here

{oldnews-0.1.0 → oldnews-0.2.0}/src/oldnews/widgets/article_content.py

@@ -15,7 +15,7 @@ from oldas import Article
 ##############################################################################
 # Textual imports.
 from textual.app import ComposeResult
-from textual.containers import Vertical, VerticalScroll
+from textual.containers import Horizontal, Vertical, VerticalScroll
 from textual.reactive import var
 from textual.widgets import Label, Markdown
 
@@ -36,8 +36,13 @@ class ArticleContent(Vertical):
             height: auto;
             padding: 0 1 0 1;
 
+            Horizontal {
+                height: auto;
+            }
+
             #title {
                 color: $text-accent;
+                width: 1fr;
             }
             #published, #link {
                 color: $text-muted;
@@ -63,15 +68,15 @@ class ArticleContent(Vertical):
     def compose(self) -> ComposeResult:
         """Compose the content of the widget."""
         with Vertical(id="header"):
-            yield Label(id="title", markup=False)
-            yield Label(id="published")
+            with Horizontal():
+                yield Label(id="title", markup=False)
+                yield Label(id="published")
             yield Label(id="link", markup=False)
         with VerticalScroll():
             yield Markdown()
 
-    def _watch_article(self) -> None:
+    async def _watch_article(self) -> None:
         """React to the article being updated."""
-        self.set_class(self.article is not None, "--has-article")
         if self.article is not None:
             self.query_one("#title", Label).update(self.article.title)
             self.query_one("#published", Label).update(str(self.article.published))
@@ -81,7 +86,9 @@ class ArticleContent(Vertical):
             else:
                 link.visible = True
                 link.update(self.article.html_url)
-            self.query_one(Markdown).update(convert(self.article.summary.content))
+            await self.query_one(Markdown).update(convert(self.article.summary.content))
+            self.query_one(VerticalScroll).scroll_home()
+        self.set_class(self.article is not None, "--has-article")
 
     def focus(self, scroll_visible: bool = True) -> Self:
         self.query_one(VerticalScroll).focus(scroll_visible)

{oldnews-0.1.0 → oldnews-0.2.0}/src/oldnews/widgets/article_list.py

@@ -1,9 +1,13 @@
 """Widget to show a list of articles."""
 
+##############################################################################
+# Backward compatibility.
+from __future__ import annotations
+
 ##############################################################################
 # Python imports.
 from dataclasses import dataclass
-from typing import Iterator, Literal, cast
+from typing import cast
 
 ##############################################################################
 # OldAs imports.
@@ -26,6 +30,10 @@ from textual.widgets.option_list import Option
 # Textual enhanced imports.
 from textual_enhanced.widgets import EnhancedOptionList
 
+##############################################################################
+# Local imports.
+from ._after_highlight import HighlightDirection, options_after_highlight
+
 
 ##############################################################################
 class ArticleView(Option):
@@ -73,11 +81,6 @@ class ArticleView(Option):
         return self._article
 
 
-##############################################################################
-UnreadSearchDirection = Literal["next", "previous"]
-"""Type of a unread search direction."""
-
-
 ##############################################################################
 class ArticleList(EnhancedOptionList):
     """Widget for showing a list of articles."""
@@ -139,36 +142,7 @@ class ArticleList(EnhancedOptionList):
         assert isinstance(message.option, ArticleView)
         self.post_message(self.ViewArticle(message.option.article))
 
-    def _unread_articles_after_highlight(
-        self, direction: UnreadSearchDirection
-    ) -> Iterator[ArticleView]:
-        """Return a list of all articles after the highlight.
-
-        Args:
-            direction: The direction to search in.
-
-        Returns:
-            An iterator of `ArticleView` objects that show an unread article.
-
-        Notes:
-            If there is no highlight, we default at position 0.
-        """
-        highlight = self.highlighted or 0
-        options = (
-            list(reversed(self.options)) if direction == "previous" else self.options
-        )
-        highlight = (
-            (len(options) - highlight - 1) if direction == "previous" else highlight
-        )
-        return (
-            article_view
-            for article_view in cast(
-                list[ArticleView], [*options[highlight:], *options[0:highlight]]
-            )[1:]
-            if article_view.article.is_unread
-        )
-
-    def _highlight_unread(self, direction: UnreadSearchDirection) -> bool:
+    def _highlight_unread(self, direction: HighlightDirection) -> bool:
         """Highlight the next unread article, if there is one.
 
         Args:
@@ -178,7 +152,15 @@ class ArticleList(EnhancedOptionList):
             `True` if an unread article was found and highlighted, `False`
             if not.
         """
-        if next_hit := next(self._unread_articles_after_highlight(direction), None):
+        if next_hit := next(
+            options_after_highlight(
+                self,
+                cast(list[ArticleView], self.options),
+                direction,
+                lambda article_view: article_view.article.is_unread,
+            ),
+            None,
+        ):
             if next_hit.id is not None:
                 self.highlighted = self.get_option_index(next_hit.id)
                 return True

{oldnews-0.1.0 → oldnews-0.2.0}/src/oldnews/widgets/navigation.py

@@ -7,6 +7,7 @@ from __future__ import annotations
 ##############################################################################
 # Python imports.
 from dataclasses import dataclass
+from typing import cast
 
 ##############################################################################
 # OldAs imports.
@@ -34,6 +35,7 @@ from textual_enhanced.widgets import EnhancedOptionList
 ##############################################################################
 # Local imports.
 from ..data import LocalUnread, get_navigation_state, save_navigation_state
+from ._after_highlight import HighlightDirection, options_after_highlight
 
 
 ##############################################################################
@@ -102,7 +104,7 @@ class SubscriptionView(Option):
             "",
             str(unread) if unread else "",
         )
-        super().__init__(prompt)
+        super().__init__(prompt, id=subscription.id)
 
     @property
     def subscription(self) -> Subscription:
@@ -236,5 +238,38 @@ class Navigation(EnhancedOptionList):
             return selected.subscription
         raise ValueError("Unknown category")
 
+    def _highlight_unread(self, direction: HighlightDirection) -> bool:
+        """Highlight the next category with unread articles, if there is one.
+
+        Args:
+            direction: The direction to search.
+
+        Returns:
+            `True` if an unread category was found and highlighted, `False`
+            if not.
+        """
+        if next_hit := next(
+            options_after_highlight(
+                self,
+                cast(list[FolderView | SubscriptionView], self.options),
+                direction,
+                lambda category: bool(category.id and self.unread.get(category.id)),
+            ),
+            None,
+        ):
+            if next_hit.id is not None:
+                self.highlighted = self.get_option_index(next_hit.id)
+                return True
+        self.notify("No more folders or subscriptions with unread articles")
+        return False
+
+    def highlight_next_unread_category(self) -> None:
+        """Highlight the next unread category."""
+        self._highlight_unread("next")
+
+    def highlight_previous_unread_category(self) -> None:
+        """Highlight the previous unread category."""
+        self._highlight_unread("previous")
+
 
 ### navigation.py ends here