pjht/buku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support tail-like behaviour with --print

Browse Source
This commit is contained in:
Arun Prakash Jana 2017-03-19 00:45:26 +05:30
parent 3545a4765e
commit ec8259d5a5
No known key found for this signature in database
GPG Key ID: A75979F35C080412
3 changed files with 77 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
README.md
View File

@ -204,7 +204,7 @@ POWER TOYS:
-m, --merge file add bookmarks from another buku DB file -m, --merge file add bookmarks from another buku DB file
-p, --print [...] show record details by indices, ranges -p, --print [...] show record details by indices, ranges
print all bookmarks, if no arguments print all bookmarks, if no arguments
-1 shows the bookmark with highest index -n shows the last n results (like tail)
-f, --format N limit fields in -p or Json search output -f, --format N limit fields in -p or Json search output
N=1: URL, N=2: URL and tag, N=3: title N=1: URL, N=2: URL and tag, N=3: title
-j, --json Json formatted output for -p and search -j, --json Json formatted output for -p and search
@ -451,34 +451,37 @@ NOTE: This flexibility is not exposed in the program.
23. **Show details** of bookmarks at index 15012014 and ranges 20-30, 40-50: 23. **Show details** of bookmarks at index 15012014 and ranges 20-30, 40-50:
$ buku -p 20-30 15012014 40-50 $ buku -p 20-30 15012014 40-50
24. **Show all** bookmarks with real index from database: 24. Show details of the **last 10 bookmarks**:
$ buku -p -10
25. **Show all** bookmarks with real index from database:
$ buku -p $ buku -p
$ buku -p | more $ buku -p | more
25. **Replace tag** 'old tag' with 'new tag': 26. **Replace tag** 'old tag' with 'new tag':
$ buku --replace 'old tag' 'new tag' $ buku --replace 'old tag' 'new tag'
26. **Delete tag** 'old tag' from DB: 27. **Delete tag** 'old tag' from DB:
$ buku --replace 'old tag' $ buku --replace 'old tag'
27. **Append (or delete) tags** 'tag 1', 'tag 2' to (or from) existing tags of bookmark at index 15012014: 28. **Append (or delete) tags** 'tag 1', 'tag 2' to (or from) existing tags of bookmark at index 15012014:
$ buku -u 15012014 --tag + tag 1, tag 2 $ buku -u 15012014 --tag + tag 1, tag 2
$ buku -u 15012014 --tag - tag 1, tag 2 $ buku -u 15012014 --tag - tag 1, tag 2
28. **Open URL** at index 15012014 in browser: 29. **Open URL** at index 15012014 in browser:
$ buku -o 15012014 $ buku -o 15012014
29. List bookmarks with **no title or tags** for bookkeeping: 30. List bookmarks with **no title or tags** for bookkeeping:
$ buku -S blank $ buku -S blank
30. List bookmarks with **immutable title**: 31. List bookmarks with **immutable title**:
$ buku -S immutable $ buku -S immutable
31. **Shorten URL** www.google.com and the URL at index 20: 32. **Shorten URL** www.google.com and the URL at index 20:
$ buku --shorten www.google.com $ buku --shorten www.google.com
$ buku --shorten 20 $ buku --shorten 20
32. More **help**: 33. More **help**:
$ buku -h $ buku -h
$ man buku $ man buku

26
buku.1
View File

@ -171,10 +171,10 @@ Import bookmarks exported from Firefox or Google Chrome as HTML.
is considered Markdown (compliant with --export format) if it has '.md' extension. is considered Markdown (compliant with --export format) if it has '.md' extension.
.TP .TP
.BI \-m " " \--merge " file" .BI \-m " " \--merge " file"
Add bookmarks from another Buku database file. Add bookmarks from another buku database file.
.TP .TP
.BI \-p " " \--print " [...]" .BI \-p " " \--print " [...]"
Show details (DB index, URL, title, tags and comment) of bookmark record by DB index. If no arguments, all records with actual index from DB are shown. Accepts hyphenated ranges and space-separated indices. Special index -1 (introduced for convenience) shows the details of the bookmark with the highest index. Show details (DB index, URL, title, tags and comment) of bookmark record by DB index. If no arguments, all records with actual index from DB are shown. Accepts hyphenated ranges and space-separated indices. A negative value (introduced for convenience) behaves like the tail utility, e.g., -n shows the details of the last n bookmarks.
.TP .TP
.BI \-f " " \--format " N" .BI \-f " " \--format " N"
Show selective monochrome output with specific fields. Works with --print. Search results honour the option when used along with --json. Useful for creating batch scripts. Show selective monochrome output with specific fields. Works with --print. Search results honour the option when used along with --json. Useful for creating batch scripts.
@ -522,6 +522,14 @@ The same number of iterations must be specified for one lock & unlock instance.
.EE .EE
.PP .PP
.IP 24. 4 .IP 24. 4
Show details of the \fBlast 10 bookmarks\fR:
.PP
.EX
.IP
.B buku -p -10
.EE
.PP
.IP 25. 4
\fBShow all\fR bookmarks with real index from database: \fBShow all\fR bookmarks with real index from database:
.PP .PP
.EX .EX
@ -530,7 +538,7 @@ The same number of iterations must be specified for one lock & unlock instance.
.B buku -p | more .B buku -p | more
.EE .EE
.PP .PP
.IP 25. 4 .IP 26. 4
\fBReplace tag\fR 'old tag' with 'new tag': \fBReplace tag\fR 'old tag' with 'new tag':
.PP .PP
.EX .EX
@ -538,7 +546,7 @@ The same number of iterations must be specified for one lock & unlock instance.
.B buku --replace 'old tag' 'new tag' .B buku --replace 'old tag' 'new tag'
.EE .EE
.PP .PP
.IP 26. 4 .IP 27. 4
\fBDelete tag\fR 'old tag' from DB: \fBDelete tag\fR 'old tag' from DB:
.PP .PP
.EX .EX
@ -546,7 +554,7 @@ The same number of iterations must be specified for one lock & unlock instance.
.B buku --replace 'old tag' .B buku --replace 'old tag'
.EE .EE
.PP .PP
.IP 27. 4 .IP 28. 4
\fBAppend (or delete) tags\fR 'tag 1', 'tag 2' to (or from) existing tags of bookmark at index 15012014: \fBAppend (or delete) tags\fR 'tag 1', 'tag 2' to (or from) existing tags of bookmark at index 15012014:
.PP .PP
.EX .EX
@ -555,7 +563,7 @@ The same number of iterations must be specified for one lock & unlock instance.
.B buku -u 15012014 --tag - tag 1, tag 2 .B buku -u 15012014 --tag - tag 1, tag 2
.EE .EE
.PP .PP
.IP 28. 4 .IP 29. 4
\fBOpen URL\fR at index 15012014 in browser: \fBOpen URL\fR at index 15012014 in browser:
.PP .PP
.EX .EX
@ -563,7 +571,7 @@ The same number of iterations must be specified for one lock & unlock instance.
.B buku -o 15012014 .B buku -o 15012014
.EE .EE
.PP .PP
.IP 29. 4 .IP 30. 4
List bookmarks with \fBno title or tags\fR for bookkeeping: List bookmarks with \fBno title or tags\fR for bookkeeping:
.PP .PP
.EX .EX
@ -571,7 +579,7 @@ List bookmarks with \fBno title or tags\fR for bookkeeping:
.B buku -S blank .B buku -S blank
.EE .EE
.PP .PP
.IP 30. 4 .IP 31. 4
List bookmarks with \fBimmutable title\fR: List bookmarks with \fBimmutable title\fR:
.PP .PP
.EX .EX
@ -579,7 +587,7 @@ List bookmarks with \fBimmutable title\fR:
.B buku -S immutable .B buku -S immutable
.EE .EE
.PP .PP
.IP 31. 4 .IP 32. 4
\fBShorten\fR the URL www.google.com and the URL at index 20: \fBShorten\fR the URL www.google.com and the URL at index 20:
.PP .PP
.EX .EX

77
buku.py
View File

@ -1158,21 +1158,24 @@ class BukuDb:
print('All bookmarks deleted') print('All bookmarks deleted')
return True return True
def print_rec(self, index): def print_rec(self, index, low=0, high=0, is_range=False):
'''Print bookmark details at index or all bookmarks if index is 0 '''Print bookmark details at index or all bookmarks if index is 0
Note: URL is printed on top because title may be blank Note: URL is printed on top because title may be blank
:param index: index to print, 0 prints all :param index: index to print, 0 prints all
:param low: actual lower index of range
:param high: actual higher index of range
:param is_range: a range is passed using low and high arguments
''' '''
if index != 0: # Show record at index if is_range:
# Show the last record if -1 is passed try:
if index == -1: query = 'SELECT * from bookmarks where id BETWEEN ? AND ?'
index = self.get_max_id() resultset = self.cur.execute(query, (low, high))
if index == -1: except IndexError:
logerr('Empty database') logerr('Index out of range')
return return
elif index != 0: # Show record at index
try: try:
query = 'SELECT * FROM bookmarks WHERE id = ? LIMIT 1' query = 'SELECT * FROM bookmarks WHERE id = ? LIMIT 1'
self.cur.execute(query, (index,)) self.cur.execute(query, (index,))
@ -1196,25 +1199,31 @@ class BukuDb:
print('%s\t%s' % (row[0], row[2])) print('%s\t%s' % (row[0], row[2]))
else: else:
print(format_json(results, True, self.field_filter)) print(format_json(results, True, self.field_filter))
return
else: # Show all entries else: # Show all entries
self.cur.execute('SELECT * FROM bookmarks') self.cur.execute('SELECT * FROM bookmarks')
resultset = self.cur.fetchall() resultset = self.cur.fetchall()
if not self.json: if not resultset:
if self.field_filter == 0: logerr('0 records')
for row in resultset: return
print_record(row)
elif self.field_filter == 1: if not self.json:
for row in resultset: if self.field_filter == 0:
print('%s\t%s' % (row[0], row[1])) for row in resultset:
elif self.field_filter == 2: print_record(row)
for row in resultset: elif self.field_filter == 1:
print('%s\t%s\t%s' % (row[0], row[1], row[3][1:-1])) for row in resultset:
elif self.field_filter == 3: print('%s\t%s' % (row[0], row[1]))
for row in resultset: elif self.field_filter == 2:
print('%s\t%s' % (row[0], row[2])) for row in resultset:
else: print('%s\t%s\t%s' % (row[0], row[1], row[3][1:-1]))
print(format_json(resultset, field_filter=self.field_filter)) elif self.field_filter == 3:
for row in resultset:
print('%s\t%s' % (row[0], row[2]))
else:
print(format_json(resultset, field_filter=self.field_filter))
def get_tag_all(self): def get_tag_all(self):
'''Get list of tags in DB '''Get list of tags in DB
@ -2633,7 +2642,7 @@ POSITIONAL ARGUMENTS:
-m, --merge file add bookmarks from another buku DB file -m, --merge file add bookmarks from another buku DB file
-p, --print [...] show record details by indices, ranges -p, --print [...] show record details by indices, ranges
print all bookmarks, if no arguments print all bookmarks, if no arguments
-1 shows the bookmark with highest index -n shows the last n results (like tail)
-f, --format N limit fields in -p or Json search output -f, --format N limit fields in -p or Json search output
N=1: URL, N=2: URL and tag, N=3: title N=1: URL, N=2: URL and tag, N=3: title
-j, --json Json formatted output for -p and search -j, --json Json formatted output for -p and search
@ -2959,17 +2968,25 @@ POSITIONAL ARGUMENTS:
else: else:
for idx in args.print: for idx in args.print:
if is_int(idx): if is_int(idx):
bdb.print_rec(int(idx)) id = int(idx)
if id >= 0:
bdb.print_rec(id)
else:
# Show the last n records
_id = bdb.get_max_id()
if _id == -1:
logerr('Empty database')
bdb.close_quit(1)
bdb.print_rec(0, 1 if _id <= -id else _id + id + 1,
_id, True)
elif ('-' in idx and is_int(idx.split('-')[0]) and elif ('-' in idx and is_int(idx.split('-')[0]) and
is_int(idx.split('-')[1])): is_int(idx.split('-')[1])):
lower = int(idx.split('-')[0]) lower = int(idx.split('-')[0])
upper = int(idx.split('-')[1]) upper = int(idx.split('-')[1])
if lower > upper: if lower > upper:
lower, upper = upper, lower lower, upper = upper, lower
for _id in range(lower, upper + 1):
bdb.print_rec(_id) bdb.print_rec(0, lower, upper, True)
elif idx == '-1':
bdb.print_rec(idx)
else: else:
logerr('Invalid index or range to print') logerr('Invalid index or range to print')
bdb.close_quit(1) bdb.close_quit(1)