scip/anydb
1
0
Fork 0
mirror of https://codeberg.org/scip/anydb.git synced 2025-12-17 04:20:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed copylocks linter warning

Browse Source
This commit is contained in:
Thomas von Dein
2024-12-30 12:23:13 +01:00
parent 1eb5efae0c
commit 659e3472bb
5 changed files with 44 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
anydb.1
View File

@@ -409,6 +409,10 @@ features.
.PP .PP
If you want to search case insensitive, add the option \f(CW\*(C`\-i\*(C'\fR. If you want to search case insensitive, add the option \f(CW\*(C`\-i\*(C'\fR.
.PP .PP
By default anydb only searches through the keys. If you want to search
through the values as well, then use the \f(CW\*(C`\-s\*(C'\fR option, which enables
full-text search.
.PP
You can \- as with the \fBget\fR command \- use other output modes. The You can \- as with the \fBget\fR command \- use other output modes. The
default mode is \*(L"table\*(R". The \*(L"wide\*(R" mode is, as already mentioned, a default mode is \*(L"table\*(R". The \*(L"wide\*(R" mode is, as already mentioned, a
more detailed table. Also supported is \*(L"json\*(R" mode and \*(L"template\*(R" more detailed table. Also supported is \*(L"json\*(R" mode and \*(L"template\*(R"
@@ -478,7 +482,7 @@ Usage:
.PP .PP
.Vb 2 .Vb 2
\& Usage: \& Usage:
\& anydb export [\-o <json filename>] [flags] \& anydb export \-o <json filename> [flags]
\& \&
\& Aliases: \& Aliases:
\& export, dump, backup \& export, dump, backup
@@ -488,13 +492,13 @@ Usage:
\& \-o, \-\-output string output to file \& \-o, \-\-output string output to file
.Ve .Ve
.PP .PP
The database dump is a \s-1JSON\s0 representation of the whole database and The database dump is a \s-1JSON\s0 representation of the whole database and
will be printed to \s-1STDOUT\s0 by default. Redirect it to a file or use the will be printed to the file specified with the \f(CW\*(C`\-o\*(C'\fR option. If you
\&\f(CW\*(C`\-o\*(C'\fR option: specify \*(L"\-\*(R" as the filename, it will be written to \s-1STDIN.\s0
.PP .PP
.Vb 2 .Vb 2
\& anydb export > dump.json
\& anydb export \-o dump.json \& anydb export \-o dump.json
\& anydb export \-o \- > dump.json
.Ve .Ve
.PP .PP
Please note, that encrypted values will not be decrypted. This might Please note, that encrypted values will not be decrypted. This might
@@ -508,7 +512,7 @@ Usage:
.PP .PP
.Vb 2 .Vb 2
\& Usage: \& Usage:
\& anydb import [<json file>] [flags] \& anydb import \-i <json file> [flags]
\& \&
\& Aliases: \& Aliases:
\& import, restore \& import, restore
@@ -519,13 +523,14 @@ Usage:
\& \-t, \-\-tags stringArray tags, multiple allowed \& \-t, \-\-tags stringArray tags, multiple allowed
.Ve .Ve
.PP .PP
By default the \f(CW\*(C`import\*(C'\fR subcommand reads the \s-1JSON\s0 contents from The \f(CW\*(C`import\*(C'\fR subcommand reads the \s-1JSON\s0 contents from
\&\s-1STDIN.\s0 You might pipe the dump into it or use the option \f(CW\*(C`\-r\*(C'\fR: the file specified with the \f(CW\*(C`\-i\*(C'\fR option. If you specify \*(L"\-\*(R" as the
filename, it will be read from \s-1STDIN.\s0
.PP .PP
.Vb 3 .Vb 3
\& anydb import < dump.json \& anydb import \-i \- < dump.json
\& anydb import \-r dump.json \& anydb import \-i dump.json
\& cat dump.json | anydb import \& cat dump.json | anydb import \-i \-
.Ve .Ve
.PP .PP
If there is already a database, it will be saved by appending a If there is already a database, it will be saved by appending a

9
app/db.go
View File

@@ -53,7 +53,7 @@ type DbInfo struct {
Path string Path string
} }
type DbEntries []DbEntry type DbEntries []*DbEntry
type DbTag struct { type DbTag struct {
Keys []string `json:"key"` Keys []string `json:"key"`
@@ -154,7 +154,7 @@ func (db *DB) List(attr *DbAttr, fulltext bool) (DbEntries, error) {
} }
if include { if include {
entries = append(entries, entry) entries = append(entries, &entry)
} }
return nil return nil
@@ -162,6 +162,7 @@ func (db *DB) List(attr *DbAttr, fulltext bool) (DbEntries, error) {
return err return err
}) })
return entries, err return entries, err
} }
@@ -392,7 +393,7 @@ func (db *DB) Import(attr *DbAttr) (string, error) {
} }
for _, entry := range entries { for _, entry := range entries {
pbentry, err := proto.Marshal(&entry) pbentry, err := proto.Marshal(entry)
if err != nil { if err != nil {
return fmt.Errorf("failed to marshall protobuf: %w", err) return fmt.Errorf("failed to marshall protobuf: %w", err)
} }
@@ -514,7 +515,7 @@ func (db *DB) Getall(attr *DbAttr) (DbEntries, error) {
copy(vc, value) copy(vc, value)
entry.Value = vc entry.Value = vc
entries = append(entries, entry) entries = append(entries, &entry)
return nil return nil
}) })

25
cmd/anydb.go
View File

@@ -234,6 +234,10 @@ SUBCOMMANDS
If you want to search case insensitive, add the option "-i". If you want to search case insensitive, add the option "-i".
By default anydb only searches through the keys. If you want to search
through the values as well, then use the "-s" option, which enables
full-text search.
You can - as with the get command - use other output modes. The default You can - as with the get command - use other output modes. The default
mode is "table". The "wide" mode is, as already mentioned, a more mode is "table". The "wide" mode is, as already mentioned, a more
detailed table. Also supported is "json" mode and "template" mode. For detailed table. Also supported is "json" mode and "template" mode. For
@@ -293,7 +297,7 @@ SUBCOMMANDS
Usage: Usage:
Usage: Usage:
anydb export [-o <json filename>] [flags] anydb export -o <json filename> [flags]
Aliases: Aliases:
export, dump, backup export, dump, backup
@@ -303,11 +307,11 @@ SUBCOMMANDS
-o, --output string output to file -o, --output string output to file
The database dump is a JSON representation of the whole database and The database dump is a JSON representation of the whole database and
will be printed to STDOUT by default. Redirect it to a file or use the will be printed to the file specified with the "-o" option. If you
"-o" option: specify "-" as the filename, it will be written to STDIN.
anydb export > dump.json
anydb export -o dump.json anydb export -o dump.json
anydb export -o - > dump.json
Please note, that encrypted values will not be decrypted. This might Please note, that encrypted values will not be decrypted. This might
change in a future version of anydb. change in a future version of anydb.
@@ -319,7 +323,7 @@ SUBCOMMANDS
Usage: Usage:
Usage: Usage:
anydb import [<json file>] [flags] anydb import -i <json file> [flags]
Aliases: Aliases:
import, restore import, restore
@@ -329,12 +333,13 @@ SUBCOMMANDS
-h, --help help for import -h, --help help for import
-t, --tags stringArray tags, multiple allowed -t, --tags stringArray tags, multiple allowed
By default the "import" subcommand reads the JSON contents from STDIN. The "import" subcommand reads the JSON contents from the file specified
You might pipe the dump into it or use the option "-r": with the "-i" option. If you specify "-" as the filename, it will be
read from STDIN.
anydb import < dump.json anydb import -i - < dump.json
anydb import -r dump.json anydb import -i dump.json
cat dump.json | anydb import cat dump.json | anydb import -i -
If there is already a database, it will be saved by appending a If there is already a database, it will be saved by appending a
timestamp and a new database with the contents of the dump will be timestamp and a new database with the contents of the dump will be

8
cmd/extra.go
View File

@@ -56,7 +56,9 @@ func Export(conf *cfg.Config) *cobra.Command {
} }
cmd.PersistentFlags().StringVarP(&attr.File, "output-file", "o", "", "filename or - for STDIN") cmd.PersistentFlags().StringVarP(&attr.File, "output-file", "o", "", "filename or - for STDIN")
cmd.MarkPersistentFlagRequired("output-file") if err := cmd.MarkPersistentFlagRequired("output-file"); err != nil {
panic(err)
}
cmd.Aliases = append(cmd.Aliases, "dump") cmd.Aliases = append(cmd.Aliases, "dump")
cmd.Aliases = append(cmd.Aliases, "backup") cmd.Aliases = append(cmd.Aliases, "backup")
@@ -88,8 +90,10 @@ func Import(conf *cfg.Config) *cobra.Command {
} }
cmd.PersistentFlags().StringVarP(&attr.File, "import-file", "i", "", "filename or - for STDIN") cmd.PersistentFlags().StringVarP(&attr.File, "import-file", "i", "", "filename or - for STDIN")
cmd.MarkPersistentFlagRequired("import-file")
cmd.PersistentFlags().StringArrayVarP(&attr.Tags, "tags", "t", nil, "tags, multiple allowed") cmd.PersistentFlags().StringArrayVarP(&attr.Tags, "tags", "t", nil, "tags, multiple allowed")
if err := cmd.MarkPersistentFlagRequired("import-file"); err != nil {
panic(err)
}
cmd.Aliases = append(cmd.Aliases, "restore") cmd.Aliases = append(cmd.Aliases, "restore")

4
output/single.go
View File

@@ -60,9 +60,9 @@ func Print(writer io.Writer, conf *cfg.Config, attr *app.DbAttr, entry *app.DbEn
fmt.Println(string(jsonentry)) fmt.Println(string(jsonentry))
case "wide": case "wide":
return ListTable(writer, conf, app.DbEntries{*entry}) return ListTable(writer, conf, app.DbEntries{entry})
case "template": case "template":
return ListTemplate(writer, conf, app.DbEntries{*entry}) return ListTemplate(writer, conf, app.DbEntries{entry})
} }
return nil return nil