oldnews 0.3.0__tar.gz → 0.4.0__tar.gz

{oldnews-0.3.0 → oldnews-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oldnews
-Version: 0.3.0
+Version: 0.4.0
 Summary: A terminal-based client for TheOldReader
 Keywords: atom,client,Google Reader,RSS,TheOldReader,terminal,news-reader,news
 Author: Dave Pearson

{oldnews-0.3.0 → oldnews-0.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "oldnews"
-version = "0.3.0"
+version = "0.4.0"
 description = "A terminal-based client for TheOldReader"
 readme = "README.md"
 authors = [

{oldnews-0.3.0 → oldnews-0.4.0}/src/oldnews/commands/__init__.py

@@ -3,12 +3,16 @@
 ##############################################################################
 # Local imports.
 from .main import (
+    Copy,
+    CopyArticleToClipboard,
+    CopyFeedToClipboard,
+    CopyHomePageToClipboard,
     Escape,
     MarkAllRead,
     Next,
     NextUnread,
     OpenArticle,
-    OpenOrigin,
+    OpenHomePage,
     Previous,
     PreviousUnread,
     RefreshFromTheOldReader,
@@ -18,12 +22,16 @@ from .main import (
 ##############################################################################
 # Exports.
 __all__ = [
+    "Copy",
+    "CopyArticleToClipboard",
+    "CopyFeedToClipboard",
+    "CopyHomePageToClipboard",
     "Escape",
     "MarkAllRead",
     "Next",
     "NextUnread",
     "OpenArticle",
-    "OpenOrigin",
+    "OpenHomePage",
     "Previous",
     "PreviousUnread",
     "RefreshFromTheOldReader",

{oldnews-0.3.0 → oldnews-0.4.0}/src/oldnews/commands/main.py

@@ -64,8 +64,8 @@ class OpenArticle(Command):
 
 
 ##############################################################################
-class OpenOrigin(Command):
-    """Open the origin for the current article in the web browser"""
+class OpenHomePage(Command):
+    """Open the home page for the current subscription in the web browser"""
 
     BINDING_KEY = "O"
 
@@ -77,4 +77,32 @@ class MarkAllRead(Command):
     BINDING_KEY = "R"
 
 
+##############################################################################
+class CopyHomePageToClipboard(Command):
+    """Copy the URL of the current subscription's home page to the clipboard"""
+
+    BINDING_KEY = "f3"
+
+
+##############################################################################
+class CopyFeedToClipboard(Command):
+    """Copy the URL of the current subscription's feed to the clipboard"""
+
+    BINDING_KEY = "f4"
+
+
+##############################################################################
+class CopyArticleToClipboard(Command):
+    """Copy the URL for the current article to the clipboard"""
+
+    BINDING_KEY = "f5"
+
+
+##############################################################################
+class Copy(Command):
+    """Copy a URL to the clipboard depending on the context"""
+
+    BINDING_KEY = "ctrl+c"
+
+
 ### main.py ends here

{oldnews-0.3.0 → oldnews-0.4.0}/src/oldnews/providers/main.py

@@ -13,12 +13,16 @@ from textual_enhanced.commands import (
 ##############################################################################
 # Local imports.
 from ..commands import (
+    Copy,
+    CopyArticleToClipboard,
+    CopyFeedToClipboard,
+    CopyHomePageToClipboard,
     Escape,
     MarkAllRead,
     Next,
     NextUnread,
     OpenArticle,
-    OpenOrigin,
+    OpenHomePage,
     Previous,
     PreviousUnread,
     RefreshFromTheOldReader,
@@ -42,8 +46,12 @@ 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(OpenHomePage)
         yield from self.maybe(MarkAllRead)
+        yield from self.maybe(CopyHomePageToClipboard)
+        yield from self.maybe(CopyFeedToClipboard)
+        yield from self.maybe(CopyArticleToClipboard)
+        yield from self.maybe(Copy)
         yield ToggleShowAll()
         yield RefreshFromTheOldReader()
         yield ChangeTheme()

{oldnews-0.3.0 → oldnews-0.4.0}/src/oldnews/screens/main.py

@@ -38,12 +38,16 @@ from textual_enhanced.screen import EnhancedScreen
 # Local imports.
 from .. import __version__
 from ..commands import (
+    Copy,
+    CopyArticleToClipboard,
+    CopyFeedToClipboard,
+    CopyHomePageToClipboard,
     Escape,
     MarkAllRead,
     Next,
     NextUnread,
     OpenArticle,
-    OpenOrigin,
+    OpenHomePage,
     Previous,
     PreviousUnread,
     RefreshFromTheOldReader,
@@ -117,6 +121,13 @@ class Main(EnhancedScreen[None]):
             width: 25%;
         }
 
+        #article-view {
+            display: none;
+            &.--has-articles {
+                display: block;
+            }
+        }
+
         ArticleList {
             height: 1fr;
         }
@@ -142,8 +153,12 @@ class Main(EnhancedScreen[None]):
         Previous,
         PreviousUnread,
         OpenArticle,
-        OpenOrigin,
+        OpenHomePage,
         ChangeTheme,
+        CopyHomePageToClipboard,
+        CopyFeedToClipboard,
+        CopyArticleToClipboard,
+        Copy,
     ]
 
     BINDINGS = Command.bindings(*COMMAND_MESSAGES)
@@ -208,7 +223,7 @@ class Main(EnhancedScreen[None]):
         yield Navigation(classes="panel").data_bind(
             Main.folders, Main.subscriptions, Main.unread
         )
-        with Vertical():
+        with Vertical(id="article-view"):
             yield ArticleList(classes="panel").data_bind(
                 Main.articles, Main.current_category
             )
@@ -237,8 +252,14 @@ 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 in (OpenArticle.action_name(), OpenOrigin.action_name()):
+        if action in (OpenArticle.action_name(), CopyArticleToClipboard.action_name()):
             return self.article is not None
+        if action in (
+            OpenHomePage.action_name(),
+            CopyFeedToClipboard.action_name(),
+            CopyHomePageToClipboard.action_name(),
+        ):
+            return self.query_one(Navigation).current_subscription is not None
         if action in (Next.action_name(), Previous.action_name()):
             return self.articles is not None
         if action in (
@@ -255,6 +276,11 @@ class Main(EnhancedScreen[None]):
             return self.articles is not None and any(
                 article.is_unread for article in self.articles
             )
+        if action == Copy.action_name():
+            return (
+                (navigation := self.query_one(Navigation)).has_focus
+                and navigation.current_subscription is not None
+            ) or self.query_one("#article-view").has_focus_within
         return True
 
     @on(SubTitle)
@@ -300,6 +326,13 @@ class Main(EnhancedScreen[None]):
         """Refresh the content of the article list."""
         if self.current_category:
             self.articles = get_local_articles(self.current_category, not self.show_all)
+            # If the result is there's nothing showing, tidy up the content
+            # side of the display and maybe move focus back to navigation.
+            if not self.articles:
+                self.article = None
+                if self.query_one("#article-view").has_focus_within:
+                    self.query_one(Navigation).focus()
+        self.query_one("#article-view").set_class(bool(self.articles), "--has-articles")
 
     @work(thread=True, exclusive=True)
     def _load_locally(self) -> None:
@@ -494,17 +527,62 @@ 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)
+    def action_open_home_page_command(self) -> None:
+        """Open the home page of the current subscription in the web browser."""
+        if subscription := self.query_one(Navigation).current_subscription:
+            if subscription.html_url:
+                open_url(subscription.html_url)
             else:
                 self.notify(
-                    "No URL available for the article's origin",
+                    "No home page URL available for the subscription",
                     severity="error",
                     title="Can't visit",
                 )
 
+    def _copy_to_clipboard(self, content: str | None, empty_error: str) -> None:
+        """Copy some content to the clipboard.
+
+        Args:
+            content: The content to copy to the clipboard.
+            empty_error: The message to show if there's no content.
+        """
+        if content:
+            self.app.copy_to_clipboard(content)
+            self.notify("Copied to clipboard")
+        else:
+            self.notify(empty_error, severity="error", title="Can't copy")
+
+    def action_copy_home_page_to_clipboard_command(self) -> None:
+        """Copy the URL of the current subscription's homepage to the clipboard."""
+        if subscription := self.query_one(Navigation).current_subscription:
+            self._copy_to_clipboard(
+                subscription.html_url, "No home page URL available for the subscription"
+            )
+
+    def action_copy_feed_to_clipboard_command(self) -> None:
+        """Copy the URL of the current subscription's feed to the clipboard."""
+        if subscription := self.query_one(Navigation).current_subscription:
+            self._copy_to_clipboard(
+                subscription.url, "No feed URL available for the subscription"
+            )
+
+    def action_copy_article_to_clipboard_command(self) -> None:
+        """Copy the URL of the current article to the clipboard."""
+        if self.article:
+            self._copy_to_clipboard(
+                self.article.html_url, "No URL available for the article"
+            )
+
+    def action_copy_command(self) -> None:
+        """Copy a URL to the clipboard depending on the current context."""
+        if (navigation := self.query_one(Navigation)).has_focus:
+            if navigation.current_subscription:
+                self.action_copy_home_page_to_clipboard_command()
+        elif self.query_one("#article-view").has_focus_within:
+            if self.article:
+                self.action_copy_article_to_clipboard_command()
+            else:
+                self.action_copy_home_page_to_clipboard_command()
+
 
 ### main.py ends here

{oldnews-0.3.0/src/oldnews/sync → oldnews-0.4.0/src/oldnews}/sync.py

@@ -11,7 +11,7 @@ from typing import Any, Callable
 from oldas import ArticleIDs, Articles, Folders, Session, Subscriptions
 
 ##############################################################################
-from ..data import (
+from .data import (
     LocalUnread,
     get_local_unread,
     get_unread_article_ids,
@@ -71,10 +71,10 @@ class ToRSync:
 
     async def _download_newest_articles(self) -> None:
         """Download the latest articles available."""
+        new_grab = datetime.now(timezone.utc)
         last_grabbed = last_grabbed_data_at() or (
-            datetime.now() - timedelta(days=load_configuration().local_history)
+            new_grab - timedelta(days=load_configuration().local_history)
         )
-        new_grab = datetime.now(timezone.utc)
         loaded = 0
         async for article in Articles.stream_new_since(
             self.session, last_grabbed, n=10

{oldnews-0.3.0 → oldnews-0.4.0}/src/oldnews/widgets/navigation.py

@@ -238,6 +238,20 @@ class Navigation(EnhancedOptionList):
             return selected.subscription
         raise ValueError("Unknown category")
 
+    @property
+    def current_folder(self) -> Folder | None:
+        """The current folder, if one is highlighted, or `None`"""
+        if isinstance(current := self.current_category, Folder):
+            return current
+        return None
+
+    @property
+    def current_subscription(self) -> Subscription | None:
+        """The current subscription, if one is highlighted, or `None`."""
+        if isinstance(current := self.current_category, Subscription):
+            return current
+        return None
+
     def _highlight_unread(self, direction: HighlightDirection) -> bool:
         """Highlight the next category with unread articles, if there is one.
 

oldnews-0.3.0/src/oldnews/sync/__init__.py

@@ -1,11 +0,0 @@
-"""Code to sync the local data from TheOldReader."""
-
-##############################################################################
-# Local imports.
-from .sync import ToRSync
-
-##############################################################################
-# Exports.
-__all__ = ["ToRSync"]
-
-### __init__.py ends here