oldnews 0.0.2__tar.gz → 0.1.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oldnews
-Version: 0.0.2
+Version: 0.1.0
 Summary: A terminal-based client for TheOldReader
 Keywords: atom,client,Google Reader,RSS,TheOldReader,terminal,news-reader,news
 Author: Dave Pearson
@@ -22,12 +22,12 @@ 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
-Project-URL: Discussions, https://github.com/davep/oldnews/discussions
-Project-URL: Documentation, https://oldnews.davep.dev/
 Project-URL: Homepage, https://github.com/davep/oldnews
-Project-URL: Issues, https://github.com/davep/oldnews/issues
 Project-URL: Repository, https://github.com/davep/oldnews
+Project-URL: Documentation, https://oldnews.davep.dev/
 Project-URL: Source, https://github.com/davep/oldnews
+Project-URL: Issues, https://github.com/davep/oldnews/issues
+Project-URL: Discussions, https://github.com/davep/oldnews/discussions
 Description-Content-Type: text/markdown
 
 # OldNews - A TheOldReader client for the terminal

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

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

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

@@ -4,8 +4,11 @@
 # Local imports.
 from .main import (
     Escape,
+    MarkAllRead,
+    Next,
     NextUnread,
     OpenArticle,
+    Previous,
     PreviousUnread,
     RefreshFromTheOldReader,
     ToggleShowAll,
@@ -15,8 +18,11 @@ from .main import (
 # Exports.
 __all__ = [
     "Escape",
+    "MarkAllRead",
+    "Next",
     "NextUnread",
     "OpenArticle",
+    "Previous",
     "PreviousUnread",
     "RefreshFromTheOldReader",
     "ToggleShowAll",

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

@@ -35,6 +35,13 @@ class NextUnread(Command):
     BINDING_KEY = "n"
 
 
+##############################################################################
+class Next(Command):
+    """Navigate to the next article regardless of read status"""
+
+    BINDING_KEY = "N"
+
+
 ##############################################################################
 class PreviousUnread(Command):
     """Navigate to the previous unread article in the currently-selected category"""
@@ -42,6 +49,13 @@ class PreviousUnread(Command):
     BINDING_KEY = "p"
 
 
+##############################################################################
+class Previous(Command):
+    """Navigate to the next article regardless of read status"""
+
+    BINDING_KEY = "P"
+
+
 ##############################################################################
 class OpenArticle(Command):
     """Open the current article in the web browser"""
@@ -49,4 +63,11 @@ class OpenArticle(Command):
     BINDING_KEY = "o"
 
 
+##############################################################################
+class MarkAllRead(Command):
+    """Mark all unread articles in the current category as read"""
+
+    BINDING_KEY = "R"
+
+
 ### main.py ends here

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

@@ -14,8 +14,11 @@ from textual_enhanced.commands import (
 # Local imports.
 from ..commands import (
     Escape,
+    MarkAllRead,
+    Next,
     NextUnread,
     OpenArticle,
+    Previous,
     PreviousUnread,
     RefreshFromTheOldReader,
     ToggleShowAll,
@@ -33,9 +36,12 @@ class MainCommands(CommandsProvider):
             The commands for the command palette.
         """
         yield Escape()
+        yield from self.maybe(Next)
         yield from self.maybe(NextUnread)
+        yield from self.maybe(Previous)
         yield from self.maybe(PreviousUnread)
         yield from self.maybe(OpenArticle)
+        yield from self.maybe(MarkAllRead)
         yield ToggleShowAll()
         yield RefreshFromTheOldReader()
         yield ChangeTheme()

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

@@ -15,6 +15,7 @@ from oldas import (
     Folder,
     Folders,
     Session,
+    State,
     Subscription,
     Subscriptions,
 )
@@ -31,6 +32,7 @@ from textual.widgets import Footer, Header
 ##############################################################################
 # Textual enhanced imports.
 from textual_enhanced.commands import ChangeTheme, Command, Help, Quit
+from textual_enhanced.dialogs import Confirm
 from textual_enhanced.screen import EnhancedScreen
 
 ##############################################################################
@@ -38,8 +40,11 @@ from textual_enhanced.screen import EnhancedScreen
 from .. import __version__
 from ..commands import (
     Escape,
+    MarkAllRead,
+    Next,
     NextUnread,
     OpenArticle,
+    Previous,
     PreviousUnread,
     RefreshFromTheOldReader,
     ToggleShowAll,
@@ -134,7 +139,10 @@ class Main(EnhancedScreen[None]):
         RefreshFromTheOldReader,
         # Everything else.
         Escape,
+        MarkAllRead,
+        Next,
         NextUnread,
+        Previous,
         PreviousUnread,
         OpenArticle,
         ChangeTheme,
@@ -230,7 +238,13 @@ class Main(EnhancedScreen[None]):
             return True
         if action == OpenArticle.action_name():
             return self.article is not None
-        if action in (NextUnread.action_name(), PreviousUnread.action_name()):
+        if action in (Next.action_name(), Previous.action_name()):
+            return self.articles is not None
+        if action in (
+            NextUnread.action_name(),
+            PreviousUnread.action_name(),
+            MarkAllRead.action_name(),
+        ):
             return self.articles is not None and any(
                 article.is_unread for article in self.articles
             )
@@ -336,12 +350,10 @@ class Main(EnhancedScreen[None]):
         self.post_message(self.SubTitle("Comparing against locally-read articles"))
         local_unread_articles = set(get_unread_article_ids())
         if mark_as_read := local_unread_articles - remote_unread_articles:
-            self.post_message(
-                self.SubTitle(
-                    f"Articles found read elsewhere on TheOldReader: {len(mark_as_read)}"
-                )
-            )
             locally_mark_article_ids_read(mark_as_read)
+            self.notify(
+                f"Articles found read elsewhere on TheOldReader: {len(mark_as_read)}"
+            )
 
     @on(RefreshFromTheOldReader)
     @work(exclusive=True)
@@ -459,19 +471,33 @@ class Main(EnhancedScreen[None]):
         elif self.focused is self.query_one(Navigation):
             self.app.exit()
 
+    def action_next_command(self) -> None:
+        """Go to the next article in the currently-viewed category."""
+        if self.article is None:
+            self.query_one(ArticleList).highlight_next_article()
+        else:
+            self.query_one(ArticleList).select_next_article()
+
+    def action_previous_command(self) -> None:
+        """Go to the previous article in the currently-viewed category."""
+        if self.article is None:
+            self.query_one(ArticleList).highlight_previous_article()
+        else:
+            self.query_one(ArticleList).select_previous_article()
+
     def action_next_unread_command(self) -> None:
         """Go to the next unread article in the currently-viewed category."""
         if self.article is None:
-            self.query_one(ArticleList).highlight_next_unread()
+            self.query_one(ArticleList).highlight_next_unread_article()
         else:
-            self.query_one(ArticleList).select_next_unread()
+            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:
-            self.query_one(ArticleList).highlight_previous_unread()
+            self.query_one(ArticleList).highlight_previous_unread_article()
         else:
-            self.query_one(ArticleList).select_previous_unread()
+            self.query_one(ArticleList).select_previous_unread_article()
 
     def action_open_article_command(self) -> None:
         """Open the current article in a web browser."""
@@ -485,5 +511,40 @@ class Main(EnhancedScreen[None]):
                     title="Can't visit",
                 )
 
+    @work
+    async def action_mark_all_read_command(self) -> None:
+        """Mark all unread articles in the current category as read."""
+        if (current_category := self.query_one(Navigation).current_category) is None:
+            return
+        if not (
+            ids_to_mark_read := [
+                article.id for article in self.articles if article.is_unread
+            ]
+        ):
+            return
+        category_description = f"{current_category.__class__.__name__.lower()} '{current_category.name if isinstance(current_category, Folder) else current_category.title}'"
+        plural = "s" if len(ids_to_mark_read) > 1 else ""
+        if await self.app.push_screen_wait(
+            Confirm(
+                "Mark all read",
+                f"Are you sure you want to mark all unread articles in the {category_description} as read?\n\n"
+                f"This will mark {len(ids_to_mark_read)} article{plural} as read.",
+            )
+        ):
+            if await self._session.add_tag(ids_to_mark_read, State.READ):
+                locally_mark_article_ids_read(ids_to_mark_read)
+                self.post_message(
+                    self.NewUnread(get_local_unread(self.folders, self.subscriptions))
+                )
+                self._refresh_article_list()
+                self.notify(
+                    f"{len(ids_to_mark_read)} article{plural} marked read for {category_description}"
+                )
+            else:
+                self.notify(
+                    "Failed to mark as read on TheOldReader",
+                    severity="error",
+                )
+
 
 ### main.py ends here

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

@@ -185,20 +185,38 @@ class ArticleList(EnhancedOptionList):
         self.notify("No more unread articles")
         return False
 
-    def highlight_next_unread(self) -> None:
+    def highlight_next_article(self) -> None:
+        """Highlight the next article in the list."""
+        self.call_later(self.run_action, "cursor_down")
+
+    def highlight_previous_article(self) -> None:
+        """Highlight the previous article in the list."""
+        self.call_later(self.run_action, "cursor_up")
+
+    def highlight_next_unread_article(self) -> None:
         """Highlight the next unread article in the list."""
         self._highlight_unread("next")
 
-    def highlight_previous_unread(self) -> None:
+    def highlight_previous_unread_article(self) -> None:
         """Highlight the previous unread article in the list."""
         self._highlight_unread("previous")
 
-    def select_next_unread(self) -> None:
+    def select_next_article(self) -> None:
+        """Select the next article in the list."""
+        self.call_later(self.run_action, "cursor_down")
+        self.call_later(self.run_action, "select")
+
+    def select_previous_article(self) -> None:
+        """Select the previous article in the list."""
+        self.call_later(self.run_action, "cursor_up")
+        self.call_later(self.run_action, "select")
+
+    def select_next_unread_article(self) -> None:
         """Select the next unread article in the list."""
         if self._highlight_unread("next"):
             self.call_later(self.run_action, "select")
 
-    def select_previous_unread(self) -> None:
+    def select_previous_unread_article(self) -> None:
         """Select the next unread article in the list."""
         if self._highlight_unread("previous"):
             self.call_later(self.run_action, "select")