Skip to content

add regex search option #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mariotti wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add regex search option #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions bm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Usage: bm [options] [-r] URL TAG...
bm [options] URL
bm [options] -i SOURCE...
bm [options] -t
bm [options] -s TRE

Arguments:
URL The url to bookmark
Expand All @@ -38,6 +39,7 @@ Arguments:
comming from the standard input.
TAG The tags to use with the url.
SOURCE When uniting, the paths to the source files.
TRE Tag RegEx to search for tags.

Options:
-h, --help Print this help and exit
Expand All @@ -51,6 +53,7 @@ Options:
-t, --tags List every tag present in the database
with how many times it is used.
Output is sorted from the least to the most used
-s, --searchtag TRE Search tags using regex
-i, --import Import bookmarks from sources into the database.
-c, --clean Clean database on loading, removing duplicates
-n, --no-path-subs Disable file path substitution
Expand All @@ -61,6 +64,7 @@ Options:
VERSION = "1.6.1"

import os
import re
from docopt import docopt
from msgpack import dump, load
from msgpack.exceptions import UnpackValueError, ExtraData
Expand Down Expand Up @@ -127,6 +131,25 @@ def list_every_tags(database):
return ((t, x) for x,t in counter.items())


def search_tag(database, tre):
"""
Returns the list of any tags present in `database'
matching the regular expression TRE.
"""

from collections import Counter

trec = re.compile(tre)

counter = Counter()
for tags in database.values():
for tag in tags:
if trec.search(tag):
counter.update((tag, ))

return ((t, x) for x,t in counter.items())


## Database file Input/Output

def import_db(database, d_paths):
Expand Down Expand Up @@ -287,6 +310,11 @@ def manage_urls(urls, tags, d_file, database, args):
remove(database, url, tags)
dump_db(database, d_file)

elif args["--searchtag"]:
tre = args["--searchtag"]
for num, tag in sorted(search_tag(database, tre)):
print("%s %s" % (tag, num))

elif args["--tags"]:
for num, tag in sorted(list_every_tags(database)):
print("%s %s" % (tag, num))
Expand Down