diff options
Diffstat (limited to 'archivist/cli.py')
| -rw-r--r-- | archivist/cli.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/archivist/cli.py b/archivist/cli.py index 833cb80..1c13952 100644 --- a/archivist/cli.py +++ b/archivist/cli.py @@ -2,7 +2,7 @@ import click from functools import reduce import operator as op -from .prefixes import query_pseudo_prefix, is_pseudo_prefix +from .virtual_prefixes import query as query_virtual, is_virtual, register_prefixes CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help']) @@ -26,7 +26,6 @@ def db(): def init(): """Initialize the database, if not done already.""" from .model import create_tables, db - from .prefixes import register_prefixes create_tables() with db.atomic(): register_prefixes() @@ -114,11 +113,11 @@ class PrefixTag: return prefix_tag_name(self.tag, self.prefix) def is_virtual(self): - return self.prefix and is_pseudo_prefix(self.prefix) + return self.prefix and is_virtual(self.prefix) @property def virtual_query(self): - return query_pseudo_prefix(self.prefix, self.tag) + return query_virtual(self.prefix, self.tag) def __str__(self): return self.prefixed_name() @@ -256,12 +255,12 @@ def add_doc(file, tags, create_tags, ignore_missing_tags): def find_doc(tags): from .model import Document, DocumentTag, TagClosure, Tag - pseudo_tags = [] + virtual_tags = [] normal_tags = [] for t in tags: if t.is_virtual(): - pseudo_tags.append(t) + virtual_tags.append(t) else: normal_tags.append(t) @@ -279,8 +278,8 @@ def find_doc(tags): query = query.where(Document.id << tag_query) - if pseudo_tags: - query = query.where(reduce(op.and_, (p.virtual_query for p in pseudo_tags))) + if virtual_tags: + query = query.where(reduce(op.and_, (p.virtual_query for p in virtual_tags))) for doc in query.iterator(): print("* ID %d -- %s" % (doc.id, doc.original_path)) |