commit b4fed7139ef257995f19fd035dfb358eab3075f9 · anil.recoil.org/thicket

+23 -3

src/thicket/cli/commands/sync.py

···

       5
       5
        
       from typing import Optional

     

       6
       6
        
       

     

       7
       7
        
       import typer

     

       8
       8
       +
       from pydantic import HttpUrl

     

       8
       9
        
       from rich.progress import track

     

       9
       10
        
       

     

       10
       11
        
       from ...core.feed_parser import FeedParser

     

       11
       12
        
       from ...core.git_store import GitStore

     

       13
       13
       +
       from ...core.opml_generator import OPMLGenerator

     

       12
       14
        
       from ..main import app

     

       13
       15
        
       from ..utils import (

     

       14
       16
        
           load_config,

     
···

       97
       99
        
               git_store.commit_changes(commit_message)

     

       98
       100
        
               print_success(f"Committed changes: {commit_message}")

     

       99
       101
        
       

     

       102
       102
       +
           # Generate OPML file with all feeds

     

       103
       103
       +
           if not dry_run:

     

       104
       104
       +
               try:

     

       105
       105
       +
                   opml_generator = OPMLGenerator()

     

       106
       106
       +
                   index = git_store._load_index()

     

       107
       107
       +
                   opml_path = config.git_store / "index.opml"

     

       108
       108
       +
       

     

       109
       109
       +
                   opml_generator.generate_opml(

     

       110
       110
       +
                       users=index.users,

     

       111
       111
       +
                       title="Thicket Feed Collection",

     

       112
       112
       +
                       output_path=opml_path,

     

       113
       113
       +
                   )

     

       114
       114
       +
                   print_info(f"Generated OPML file: {opml_path}")

     

       115
       115
       +
       

     

       116
       116
       +
               except Exception as e:

     

       117
       117
       +
                   print_error(f"Failed to generate OPML file: {e}")

     

       118
       118
       +
       

     

       100
       119
        
           # Summary

     

       101
       120
        
           if dry_run:

     

       102
       121
        
               print_info(

     
···

       109
       128
        
       

     

       110
       129
        
       

     

       111
       130
        
       async def sync_feed(

     

       112
       112
       -
           git_store: GitStore, username: str, feed_url, dry_run: bool

     

       131
       131
       +
           git_store: GitStore, username: str, feed_url: str, dry_run: bool

     

       113
       132
        
       ) -> tuple[int, int]:

     

       114
       133
        
           """Sync a single feed for a user."""

     

       115
       134
        
       

     
···

       117
       136
        
       

     

       118
       137
        
           try:

     

       119
       138
        
               # Fetch and parse feed

     

       120
       120
       -
               content = await parser.fetch_feed(feed_url)

     

       121
       121
       -
               metadata, entries = parser.parse_feed(content, feed_url)

     

       139
       139
       +
               validated_feed_url = HttpUrl(feed_url)

     

       140
       140
       +
               content = await parser.fetch_feed(validated_feed_url)

     

       141
       141
       +
               metadata, entries = parser.parse_feed(content, validated_feed_url)

     

       122
       142
        
       

     

       123
       143
        
               new_entries = 0

     

       124
       144
        
               updated_entries = 0

+166

src/thicket/core/opml_generator.py

···

       1
       1
       +
       """OPML generation for thicket."""

     

       2
       2
       +
       

     

       3
       3
       +
       import xml.etree.ElementTree as ET

     

       4
       4
       +
       from datetime import datetime

     

       5
       5
       +
       from pathlib import Path

     

       6
       6
       +
       from typing import Optional

     

       7
       7
       +
       from xml.dom import minidom

     

       8
       8
       +
       

     

       9
       9
       +
       from ..models import UserMetadata

     

       10
       10
       +
       

     

       11
       11
       +
       

     

       12
       12
       +
       class OPMLGenerator:

     

       13
       13
       +
           """Generates OPML files from feed collections."""

     

       14
       14
       +
       

     

       15
       15
       +
           def __init__(self) -> None:

     

       16
       16
       +
               """Initialize the OPML generator."""

     

       17
       17
       +
               pass

     

       18
       18
       +
       

     

       19
       19
       +
           def generate_opml(

     

       20
       20
       +
               self,

     

       21
       21
       +
               users: dict[str, UserMetadata],

     

       22
       22
       +
               title: str = "Thicket Feeds",

     

       23
       23
       +
               output_path: Optional[Path] = None,

     

       24
       24
       +
           ) -> str:

     

       25
       25
       +
               """Generate OPML XML content from user metadata.

     

       26
       26
       +
       

     

       27
       27
       +
               Args:

     

       28
       28
       +
                   users: Dictionary of username -> UserMetadata

     

       29
       29
       +
                   title: Title for the OPML file

     

       30
       30
       +
                   output_path: Optional path to write the OPML file

     

       31
       31
       +
       

     

       32
       32
       +
               Returns:

     

       33
       33
       +
                   OPML XML content as string

     

       34
       34
       +
               """

     

       35
       35
       +
               # Create root OPML element

     

       36
       36
       +
               opml = ET.Element("opml", version="2.0")

     

       37
       37
       +
       

     

       38
       38
       +
               # Create head section

     

       39
       39
       +
               head = ET.SubElement(opml, "head")

     

       40
       40
       +
               title_elem = ET.SubElement(head, "title")

     

       41
       41
       +
               title_elem.text = title

     

       42
       42
       +
       

     

       43
       43
       +
               date_created = ET.SubElement(head, "dateCreated")

     

       44
       44
       +
               date_created.text = datetime.now().strftime("%a, %d %b %Y %H:%M:%S %z")

     

       45
       45
       +
       

     

       46
       46
       +
               date_modified = ET.SubElement(head, "dateModified")

     

       47
       47
       +
               date_modified.text = datetime.now().strftime("%a, %d %b %Y %H:%M:%S %z")

     

       48
       48
       +
       

     

       49
       49
       +
               # Create body section

     

       50
       50
       +
               body = ET.SubElement(opml, "body")

     

       51
       51
       +
       

     

       52
       52
       +
               # Add each user as an outline with their feeds as sub-outlines

     

       53
       53
       +
               for username, user_metadata in sorted(users.items()):

     

       54
       54
       +
                   user_outline = ET.SubElement(body, "outline")

     

       55
       55
       +
                   user_outline.set("text", user_metadata.display_name or username)

     

       56
       56
       +
                   user_outline.set("title", user_metadata.display_name or username)

     

       57
       57
       +
       

     

       58
       58
       +
                   # Add user metadata as attributes if available

     

       59
       59
       +
                   if user_metadata.homepage:

     

       60
       60
       +
                       user_outline.set("htmlUrl", user_metadata.homepage)

     

       61
       61
       +
                   if user_metadata.email:

     

       62
       62
       +
                       user_outline.set("email", user_metadata.email)

     

       63
       63
       +
       

     

       64
       64
       +
                   # Add each feed as a sub-outline

     

       65
       65
       +
                   for feed_url in sorted(user_metadata.feeds):

     

       66
       66
       +
                       feed_outline = ET.SubElement(user_outline, "outline")

     

       67
       67
       +
                       feed_outline.set("type", "rss")

     

       68
       68
       +
                       feed_outline.set("text", feed_url)

     

       69
       69
       +
                       feed_outline.set("title", feed_url)

     

       70
       70
       +
                       feed_outline.set("xmlUrl", feed_url)

     

       71
       71
       +
                       feed_outline.set("htmlUrl", feed_url)

     

       72
       72
       +
       

     

       73
       73
       +
               # Convert to pretty-printed XML string

     

       74
       74
       +
               xml_str = self._prettify_xml(opml)

     

       75
       75
       +
       

     

       76
       76
       +
               # Write to file if path provided

     

       77
       77
       +
               if output_path:

     

       78
       78
       +
                   output_path.write_text(xml_str, encoding="utf-8")

     

       79
       79
       +
       

     

       80
       80
       +
               return xml_str

     

       81
       81
       +
       

     

       82
       82
       +
           def _prettify_xml(self, elem: ET.Element) -> str:

     

       83
       83
       +
               """Return a pretty-printed XML string for the Element."""

     

       84
       84
       +
               rough_string = ET.tostring(elem, encoding="unicode")

     

       85
       85
       +
               reparsed = minidom.parseString(rough_string)

     

       86
       86
       +
               return reparsed.toprettyxml(indent="  ")

     

       87
       87
       +
       

     

       88
       88
       +
           def generate_flat_opml(

     

       89
       89
       +
               self,

     

       90
       90
       +
               users: dict[str, UserMetadata],

     

       91
       91
       +
               title: str = "Thicket Feeds (Flat)",

     

       92
       92
       +
               output_path: Optional[Path] = None,

     

       93
       93
       +
           ) -> str:

     

       94
       94
       +
               """Generate a flat OPML file with all feeds at the top level.

     

       95
       95
       +
       

     

       96
       96
       +
               This format may be more compatible with some feed readers.

     

       97
       97
       +
       

     

       98
       98
       +
               Args:

     

       99
       99
       +
                   users: Dictionary of username -> UserMetadata

     

       100
       100
       +
                   title: Title for the OPML file

     

       101
       101
       +
                   output_path: Optional path to write the OPML file

     

       102
       102
       +
       

     

       103
       103
       +
               Returns:

     

       104
       104
       +
                   OPML XML content as string

     

       105
       105
       +
               """

     

       106
       106
       +
               # Create root OPML element

     

       107
       107
       +
               opml = ET.Element("opml", version="2.0")

     

       108
       108
       +
       

     

       109
       109
       +
               # Create head section

     

       110
       110
       +
               head = ET.SubElement(opml, "head")

     

       111
       111
       +
               title_elem = ET.SubElement(head, "title")

     

       112
       112
       +
               title_elem.text = title

     

       113
       113
       +
       

     

       114
       114
       +
               date_created = ET.SubElement(head, "dateCreated")

     

       115
       115
       +
               date_created.text = datetime.now().strftime("%a, %d %b %Y %H:%M:%S %z")

     

       116
       116
       +
       

     

       117
       117
       +
               date_modified = ET.SubElement(head, "dateModified")

     

       118
       118
       +
               date_modified.text = datetime.now().strftime("%a, %d %b %Y %H:%M:%S %z")

     

       119
       119
       +
       

     

       120
       120
       +
               # Create body section

     

       121
       121
       +
               body = ET.SubElement(opml, "body")

     

       122
       122
       +
       

     

       123
       123
       +
               # Collect all feeds with their associated user info

     

       124
       124
       +
               all_feeds = []

     

       125
       125
       +
               for username, user_metadata in users.items():

     

       126
       126
       +
                   for feed_url in user_metadata.feeds:

     

       127
       127
       +
                       all_feeds.append(

     

       128
       128
       +
                           {

     

       129
       129
       +
                               "url": feed_url,

     

       130
       130
       +
                               "username": username,

     

       131
       131
       +
                               "display_name": user_metadata.display_name or username,

     

       132
       132
       +
                               "homepage": user_metadata.homepage,

     

       133
       133
       +
                           }

     

       134
       134
       +
                       )

     

       135
       135
       +
       

     

       136
       136
       +
               # Sort feeds by URL for consistency

     

       137
       137
       +
               all_feeds.sort(key=lambda f: f["url"] or "")

     

       138
       138
       +
       

     

       139
       139
       +
               # Add each feed as a top-level outline

     

       140
       140
       +
               for feed_info in all_feeds:

     

       141
       141
       +
                   feed_outline = ET.SubElement(body, "outline")

     

       142
       142
       +
                   feed_outline.set("type", "rss")

     

       143
       143
       +
       

     

       144
       144
       +
                   # Create a descriptive title that includes the user

     

       145
       145
       +
                   title_text = f"{feed_info['display_name']}: {feed_info['url']}"

     

       146
       146
       +
                   feed_outline.set("text", title_text)

     

       147
       147
       +
                   feed_outline.set("title", title_text)

     

       148
       148
       +
                   url = feed_info["url"] or ""

     

       149
       149
       +
                   feed_outline.set("xmlUrl", url)

     

       150
       150
       +
                   homepage_url = feed_info.get("homepage") or url

     

       151
       151
       +
                   feed_outline.set("htmlUrl", homepage_url or "")

     

       152
       152
       +
       

     

       153
       153
       +
                   # Add custom attributes for user info

     

       154
       154
       +
                   feed_outline.set("thicketUser", feed_info["username"] or "")

     

       155
       155
       +
                   homepage = feed_info.get("homepage")

     

       156
       156
       +
                   if homepage:

     

       157
       157
       +
                       feed_outline.set("thicketHomepage", homepage)

     

       158
       158
       +
       

     

       159
       159
       +
               # Convert to pretty-printed XML string

     

       160
       160
       +
               xml_str = self._prettify_xml(opml)

     

       161
       161
       +
       

     

       162
       162
       +
               # Write to file if path provided

     

       163
       163
       +
               if output_path:

     

       164
       164
       +
                   output_path.write_text(xml_str, encoding="utf-8")

     

       165
       165
       +
       

     

       166
       166
       +
               return xml_str