From 5541854089e65b68d756af13e73dc386eadae379 Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Tue, 21 Jun 2016 21:21:04 +0530 Subject: [PATCH 1/7] Bump version --- buku | 2 +- buku.1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buku b/buku index ae631c3..f8a460a 100755 --- a/buku +++ b/buku @@ -44,7 +44,7 @@ pipeargs = [] # Holds arguments piped to the program noninteractive = False # Show the prompt or not interrupted = False # Received SIGINT DELIMITER = ',' # Delimiter used to store tags in DB -_VERSION_ = '2.2' # Program version +_VERSION_ = '2.3' # Program version # Crypto globals diff --git a/buku.1 b/buku.1 index 1b6ef3f..92b34a8 100644 --- a/buku.1 +++ b/buku.1 @@ -1,4 +1,4 @@ -.TH "BUKU" "1" "Jun 2016" "Version 2.2" "User Commands" +.TH "BUKU" "1" "Jun 2016" "Version 2.3" "User Commands" .SH NAME buku \- A private command-line bookmark manager. Your mini web! .SH SYNOPSIS From 96e8a5a9d0689d04bbdc9af10a7b7b4d128499d4 Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Wed, 22 Jun 2016 20:17:33 +0530 Subject: [PATCH 2/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1b79829..a7e43f5 100644 --- a/README.md +++ b/README.md @@ -121,7 +121,7 @@ Please substitute `$version` with the appropriate package version. usage: buku [OPTIONS] [KEYWORD [KEYWORD ...]] - A private command-line bookmark manager. Your mini web! + A powerful command-line bookmark manager. Your mini web! general options: -a, --add URL [tags ...] From dcaed8422ed0856e805c0c4fc6038e09f403240e Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Wed, 22 Jun 2016 20:18:22 +0530 Subject: [PATCH 3/7] Update buku.1 --- buku.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buku.1 b/buku.1 index 92b34a8..5f40848 100644 --- a/buku.1 +++ b/buku.1 @@ -1,6 +1,6 @@ .TH "BUKU" "1" "Jun 2016" "Version 2.3" "User Commands" .SH NAME -buku \- A private command-line bookmark manager. Your mini web! +buku \- A powerful command-line bookmark manager. Your mini web! .SH SYNOPSIS .B buku [OPTIONS] [KEYWORD [KEYWORD ...]] .SH DESCRIPTION From b7b358c094bef9c48e49ada89804cc7f9eadf7de Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Wed, 22 Jun 2016 20:18:45 +0530 Subject: [PATCH 4/7] Update buku --- buku | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buku b/buku index f8a460a..60793dd 100755 --- a/buku +++ b/buku @@ -1454,7 +1454,7 @@ if __name__ == '__main__': # Setup custom argument parser argparser = ExtendedArgumentParser( - description='A private command-line bookmark manager. Your mini web!', + description='A powerful command-line bookmark manager. Your mini web!', formatter_class=argparse.RawTextHelpFormatter, usage='''buku [OPTIONS] [KEYWORD [KEYWORD ...]]''', add_help=False From 0b7cc736a37db248e6b102cb15102b1c81dc3de8 Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Thu, 23 Jun 2016 19:14:09 +0530 Subject: [PATCH 5/7] Update test_bukuDb.py --- tests/test_bukuDb.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_bukuDb.py b/tests/test_bukuDb.py index 2593498..f5e19c1 100644 --- a/tests/test_bukuDb.py +++ b/tests/test_bukuDb.py @@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# Unit test cases for buku # -*- coding: utf-8 -*- from genericpath import exists import imp From bce3bc9eefbf1d2b5cac82326bf705dc3b10d2a6 Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Sat, 25 Jun 2016 21:45:15 +0530 Subject: [PATCH 6/7] Remove leagacy DB file move logic. --- README.md | 1 - buku | 2 +- buku.1 | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index a7e43f5..8b81736 100644 --- a/README.md +++ b/README.md @@ -190,7 +190,6 @@ Please substitute `$version` with the appropriate package version. - **$XDG_DATA_HOME/buku/bookmarks.db**, if XDG_DATA_HOME is defined (first preference) or - **$HOME/.local/share/buku/bookmarks.db**, if HOME is defined (second preference) or - the **current directory**. -- Before version 1.9, buku stored its database in $HOME/.cache/buku/bookmarks.db. If the file exists, buku automatically moves it to new location. - It's advisable to copy URLs directly from the browser address bar, i.e., along with the leading `http://` or `https://` token. buku looks up title data (found within tags of HTML) from the web ONLY for fully-formed HTTP(S) URLs. - If the URL contains characters like `;`, `&` or brackets they may be interpreted specially by the shell. To avoid it, add the URL within single or double (`'`/`"`) quotes. - URLs are unique in DB. The same URL cannot be added twice. You can update tags and re-fetch title data. diff --git a/buku b/buku index 60793dd..a5ecb15 100755 --- a/buku +++ b/buku @@ -1583,7 +1583,7 @@ if __name__ == '__main__': print('Version %s' % _VERSION_) # Move pre-1.9 database to new location - BukuDb.move_legacy_dbfile() + #BukuDb.move_legacy_dbfile() # Handle encrypt/decrypt options at top priority if args.encrypt is not None: diff --git a/buku.1 b/buku.1 index 5f40848..9f3df50 100644 --- a/buku.1 +++ b/buku.1 @@ -13,8 +13,6 @@ The SQLite3 database file is stored in: - \fI$HOME/.local/share/buku/bookmarks.db\fR, if HOME is defined (second preference) or - the \fIcurrent directory\fR. .PP -Before version 1.9, buku stored its database in $HOME/.cache/buku/bookmarks.db. If the file exists, buku automatically moves it to new location. -.PP It's advisable to copy URLs directly from the browser address bar, i.e., along with the leading 'http://' or 'https://' token. buku looks up title data (found within tags of HTML) from the web ONLY for fully-formed HTTP(S) URLs. .PP If the URL contains characters like ';', '&' or brackets they may be interpreted specially by the shell. To avoid it, add the URL within single or double ('/") qoutes. From 293453c67065c337c73fd991eb8abffd1b32cf00 Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Tue, 28 Jun 2016 23:21:19 +0530 Subject: [PATCH 7/7] Fix spelling --- README.md | 2 +- buku.1 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8b81736..b205148 100644 --- a/README.md +++ b/README.md @@ -191,7 +191,7 @@ Please substitute `$version` with the appropriate package version. - **$HOME/.local/share/buku/bookmarks.db**, if HOME is defined (second preference) or - the **current directory**. - It's advisable to copy URLs directly from the browser address bar, i.e., along with the leading `http://` or `https://` token. buku looks up title data (found within tags of HTML) from the web ONLY for fully-formed HTTP(S) URLs. -- If the URL contains characters like `;`, `&` or brackets they may be interpreted specially by the shell. To avoid it, add the URL within single or double (`'`/`"`) quotes. +- If the URL contains characters like `;`, `&` or brackets they may be interpreted specially by the shell. To avoid it, add the URL within single or double quotes (`'`/`"`). - URLs are unique in DB. The same URL cannot be added twice. You can update tags and re-fetch title data. - **Tags**: - Comma (`,`) is the tag delimiter in DB. Any tag cannot have comma(s) in it. Tags are filtered (for unique tags) and sorted. diff --git a/buku.1 b/buku.1 index 9f3df50..9bd2a08 100644 --- a/buku.1 +++ b/buku.1 @@ -15,7 +15,7 @@ The SQLite3 database file is stored in: .PP It's advisable to copy URLs directly from the browser address bar, i.e., along with the leading 'http://' or 'https://' token. buku looks up title data (found within tags of HTML) from the web ONLY for fully-formed HTTP(S) URLs. .PP -If the URL contains characters like ';', '&' or brackets they may be interpreted specially by the shell. To avoid it, add the URL within single or double ('/") qoutes. +If the URL contains characters like ';', '&' or brackets they may be interpreted specially by the shell. To avoid it, add the URL within single or double quotes ('/"). .PP URLs are unique in DB. The same URL cannot be added twice. You can update tags and re-fetch title data. .PP @@ -92,12 +92,12 @@ Search bookmarks by tag. List all tags alphabetically, if no arguments. .BI \-l " " \--lock " [N]" Encrypt (lock) the DB file with .I N -(> 0, defualt 8) hash passes to generate key. +(> 0, default 8) hash passes to generate key. .TP .BI \-k " " \--unlock " [N]" Decrypt (unlock) the DB file with .I N -(> 0, defualt 8) hash passes to generate key. +(> 0, default 8) hash passes to generate key. .SH POWER OPTIONS .TP .BI \-p " " \--print " [N]"