added --verbose

master
Sina Siadat 9 years ago
parent 8fd00b4699
commit 9159b170dc

@ -147,7 +147,9 @@ func cmdNew(db *sql.DB, opts Options) bool {
break break
} }
lines = append(lines, string(line)) lines = append(lines, string(line))
log.Printf("%s\n", prettyAttr("eton", string(line))) if opts.Verbose {
log.Printf("%s\n", prettyAttr("eton", string(line)))
}
} }
value_text = strings.Join(lines, "\n") value_text = strings.Join(lines, "\n")
} else if len(opts.Note) > 0 { } else if len(opts.Note) > 0 {
@ -160,7 +162,10 @@ func cmdNew(db *sql.DB, opts Options) bool {
value_text = readFile(f.Name()) value_text = readFile(f.Name())
} }
saveString(db, value_text) lastInsertId := saveString(db, value_text)
if lastInsertId > 0 && opts.Verbose {
fmt.Printf("New note ID:%d\n", lastInsertId)
}
return true return true
} }
@ -276,7 +281,7 @@ func cmdEdit(db *sql.DB, opts Options) bool {
totalUpdated += attr.Edit(db) totalUpdated += attr.Edit(db)
} }
if totalUpdated > 0 { if opts.Verbose {
fmt.Println(totalUpdated, "records updated") fmt.Println(totalUpdated, "records updated")
} }

@ -19,9 +19,9 @@ var pwd string
const dbfilename string = ".etondb" const dbfilename string = ".etondb"
const usage string = `Usage: const usage string = `Usage:
eton new [-|<note>] eton new [-|<note>] [-v]
eton (ls|grep) [<filters>...] [--offset OFFSET] [--limit LIMIT] [--removed-only] [--short] [--all] [--exec COMMAND] [--edit] [--list-files] [--after AFTER] eton (ls|grep) [<filters>...] [-Rsl] [-o OFFSET] [-L LIMIT] [--after AFTER]
eton edit [<ids>...] eton edit [<ids>...] [-v]
eton alias <id1> <id2> eton alias <id1> <id2>
eton unalias <alias> eton unalias <alias>
eton mark <ids>... eton mark <ids>...
@ -40,6 +40,8 @@ Options:
-r, --recursive recursive mode -r, --recursive recursive mode
-l, --list-files list items as filenames -l, --list-files list items as filenames
-s, --short short mode lists rows with aliases only -s, --short short mode lists rows with aliases only
-v, --verbose talk a lot
-R, --removed-only only list removed notes
` `
func main() { func main() {

@ -401,9 +401,7 @@ func (attr Attr) Edit(db *sql.DB) (rowsAffected int64) {
openEditor(filepath) openEditor(filepath)
value_text := readFile(filepath) value_text := readFile(filepath)
if value_text == attr.GetValue() { if value_text != attr.GetValue() {
fmt.Printf("Nothing changed for ID:%d\n", attr.GetID())
} else {
update_stmt, err := db.Prepare("UPDATE attributes SET value_text = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?") update_stmt, err := db.Prepare("UPDATE attributes SET value_text = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?")
check(err) check(err)
@ -411,7 +409,6 @@ func (attr Attr) Edit(db *sql.DB) (rowsAffected int64) {
check(err) check(err)
rowsAffected, err = result.RowsAffected() rowsAffected, err = result.RowsAffected()
check(err) check(err)
fmt.Printf("Updated ID:%d\n", attr.GetID())
} }
return return
} }
@ -672,17 +669,17 @@ func getLastAttrID(db *sql.DB) int64 {
return ID return ID
} }
func saveString(db *sql.DB, value_text string) { func saveString(db *sql.DB, value_text string) (lastInsertId int64) {
new_stmt, err := db.Prepare("INSERT INTO attributes (name, value_text) VALUES ('note', ?)") new_stmt, err := db.Prepare("INSERT INTO attributes (name, value_text) VALUES ('note', ?)")
check(err) check(err)
result, err := new_stmt.Exec(value_text) result, err := new_stmt.Exec(value_text)
check(err) check(err)
lastInsertId, err := result.LastInsertId() lastInsertId, err = result.LastInsertId()
check(err) check(err)
fmt.Printf("New note ID:%d\n", lastInsertId) return
} }
func InitializeDatabase(db *sql.DB) bool { func InitializeDatabase(db *sql.DB) bool {

@ -25,6 +25,7 @@ type Options struct {
Recursive bool Recursive bool
RemovedOnly bool RemovedOnly bool
ShortMode bool ShortMode bool
Verbose bool
ListFilepaths bool ListFilepaths bool
MountPoint string MountPoint string
Note string Note string
@ -111,6 +112,7 @@ func OptionsFromArgs(args map[string]interface{}) (opts Options) {
opts.RemovedOnly = args["--removed-only"].(bool) opts.RemovedOnly = args["--removed-only"].(bool)
opts.ShortMode = args["--short"].(bool) opts.ShortMode = args["--short"].(bool)
opts.Verbose = args["--verbose"].(bool)
return return
} }

Loading…
Cancel
Save