diff --git a/CHANGELOG b/CHANGELOG index cdf3c4e..42a55f6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,14 @@ +Buku v4.1 +2019-01-15 + +What's in? +- Import firefox-exported json +- Fix auto-import for firefox +- Fix write to GNU Screen paste buffer +- Some CVE fixes + +------------------------------------------------------------------------------- + Buku v4.0 2018-11-01 diff --git a/README.md b/README.md index e13439e..60f73d6 100644 --- a/README.md +++ b/README.md @@ -225,10 +225,8 @@ POWER TOYS: format: *[[url][title]], 1 entry per line export buku DB, if file ends with '.db' combines with search results, if opted - -i, --import file import bookmarks HTML in Firefox format - import Markdown, if file ends with '.md' - import Orgfile, if file ends with '.org' - import buku DB, if file ends with '.db' + -i, --import file import bookmarks based on file extension + supports 'html', 'json', 'md', 'org', 'db' -p, --print [...] show record details by indices, ranges print all bookmarks, if no arguments -n shows the last n results (like tail) diff --git a/buku b/buku index 679707a..f1d99c8 100755 --- a/buku +++ b/buku @@ -46,7 +46,7 @@ import urllib3 from urllib3.exceptions import LocationParseError from urllib3.util import parse_url, make_headers -__version__ = '4.0' +__version__ = '4.1' __author__ = 'Arun Prakash Jana ' __license__ = 'GPLv3' @@ -4784,10 +4784,8 @@ POSITIONAL ARGUMENTS: format: *[[url][title]], 1 entry per line export buku DB, if file ends with '.db' combines with search results, if opted - -i, --import file import bookmarks HTML in Firefox format - import Markdown, if file ends with '.md' - import Orgfile, if file ends with '.org' - import buku DB, if file ends with '.db' + -i, --import file import bookmarks based on file extension + supports 'html', 'json', 'md', 'org', 'db' -p, --print [...] show record details by indices, ranges print all bookmarks, if no arguments -n shows the last n results (like tail) diff --git a/buku.1 b/buku.1 index 39b8ae8..cdf44cb 100644 --- a/buku.1 +++ b/buku.1 @@ -1,4 +1,4 @@ -.TH "BUKU" "1" "01 Nov 2018" "Version 4.0" "User Commands" +.TH "BUKU" "1" "15 Jan 2019" "Version 4.1" "User Commands" .SH NAME buku \- Bookmark manager like a text-based mini-web .SH SYNOPSIS @@ -80,7 +80,7 @@ Bookmarks with immutable titles are listed with '(L)' after the title. - URLs starting with `place:`, `file://` and `apt:` are ignored during import. - Parent folder (and subfolder) names are automatically imported as tags if --tacit is used. - Tags are merged even if bookmark URL exists when --tacit is used. - - An auto-generated tag in the format 'YYYYMonDD' is added if --tacit is not used in HTML, Markdown or Orgfile import. + - An auto-generated tag in the format 'YYYYMonDD' is added if --tacit is not used in HTML, JSON, Markdown or Orgfile import. .PP .IP 10. 4 \fBEncryption\fR is optional and manual. AES256 algorithm is used. To use encryption, the database file should be unlocked (-k) before using \fBbuku\fR and locked (-l) afterwards. Between these 2 operations, the database file lies unencrypted on the disk, and NOT in memory. Also, note that the database file is \fBunencrypted on creation\fR. @@ -205,7 +205,7 @@ has extension '.db'. .BI \-i " " \--import " file" Import bookmarks from Firefox bookmarks formatted HTML. .I file -is considered Markdown (compliant with --export format) if it has '.md' extension, Orgfile if the extension is '.org' or another buku database if the extension is '.db'. +is considered Firefox-exported JSON if it has '.md' extension, Markdown (compliant with --export format) if it is '.md', Orgfile if the extension is '.org' or another buku database if the extension is '.db'. .TP .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. A negative value (introduced for convenience) behaves like the tail utility, e.g., -n shows the details of the last n bookmarks. diff --git a/packagecore.yaml b/packagecore.yaml index 8239415..a940433 100644 --- a/packagecore.yaml +++ b/packagecore.yaml @@ -16,6 +16,7 @@ packages: - python-certifi - python-cryptography - python-urllib3 + container: "base/archlinux" # centos no beautifulsoup4 centos7.3: builddeps: @@ -74,6 +75,15 @@ packages: - python3-certifi - python3-cryptography - python3-urllib3 + fedora29: + builddeps: + - make + deps: + - python3 + - python3-beautifulsoup4 + - python3-certifi + - python3-cryptography + - python3-urllib3 opensuse42.3: builddeps: - make