NPO-Accounting/conservancy_beancount Changeset - e79877ee6a3f

Changeset - e79877ee6a3f

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Brett Smith - 4 years ago 2020-04-28 14:48:10
brettcsmith@brettcsmith.org

data: Add rt-id to LINK_METADATA.

This gets closer to our real intentions: anything that checks link
metadata should check rt-id. MetaRepoLinks is the exception, not
the rule, in ignoring rt-id.

3 files changed with 4 insertions and 3 deletions:

conservancy_beancount/data.py

conservancy_beancount/plugin/meta_repo_links.py

conservancy_beancount/plugin/meta_rt_links.py

0 comments (0 inline, 0 general)

conservancy_beancount/data.py

➞

Show inline comments

@@ ... / @@ -47,24 +47,25 @@ from .beancount_types import ( @@
     Transaction,
+)
 DecimalCompat = Union[decimal.Decimal, int]
 LINK_METADATA = frozenset([
     'approval',
     'check',
     'contract',
     'invoice',
     'purchase-order',
     'receipt',
     'rt-id',
     'statement',
 ])
 class Account(str):
     """Account name string
     This is a string that names an account, like Assets:Bank:Checking
     or Income:Donations. This class provides additional methods for common
     account name parsing and queries.
     """
     __slots__ = ()

conservancy_beancount/plugin/meta_repo_links.py

➞

Show inline comments

@@ ... / @@ -25,39 +25,40 @@ from ..beancount_types import ( @@
     MetaValue,
     Posting,
     Transaction,
+)
 from typing import (
     MutableMapping,
     Optional,
+)
 class MetaRepoLinks(core.TransactionHook):
     HOOK_GROUPS = frozenset(['linkcheck'])
     LINK_METADATA = data.LINK_METADATA.difference('rt-id')
     PATH_PUNCT_RE = re.compile(r'[:/]')
     def __init__(self, config: configmod.Config) -> None:
         repo_path = config.repository_path()
         if repo_path is None:
             raise errormod.ConfigurationError("no repository configured")
         self.repo_path = repo_path
     def _check_links(self,
                      meta: MutableMapping[MetaKey, MetaValue],
                      txn: Transaction,
                      post: Optional[Posting]=None,
     ) -> errormod.Iter:
         metadata = data.Metadata(meta)
-        for key in data.LINK_METADATA:
+        for key in self.LINK_METADATA:
             try:
                 links = metadata.get_links(key)
             except TypeError:
                 yield errormod.InvalidMetadataError(txn, key, meta[key], post)
             else:
                 for link in links:
                     match = self.PATH_PUNCT_RE.search(link)
                     if match and match.group(0) == ':':
                         pass
                     elif not (self.repo_path / link).exists():
                         yield errormod.BrokenLinkError(txn, key, link)

conservancy_beancount/plugin/meta_rt_links.py

➞

Show inline comments

@@ ... / @@ -23,39 +23,38 @@ from ..beancount_types import ( @@
     MetaValue,
     Posting,
     Transaction,
+)
 from typing import (
     MutableMapping,
     Optional,
+)
 class MetaRTLinks(core.TransactionHook):
     HOOK_GROUPS = frozenset(['linkcheck', 'network', 'rt'])
     LINK_METADATA = data.LINK_METADATA.union(['rt-id'])
     def __init__(self, config: configmod.Config) -> None:
         rt_wrapper = config.rt_wrapper()
         if rt_wrapper is None:
             raise errormod.ConfigurationError("can't log in to RT")
         self.rt = rt_wrapper
     def _check_links(self,
                      meta: MutableMapping[MetaKey, MetaValue],
                      txn: Transaction,
                      post: Optional[Posting]=None,
     ) -> errormod.Iter:
         metadata = data.Metadata(meta)
-        for key in self.LINK_METADATA:
+        for key in data.LINK_METADATA:
             try:
                 links = metadata.get_links(key)
             except TypeError:
                 yield errormod.InvalidMetadataError(txn, key, meta[key], post)
             else:
                 for link in links:
                     if not link.startswith('rt:'):
                         continue
                     parsed = self.rt.parse(link)
                     if parsed is None or not self.rt.exists(*parsed):
                         yield errormod.BrokenRTLinkError(txn, key, link, parsed)

0 comments (0 inline, 0 general)