Archives
/
eton
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

no more unnecessary exports

Browse Source
master
Sina Siadat 9 years ago
parent 11e785e4d7
commit 25e34e89ac
5 changed files with 223 additions and 221 deletions
Show Stats Download Patch File Download Diff File

308
attr.go
Unescape Escape View File

@ -2,7 +2,6 @@ package main
import ( import (
"database/sql" "database/sql"
"database/sql/driver"
"fmt" "fmt"
"github.com/andrew-d/go-termutil" "github.com/andrew-d/go-termutil"
"github.com/mattn/go-colorable" "github.com/mattn/go-colorable"
@ -19,9 +18,9 @@ import (
var out = colorable.NewColorableStdout() var out = colorable.NewColorableStdout()
// Attr holds the data fetched from a row // attrStruct holds the data fetched from a row
// Only 1 ValueXxx field should have value, the others should be nil // Only 1 ValueXxx field should have value, the others should be nil
type Attr struct { type attrStruct struct {
// Meta // Meta
ID sql.NullInt64 ID sql.NullInt64
ParentID sql.NullInt64 ParentID sql.NullInt64
@ -39,16 +38,16 @@ type Attr struct {
ValueTime time.Time ValueTime time.Time
// Timestamps // Timestamps
CreatedAt NullTime CreatedAt nullTime
UpdatedAt NullTime UpdatedAt nullTime
AccessedAt NullTime AccessedAt nullTime
DeletedAt NullTime DeletedAt nullTime
} }
const sqlSelect = "id, value_text, name, parent_id, alias, mark, value_blob, created_at, updated_at" const sqlSelect = "id, value_text, name, parent_id, alias, mark, value_blob, created_at, updated_at"
// GetID returns the int64 value of attr's ID. // getID returns the int64 value of attr's ID.
func (attr Attr) GetID() int64 { func (attr attrStruct) getID() int64 {
//var err error //var err error
if value, err := attr.ID.Value(); err == nil && value != nil { if value, err := attr.ID.Value(); err == nil && value != nil {
return value.(int64) return value.(int64)
@ -56,7 +55,8 @@ func (attr Attr) GetID() int64 {
return -1 return -1
} }
func (attr Attr) GetCreatedAt() (t time.Time) { // getCreatedAt returns created_at time
func (attr attrStruct) getCreatedAt() (t time.Time) {
//var err error //var err error
if value, err := attr.CreatedAt.Value(); err == nil && value != nil { if value, err := attr.CreatedAt.Value(); err == nil && value != nil {
t = value.(time.Time) t = value.(time.Time)
@ -65,7 +65,8 @@ func (attr Attr) GetCreatedAt() (t time.Time) {
return t return t
} }
func (attr Attr) GetUpdatedAt() (t time.Time) { // getUpdatedAt returns updated_at time
func (attr attrStruct) getUpdatedAt() (t time.Time) {
//var err error //var err error
if value, err := attr.UpdatedAt.Value(); err == nil && value != nil { if value, err := attr.UpdatedAt.Value(); err == nil && value != nil {
t = value.(time.Time) t = value.(time.Time)
@ -74,7 +75,8 @@ func (attr Attr) GetUpdatedAt() (t time.Time) {
return t return t
} }
func (attr Attr) GetAccessedAt() (t time.Time) { // getAccessedAt returns accessed_at time
func (attr attrStruct) getAccessedAt() (t time.Time) {
//var err error //var err error
if value, err := attr.AccessedAt.Value(); err == nil && value != nil { if value, err := attr.AccessedAt.Value(); err == nil && value != nil {
t = value.(time.Time) t = value.(time.Time)
@ -83,7 +85,8 @@ func (attr Attr) GetAccessedAt() (t time.Time) {
return t return t
} }
func (attr Attr) GetDeletedAt() (t time.Time) { // getDeletedAt returns deleted_at time
func (attr attrStruct) getDeletedAt() (t time.Time) {
//var err error //var err error
if value, err := attr.DeletedAt.Value(); err == nil && value != nil { if value, err := attr.DeletedAt.Value(); err == nil && value != nil {
t = value.(time.Time) t = value.(time.Time)
@ -92,19 +95,19 @@ func (attr Attr) GetDeletedAt() (t time.Time) {
return t return t
} }
// GetIDString returns the string value of attr's ID. // getIDString returns the string value of attr's ID.
func (attr Attr) GetIDString() string { func (attr attrStruct) getIDString() string {
var err error var err error
if value, err := attr.ID.Value(); err == nil && value != nil { if value, err := attr.ID.Value(); err == nil && value != nil {
return strconv.Itoa(int(value.(int64))) return strconv.Itoa(int(value.(int64)))
} }
log.Fatal("Attr is not loaded, has no id") log.Fatal("attrStruct is not loaded, has no id")
check(err) check(err)
return "" return ""
} }
// GetMark returns the int value of attr's mark // getMark returns the int value of attr's mark
func (attr Attr) GetMark() int { func (attr attrStruct) getMark() int {
var err error var err error
if value, err := attr.Mark.Value(); err == nil && value != nil { if value, err := attr.Mark.Value(); err == nil && value != nil {
return int(value.(int64)) return int(value.(int64))
@ -114,30 +117,29 @@ func (attr Attr) GetMark() int {
return 0 return 0
} }
// GetIdentifier returns attr's ID, or its Alias if it is not nil. // getIdentifier returns attr's ID, or its Alias if it is not nil.
func (attr Attr) GetIdentifier() string { func (attr attrStruct) getIdentifier() string {
alias := attr.GetAlias() alias := attr.getAlias()
if len(alias) > 0 { if len(alias) > 0 {
return alias return alias
} else {
return attr.GetIDString()
} }
return attr.getIDString()
} }
// GetName is a helper to get attr's Name as string // getName is a helper to get attr's Name as string
func (attr Attr) GetName() string { func (attr attrStruct) getName() string {
var err error var err error
if value, err := attr.Name.Value(); err == nil && value != nil { if value, err := attr.Name.Value(); err == nil && value != nil {
return value.(string) return value.(string)
} }
log.Fatal("Attr is not loaded, has no name") log.Fatal("attrStruct is not loaded, has no name")
check(err) check(err)
return "" return ""
} }
// GetName is a helper to get attr's Name as string // getAlias returns attr's alias
func (attr Attr) GetAlias() string { func (attr attrStruct) getAlias() string {
var err error var err error
if value, err := attr.Alias.Value(); err == nil && value != nil { if value, err := attr.Alias.Value(); err == nil && value != nil {
@ -147,8 +149,8 @@ func (attr Attr) GetAlias() string {
return "" return ""
} }
// GetTextValue returns a string representation of attr's value, whatever type it is // getTextValue returns a string representation of attr's value, whatever type it is
func (attr Attr) GetTextValue() string { func (attr attrStruct) getTextValue() string {
var err error var err error
if value, err := attr.ValueText.Value(); err == nil && value != nil { if value, err := attr.ValueText.Value(); err == nil && value != nil {
return value.(string) return value.(string)
@ -157,9 +159,9 @@ func (attr Attr) GetTextValue() string {
return "" return ""
} }
// GetValue returns a string representation of attr's value, in order of // getValue returns a string representation of attr's value, in order of
// preference: first ValueBlob, then ValueText, then ValueInt, then ValueReal // preference: first ValueBlob, then ValueText, then ValueInt, then ValueReal
func (attr Attr) GetValue() string { func (attr attrStruct) getValue() string {
var err error var err error
// if ValueBlov exists // if ValueBlov exists
@ -182,13 +184,13 @@ func (attr Attr) GetValue() string {
} }
check(err) check(err)
log.Fatal("Attr is not loaded, has no value") log.Fatal("attrStruct is not loaded, has no value")
return "" return ""
} }
// Print pretty-prints attr's field values. // print pretty-prints attr's field values.
func (attr Attr) Print(w *tabwriter.Writer, verbose bool, indent int, highlighteds []string, after int) { func (attr attrStruct) print(w *tabwriter.Writer, verbose bool, indent int, highlighteds []string, after int) {
debug := false debug := false
if debug { if debug {
@ -220,28 +222,28 @@ func (attr Attr) Print(w *tabwriter.Writer, verbose bool, indent int, highlighte
//fmt.Fprintf(w, "%s\t", prettyAttr("at", attr.prettyAt())) //fmt.Fprintf(w, "%s\t", prettyAttr("at", attr.prettyAt()))
// Name: // Name:
//fmt.Fprintf(w, "%s\t", prettyAttr("name", attr.GetName())) //fmt.Fprintf(w, "%s\t", prettyAttr("name", attr.getName()))
// Value: // Value:
//fmt.Printf(strings.Repeat(" ", indent)) //fmt.Printf(strings.Repeat(" ", indent))
if attr.GetMark() == 0 { if attr.getMark() == 0 {
fmt.Fprintf(out, "[%s] %s\n", Color(attr.GetIdentifier(), "yellow+b"), attr.Title()) fmt.Fprintf(out, "[%s] %s\n", color(attr.getIdentifier(), "yellow+b"), attr.title())
} else { } else {
fmt.Fprintf(out, "%s %s\n", Color("("+attr.GetIdentifier()+")", "black+b:white"), Color(attr.Title(), "default")) fmt.Fprintf(out, "%s %s\n", color("("+attr.getIdentifier()+")", "black+b:white"), color(attr.title(), "default"))
} }
if len(highlighteds) > 0 { if len(highlighteds) > 0 {
fmt.Fprintln(out, attr.PrettyMatches(highlighteds, after)) fmt.Fprintln(out, attr.prettyMatches(highlighteds, after))
} }
} }
} }
func (attr Attr) PrettyMatches(highlighteds []string, after int) string { func (attr attrStruct) prettyMatches(highlighteds []string, after int) string {
var valueText string var valueText string
if len(highlighteds) == 0 { if len(highlighteds) == 0 {
valueText = attr.Title() valueText = attr.title()
} else { } else {
valueText = strings.TrimSpace(attr.GetValue()) valueText = strings.TrimSpace(attr.getValue())
matchinglines := make([]string, 0, 0) matchinglines := make([]string, 0, 0)
@ -255,13 +257,13 @@ func (attr Attr) PrettyMatches(highlighteds []string, after int) string {
if matched { if matched {
lastMatchingLine = linenumber lastMatchingLine = linenumber
if true || !isCoveredByLastMatch { if true || !isCoveredByLastMatch {
matchCounter += 1 matchCounter++
} }
} }
if matched || isCoveredByLastMatch { if matched || isCoveredByLastMatch {
//prefix := fmt.Sprintf("%s L%s:", strings.Repeat(" ", len(attr.GetIdentifier())), strconv.Itoa(linenumber+1)) //prefix := fmt.Sprintf("%s L%s:", strings.Repeat(" ", len(attr.getIdentifier())), strconv.Itoa(linenumber+1))
prefix := fmt.Sprintf("%s", strings.Repeat(" ", 3+len(attr.GetIdentifier()))) prefix := fmt.Sprintf("%s", strings.Repeat(" ", 3+len(attr.getIdentifier())))
matchinglines = append(matchinglines, Color(prefix, "black")+line) matchinglines = append(matchinglines, color(prefix, "black")+line)
if maximumShownMatches != -1 && matchCounter >= maximumShownMatches { if maximumShownMatches != -1 && matchCounter >= maximumShownMatches {
break break
} }
@ -273,8 +275,8 @@ func (attr Attr) PrettyMatches(highlighteds []string, after int) string {
return valueText + "\n" return valueText + "\n"
} }
func (attr Attr) Title() string { func (attr attrStruct) title() string {
valueText := strings.TrimSpace(attr.GetTextValue()) valueText := strings.TrimSpace(attr.getTextValue())
firstLineEndIndex := strings.Index(valueText, "\n") firstLineEndIndex := strings.Index(valueText, "\n")
if firstLineEndIndex >= 0 { if firstLineEndIndex >= 0 {
@ -287,37 +289,35 @@ func (attr Attr) Title() string {
return valueText return valueText
} }
func (attr Attr) prettyAt() string { func (attr attrStruct) prettyAt() string {
if attr.GetUpdatedAt().IsZero() { if attr.getUpdatedAt().IsZero() {
return attr.GetCreatedAt().Local().Format(datelayout) // + " " return attr.getCreatedAt().Local().Format(datelayout) // + " "
} else {
return attr.GetUpdatedAt().Local().Format(datelayout) // + "*"
} }
return attr.getUpdatedAt().Local().Format(datelayout) // + "*"
} }
func (attr Attr) prettyCreatedAt() string { func (attr attrStruct) prettyCreatedAt() string {
return attr.GetCreatedAt().Local().Format(datelayout) return attr.getCreatedAt().Local().Format(datelayout)
} }
func (attr Attr) prettyUpdatedAt() string { func (attr attrStruct) prettyUpdatedAt() string {
if !attr.GetUpdatedAt().IsZero() { if !attr.getUpdatedAt().IsZero() {
return attr.GetUpdatedAt().Local().Format(datelayout) return attr.getUpdatedAt().Local().Format(datelayout)
} else {
return ""
} }
return ""
} }
func (attr Attr) Filepath() string { func (attr attrStruct) filepath() string {
f, err := ioutil.TempFile("", "eton-edit") f, err := ioutil.TempFile("", "eton-edit")
check(err) check(err)
f.Close() f.Close()
writeToFile(f.Name(), attr.GetValue()) writeToFile(f.Name(), attr.getValue())
return f.Name() return f.Name()
} }
// SetAlias sets attr's Alias to the given alias. // setAlias sets attr's Alias to the given alias.
// If give alias is empty string, it will unset the alias (set it to NULL in the database). // If give alias is empty string, it will unset the alias (set it to NULL in the database).
func (attr Attr) SetAlias(db *sql.DB, alias string) { func (attr attrStruct) setAlias(db *sql.DB, alias string) {
unset := len(alias) == 0 unset := len(alias) == 0
if !unset { if !unset {
@ -333,28 +333,28 @@ func (attr Attr) SetAlias(db *sql.DB, alias string) {
//var result sql.Result //var result sql.Result
if !unset { if !unset {
_, err = stmt.Exec(alias, attr.GetID()) _, err = stmt.Exec(alias, attr.getID())
} else { } else {
_, err = stmt.Exec(nil, attr.GetID()) _, err = stmt.Exec(nil, attr.getID())
} }
//check(err) //check(err)
if err == nil { if err == nil {
if unset { if unset {
fmt.Fprintf(out, "ID:%d unaliased\n", attr.GetID()) fmt.Fprintf(out, "ID:%d unaliased\n", attr.getID())
} else { } else {
fmt.Fprintf(out, "alias set: %s => %s\n", attr.GetIdentifier(), alias) fmt.Fprintf(out, "alias set: %s => %s\n", attr.getIdentifier(), alias)
} }
} else { } else {
log.Fatalf("error while setting alias \"%s\" for ID:%d -- alias must be unique\n", alias, attr.GetID()) // , err) log.Fatalf("error while setting alias \"%s\" for ID:%d -- alias must be unique\n", alias, attr.getID()) // , err)
} }
//rowsAffected, err := result.RowsAffected() //rowsAffected, err := result.RowsAffected()
} }
func (attr Attr) SetMark(db *sql.DB, mark int) (rowsAffected int64) { func (attr attrStruct) setMark(db *sql.DB, mark int) (rowsAffected int64) {
stmt, err := db.Prepare("UPDATE attributes SET mark = ? WHERE id = ? AND deleted_at IS NULL") stmt, err := db.Prepare("UPDATE attributes SET mark = ? WHERE id = ? AND deleted_at IS NULL")
check(err) check(err)
result, err := stmt.Exec(mark, attr.GetID()) result, err := stmt.Exec(mark, attr.getID())
check(err) check(err)
rowsAffected, err = result.RowsAffected() rowsAffected, err = result.RowsAffected()
check(err) check(err)
@ -362,11 +362,11 @@ func (attr Attr) SetMark(db *sql.DB, mark int) (rowsAffected int64) {
return rowsAffected return rowsAffected
} }
func (attr Attr) Rm(db *sql.DB) (rowsAffected int64) { func (attr attrStruct) rm(db *sql.DB) (rowsAffected int64) {
stmt, err := db.Prepare("UPDATE attributes SET deleted_at = CURRENT_TIMESTAMP WHERE id = ? AND deleted_at IS NULL") stmt, err := db.Prepare("UPDATE attributes SET deleted_at = CURRENT_TIMESTAMP WHERE id = ? AND deleted_at IS NULL")
check(err) check(err)
result, err := stmt.Exec(attr.GetID()) result, err := stmt.Exec(attr.getID())
check(err) check(err)
rowsAffected, err = result.RowsAffected() rowsAffected, err = result.RowsAffected()
check(err) check(err)
@ -374,11 +374,11 @@ func (attr Attr) Rm(db *sql.DB) (rowsAffected int64) {
return rowsAffected return rowsAffected
} }
func (attr Attr) Unrm(db *sql.DB) (rowsAffected int64) { func (attr attrStruct) unrm(db *sql.DB) (rowsAffected int64) {
stmt, err := db.Prepare("UPDATE attributes SET deleted_at = NULL WHERE id = ? AND deleted_at IS NOT NULL") stmt, err := db.Prepare("UPDATE attributes SET deleted_at = NULL WHERE id = ? AND deleted_at IS NOT NULL")
check(err) check(err)
result, err := stmt.Exec(attr.GetID()) result, err := stmt.Exec(attr.getID())
check(err) check(err)
rowsAffected, err = result.RowsAffected() rowsAffected, err = result.RowsAffected()
check(err) check(err)
@ -386,11 +386,11 @@ func (attr Attr) Unrm(db *sql.DB) (rowsAffected int64) {
return rowsAffected return rowsAffected
} }
func (attr Attr) IncrementFrequency(db *sql.DB) (rowsAffected int64) { func (attr attrStruct) incrementFrequency(db *sql.DB) (rowsAffected int64) {
stmt, err := db.Prepare("UPDATE attributes SET frequency = frequency + 1 WHERE id = ? AND deleted_at IS NULL") stmt, err := db.Prepare("UPDATE attributes SET frequency = frequency + 1 WHERE id = ? AND deleted_at IS NULL")
check(err) check(err)
result, err := stmt.Exec(attr.GetID()) result, err := stmt.Exec(attr.getID())
check(err) check(err)
rowsAffected, err = result.RowsAffected() rowsAffected, err = result.RowsAffected()
@ -398,20 +398,20 @@ func (attr Attr) IncrementFrequency(db *sql.DB) (rowsAffected int64) {
return return
} }
func (attr Attr) Edit(db *sql.DB) (rowsAffected int64) { func (attr attrStruct) edit(db *sql.DB) (rowsAffected int64) {
filepath := attr.Filepath() filepath := attr.filepath()
if openEditor(filepath) == false { if openEditor(filepath) == false {
return return
} }
value_text := readFile(filepath) valueText := readFile(filepath)
if value_text != attr.GetValue() { if valueText != attr.getValue() {
update_stmt, err := db.Prepare("UPDATE attributes SET value_text = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?") updateStmt, err := db.Prepare("UPDATE attributes SET value_text = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?")
check(err) check(err)
result, err := update_stmt.Exec(value_text, attr.GetID()) result, err := updateStmt.Exec(valueText, attr.getID())
check(err) check(err)
rowsAffected, err = result.RowsAffected() rowsAffected, err = result.RowsAffected()
check(err) check(err)
@ -429,51 +429,50 @@ func writeToFile(filepath string, content string) {
func highlightLine(line string, highlighteds []string) (string, bool) { func highlightLine(line string, highlighteds []string) (string, bool) {
if len(highlighteds) == 0 { if len(highlighteds) == 0 {
return line, false return line, false
} else { }
reFlags := "(?i)" reFlags := "(?i)"
quotedHighlighteds := make([]string, len(highlighteds), len(highlighteds)) quotedHighlighteds := make([]string, len(highlighteds), len(highlighteds))
for i, str := range highlighteds { for i, str := range highlighteds {
quotedHighlighteds[i] = regexp.QuoteMeta(str) quotedHighlighteds[i] = regexp.QuoteMeta(str)
} }
re := regexp.MustCompile(reFlags + "(" + strings.Join(quotedHighlighteds, "|") + ")") re := regexp.MustCompile(reFlags + "(" + strings.Join(quotedHighlighteds, "|") + ")")
if indexes := re.FindStringIndex(line); indexes != nil { if indexes := re.FindStringIndex(line); indexes != nil {
var indexBegin int var indexBegin int
var indexEnd int var indexEnd int
var beforeStr string var beforeStr string
var afterStr string var afterStr string
if len(indexes) > 0 {
firstIndex := indexes[0]
indexBegin = firstIndex - 40
if indexBegin < 0 {
indexBegin = 0
}
if indexBegin != 0 {
beforeStr = ellipsis
}
indexEnd = firstIndex + 40
} else {
indexEnd = 80
}
if indexEnd > indexBegin+80 { if len(indexes) > 0 {
indexEnd = indexBegin + 80 firstIndex := indexes[0]
indexBegin = firstIndex - 40
if indexBegin < 0 {
indexBegin = 0
} }
if indexEnd > len(line) { if indexBegin != 0 {
indexEnd = len(line) beforeStr = ellipsis
}
if indexEnd != len(line) {
afterStr = ellipsis
} }
indexEnd = firstIndex + 40
} else {
indexEnd = 80
}
line = re.ReplaceAllString(line[indexBegin:indexEnd], Color("$0", "black+b:green")) if indexEnd > indexBegin+80 {
return beforeStr + line + afterStr, true indexEnd = indexBegin + 80
} }
return line, false if indexEnd > len(line) {
indexEnd = len(line)
}
if indexEnd != len(line) {
afterStr = ellipsis
}
line = re.ReplaceAllString(line[indexBegin:indexEnd], color("$0", "black+b:green"))
return beforeStr + line + afterStr, true
} }
return line, false
} }
func prettyAttr(name, value string) string { func prettyAttr(name, value string) string {
@ -482,35 +481,32 @@ func prettyAttr(name, value string) string {
} }
if termutil.Isatty(os.Stdout.Fd()) { if termutil.Isatty(os.Stdout.Fd()) {
return ansi.Color(name, "black") + ansi.Color(value, "default") return ansi.Color(name, "black") + ansi.Color(value, "default")
} else {
return name + value
} }
return name + value
} }
func prettyAttr2(name, value string) string { func prettyAttr2(name, value string) string {
if termutil.Isatty(os.Stdout.Fd()) { if termutil.Isatty(os.Stdout.Fd()) {
return ansi.Color(name+":", "black") + ansi.Color(value, "blue") return ansi.Color(name+":", "black") + ansi.Color(value, "blue")
} else {
return name + ":" + value
} }
return name + ":" + value
} }
// Color is the same as ansi.Color but only if STDOUT is a TTY // color is the same as ansi.Color but only if STDOUT is a TTY
func Color(str, color string) string { func color(str, color string) string {
if termutil.Isatty(os.Stdout.Fd()) { if termutil.Isatty(os.Stdout.Fd()) {
return ansi.Color(str, color) return ansi.Color(str, color)
} else {
return str
} }
return str
} }
func findAttributeByID(db *sql.DB, ID int64) (attr Attr) { func findAttributeByID(db *sql.DB, ID int64) (attr attrStruct) {
var err error var err error
var stmt *sql.Stmt var stmt *sql.Stmt
defer func() { defer func() {
if err == nil { if err == nil {
attr.IncrementFrequency(db) attr.incrementFrequency(db)
} }
}() }()
@ -524,13 +520,13 @@ func findAttributeByID(db *sql.DB, ID int64) (attr Attr) {
return return
} }
func findAttributeByAlias(db *sql.DB, alias string, exactMatchOnly bool) (attr Attr) { func findAttributeByAlias(db *sql.DB, alias string, exactMatchOnly bool) (attr attrStruct) {
var err error var err error
var stmt *sql.Stmt var stmt *sql.Stmt
defer func() { defer func() {
if err == nil { if err == nil {
attr.IncrementFrequency(db) attr.incrementFrequency(db)
} }
}() }()
@ -572,11 +568,11 @@ func findAttributeByAlias(db *sql.DB, alias string, exactMatchOnly bool) (attr A
return return
} }
func findAttributeByAliasOrID(db *sql.DB, alias_or_id string) (attr Attr) { func findAttributeByAliasOrID(db *sql.DB, indentifier string) (attr attrStruct) {
attr = findAttributeByAlias(db, alias_or_id, false) attr = findAttributeByAlias(db, indentifier, false)
if attr.GetID() <= 0 { if attr.getID() <= 0 {
intID, err := strconv.Atoi(alias_or_id) intID, err := strconv.Atoi(indentifier)
if err != nil { if err != nil {
return attr return attr
@ -588,7 +584,7 @@ func findAttributeByAliasOrID(db *sql.DB, alias_or_id string) (attr Attr) {
return attr return attr
} }
func listWithFilters(db *sql.DB, opts Options) (attrs []Attr) { func listWithFilters(db *sql.DB, opts options) (attrs []attrStruct) {
var stmt *sql.Stmt var stmt *sql.Stmt
var rows *sql.Rows var rows *sql.Rows
var nolimit = opts.Limit == -1 var nolimit = opts.Limit == -1
@ -655,17 +651,17 @@ func listWithFilters(db *sql.DB, opts Options) (attrs []Attr) {
check(err) check(err)
defer rows.Close() defer rows.Close()
attrs = make([]Attr, 0, 0) attrs = make([]attrStruct, 0, 0)
for rows.Next() { for rows.Next() {
attr := Attr{} attr := attrStruct{}
err = rows.Scan(&attr.ID, &attr.ValueText, &attr.Name, &attr.ParentID, &attr.Alias, &attr.Mark, &attr.ValueBlob, &attr.CreatedAt, &attr.UpdatedAt) err = rows.Scan(&attr.ID, &attr.ValueText, &attr.Name, &attr.ParentID, &attr.Alias, &attr.Mark, &attr.ValueBlob, &attr.CreatedAt, &attr.UpdatedAt)
check(err) check(err)
attrs = append(attrs, attr) attrs = append(attrs, attr)
var optsNew Options var optsNew options
optsNew = opts optsNew = opts
optsNew.RootID = attr.GetID() optsNew.RootID = attr.getID()
optsNew.Indent += 2 optsNew.Indent += 2
//cmdLs(db, w, optsNew) //cmdLs(db, w, optsNew)
} }
@ -686,20 +682,20 @@ func getLastAttrID(db *sql.DB) int64 {
return ID return ID
} }
func saveString(db *sql.DB, value_text string) (lastInsertId int64) { func saveString(db *sql.DB, valueText string) (lastInsertID int64) {
new_stmt, err := db.Prepare("INSERT INTO attributes (name, value_text) VALUES ('note', ?)") 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 := stmt.Exec(valueText)
check(err) check(err)
lastInsertId, err = result.LastInsertId() lastInsertID, err = result.LastInsertId()
check(err) check(err)
return return
} }
func InitializeDatabase(db *sql.DB) bool { func initializeDatabase(db *sql.DB) bool {
// TODO use fts3 for faster full-text search: CREATE VIRTUAL TABLE attributes USING fts3 (...) // TODO use fts3 for faster full-text search: CREATE VIRTUAL TABLE attributes USING fts3 (...)
sqlStmt := ` sqlStmt := `
DROP TABLE IF EXISTS attributes; DROP TABLE IF EXISTS attributes;
@ -743,23 +739,3 @@ func InitializeDatabase(db *sql.DB) bool {
fmt.Fprintln(out, "repository initiated") fmt.Fprintln(out, "repository initiated")
return true return true
} }
// NullTime allows timestamps to be NULL
type NullTime struct {
Time time.Time
Valid bool // Valid is true if Time is not NULL
}
// Scan implements the Scanner interface.
func (nt *NullTime) Scan(value interface{}) error {
nt.Time, nt.Valid = value.(time.Time)
return nil
}
// Value implements the driver Valuer interface.
func (nt NullTime) Value() (driver.Value, error) {
if !nt.Valid {
return nil, nil
}
return nt.Time, nil
}

102
commands.go
Unescape Escape View File

@ -16,50 +16,50 @@ import (
"text/tabwriter" "text/tabwriter"
) )
var globalDB *sql.DB // var globalDB *sql.DB
var globalOpts Options // var globalOpts options
// const orderby = "-frequency, -mark, CASE WHEN updated_at IS NULL THEN created_at ELSE updated_at END DESC" // const orderby = "-frequency, -mark, CASE WHEN updated_at IS NULL THEN created_at ELSE updated_at END DESC"
const orderby = "-mark, CASE WHEN updated_at IS NULL THEN created_at ELSE updated_at END DESC" const orderby = "-mark, CASE WHEN updated_at IS NULL THEN created_at ELSE updated_at END DESC"
const defaultEditor = "vi" const defaultEditor = "vi"
func cmdShow(db *sql.DB, opts Options) bool { func cmdShow(db *sql.DB, opts options) bool {
if len(opts.IDs) == 0 && len(opts.Aliases) == 0 { if len(opts.IDs) == 0 && len(opts.Aliases) == 0 {
opts.IDs = append(opts.IDs, int64(getLastAttrID(db))) opts.IDs = append(opts.IDs, int64(getLastAttrID(db)))
} }
for _, id := range opts.IDs { for _, id := range opts.IDs {
attr := findAttributeByID(db, id) attr := findAttributeByID(db, id)
//fmt.Printf(attr.GetValue()) //fmt.Printf(attr.getValue())
printToLess(attr.GetValue()) printToLess(attr.getValue())
} }
for _, alias := range opts.Aliases { for _, alias := range opts.Aliases {
attr := findAttributeByAlias(db, alias, false) attr := findAttributeByAlias(db, alias, false)
//fmt.Printf(attr.GetValue()) //fmt.Printf(attr.getValue())
printToLess(attr.GetValue()) printToLess(attr.getValue())
} }
return true return true
} }
func cmdCat(db *sql.DB, opts Options) bool { func cmdCat(db *sql.DB, opts options) bool {
if len(opts.IDs) == 0 && len(opts.Aliases) == 0 { if len(opts.IDs) == 0 && len(opts.Aliases) == 0 {
opts.IDs = append(opts.IDs, int64(getLastAttrID(db))) opts.IDs = append(opts.IDs, int64(getLastAttrID(db)))
} }
for _, id := range opts.IDs { for _, id := range opts.IDs {
attr := findAttributeByID(db, id) attr := findAttributeByID(db, id)
fmt.Printf(attr.GetValue()) fmt.Printf(attr.getValue())
} }
for _, alias := range opts.Aliases { for _, alias := range opts.Aliases {
attr := findAttributeByAlias(db, alias, false) attr := findAttributeByAlias(db, alias, false)
fmt.Printf(attr.GetValue()) fmt.Printf(attr.getValue())
} }
return true return true
} }
func cmdMount(db *sql.DB, opts Options) bool { func cmdMount(db *sql.DB, opts options) bool {
log.Println("Not implemented yet") log.Println("Not implemented yet")
/* /*
globalDB = db globalDB = db
@ -110,21 +110,21 @@ func cmdAddFiles(db *sql.DB, files []string) bool {
return true return true
} }
func cmdLs(db *sql.DB, w *tabwriter.Writer, opts Options) bool { func cmdLs(db *sql.DB, w *tabwriter.Writer, opts options) bool {
attrs := listWithFilters(db, opts) attrs := listWithFilters(db, opts)
for _, attr := range attrs { for _, attr := range attrs {
if opts.ListFilepaths { if opts.ListFilepaths {
fmt.Println(attr.Filepath()) fmt.Println(attr.filepath())
} else { } else {
attr.Print(w, opts.Recursive, opts.Indent, opts.Filters, opts.AfterLinesCount) attr.print(w, opts.Recursive, opts.Indent, opts.Filters, opts.AfterLinesCount)
} }
} }
return true return true
} }
func cmdNew(db *sql.DB, opts Options) bool { func cmdNew(db *sql.DB, opts options) bool {
var value_text string var valueText string
if opts.FromStdin { if opts.FromStdin {
lines := make([]string, 0, 0) lines := make([]string, 0, 0)
@ -150,9 +150,9 @@ func cmdNew(db *sql.DB, opts Options) bool {
log.Printf("%s\n", prettyAttr("eton", string(line))) log.Printf("%s\n", prettyAttr("eton", string(line)))
} }
} }
value_text = strings.Join(lines, "\n") valueText = strings.Join(lines, "\n")
} else if len(opts.Note) > 0 { } else if len(opts.Note) > 0 {
value_text = opts.Note valueText = opts.Note
} else { } else {
f, err := ioutil.TempFile("", "eton-edit") f, err := ioutil.TempFile("", "eton-edit")
check(err) check(err)
@ -162,16 +162,16 @@ func cmdNew(db *sql.DB, opts Options) bool {
return false return false
} }
value_text = readFile(f.Name()) valueText = readFile(f.Name())
if len(value_text) == 0 { if len(valueText) == 0 {
return false return false
} }
} }
lastInsertId := saveString(db, value_text) lastInsertID := saveString(db, valueText)
if lastInsertId > 0 && opts.Verbose { if lastInsertID > 0 && opts.Verbose {
fmt.Printf("New note ID:%d\n", lastInsertId) fmt.Printf("New note ID:%d\n", lastInsertID)
} }
return true return true
@ -232,46 +232,46 @@ func cmdAddAttr(db *sql.DB, id int, attrs []string) bool {
return true return true
} }
func cmdUnalias(db *sql.DB, opts Options) bool { func cmdUnalias(db *sql.DB, opts options) bool {
attr := findAttributeByAlias(db, opts.Alias, true) attr := findAttributeByAlias(db, opts.Alias, true)
if attr.GetID() == -1 { if attr.getID() == -1 {
log.Fatalf("alias \"%s\" not found", opts.Alias) log.Fatalf("alias \"%s\" not found", opts.Alias)
} else { } else {
attr.SetAlias(db, "") attr.setAlias(db, "")
} }
return true return true
} }
func cmdAlias(db *sql.DB, opts Options) bool { func cmdAlias(db *sql.DB, opts options) bool {
if !(opts.ID > 0 && len(opts.Alias1) > 0 || len(opts.Alias2) > 0) && !(len(opts.Alias1) > 0 && len(opts.Alias2) > 0) { if !(opts.ID > 0 && len(opts.Alias1) > 0 || len(opts.Alias2) > 0) && !(len(opts.Alias1) > 0 && len(opts.Alias2) > 0) {
return false return false
} }
var attr Attr var attr attrStruct
if opts.ID > 0 { if opts.ID > 0 {
attr = findAttributeByID(db, opts.ID) attr = findAttributeByID(db, opts.ID)
if len(opts.Alias1) > 0 { if len(opts.Alias1) > 0 {
attr.SetAlias(db, opts.Alias1) attr.setAlias(db, opts.Alias1)
} else if len(opts.Alias2) > 0 { } else if len(opts.Alias2) > 0 {
attr.SetAlias(db, opts.Alias2) attr.setAlias(db, opts.Alias2)
} }
} else if len(opts.Alias1) > 0 && len(opts.Alias2) > 0 { } else if len(opts.Alias1) > 0 && len(opts.Alias2) > 0 {
attr1 := findAttributeByAlias(db, opts.Alias1, true) attr1 := findAttributeByAlias(db, opts.Alias1, true)
attr2 := findAttributeByAlias(db, opts.Alias2, true) attr2 := findAttributeByAlias(db, opts.Alias2, true)
if attr1.GetID() > 0 && attr2.GetID() <= 0 { if attr1.getID() > 0 && attr2.getID() <= 0 {
attr1.SetAlias(db, opts.Alias2) attr1.setAlias(db, opts.Alias2)
} else if attr1.GetID() <= 0 && attr2.GetID() > 0 { } else if attr1.getID() <= 0 && attr2.getID() > 0 {
attr2.SetAlias(db, opts.Alias1) attr2.setAlias(db, opts.Alias1)
} else { } else {
log.Println("not changing anything", attr1.GetID(), attr2.GetID()) log.Println("not changing anything", attr1.getID(), attr2.getID())
} }
} }
return true return true
} }
func cmdEdit(db *sql.DB, opts Options) bool { func cmdEdit(db *sql.DB, opts options) bool {
var totalUpdated int64 var totalUpdated int64
if len(opts.IDs) == 0 && len(opts.Aliases) == 0 { if len(opts.IDs) == 0 && len(opts.Aliases) == 0 {
@ -280,12 +280,12 @@ func cmdEdit(db *sql.DB, opts Options) bool {
for _, id := range opts.IDs { for _, id := range opts.IDs {
attr := findAttributeByID(db, id) attr := findAttributeByID(db, id)
totalUpdated += attr.Edit(db) totalUpdated += attr.edit(db)
} }
for _, alias := range opts.Aliases { for _, alias := range opts.Aliases {
attr := findAttributeByAlias(db, alias, false) attr := findAttributeByAlias(db, alias, false)
totalUpdated += attr.Edit(db) totalUpdated += attr.edit(db)
} }
if opts.Verbose { if opts.Verbose {
@ -295,18 +295,18 @@ func cmdEdit(db *sql.DB, opts Options) bool {
return true return true
} }
func cmdRm(db *sql.DB, opts Options) bool { func cmdRm(db *sql.DB, opts options) bool {
var totalUpdated int64 var totalUpdated int64
for _, id := range opts.IDs { for _, id := range opts.IDs {
attr := findAttributeByID(db, id) attr := findAttributeByID(db, id)
totalUpdated += attr.Rm(db) totalUpdated += attr.rm(db)
} }
for _, alias := range opts.Aliases { for _, alias := range opts.Aliases {
attr := findAttributeByAlias(db, alias, true) attr := findAttributeByAlias(db, alias, true)
totalUpdated += attr.Rm(db) totalUpdated += attr.rm(db)
} }
if totalUpdated > 0 { if totalUpdated > 0 {
@ -316,17 +316,17 @@ func cmdRm(db *sql.DB, opts Options) bool {
return true return true
} }
func cmdUnrm(db *sql.DB, opts Options) bool { func cmdUnrm(db *sql.DB, opts options) bool {
var totalUpdated int64 var totalUpdated int64
for _, id := range opts.IDs { for _, id := range opts.IDs {
attr := findAttributeByID(db, id) attr := findAttributeByID(db, id)
totalUpdated += attr.Unrm(db) totalUpdated += attr.unrm(db)
} }
for _, alias := range opts.Aliases { for _, alias := range opts.Aliases {
attr := findAttributeByAlias(db, alias, true) attr := findAttributeByAlias(db, alias, true)
totalUpdated += attr.Unrm(db) totalUpdated += attr.unrm(db)
} }
if totalUpdated > 0 { if totalUpdated > 0 {
@ -337,36 +337,36 @@ func cmdUnrm(db *sql.DB, opts Options) bool {
} }
func cmdInit(db *sql.DB) bool { func cmdInit(db *sql.DB) bool {
InitializeDatabase(db) initializeDatabase(db)
return true return true
} }
func cmdMark(db *sql.DB, opts Options) bool { func cmdMark(db *sql.DB, opts options) bool {
var totalUpdated int64 var totalUpdated int64
for _, id := range opts.IDs { for _, id := range opts.IDs {
attr := findAttributeByID(db, id) attr := findAttributeByID(db, id)
totalUpdated += attr.SetMark(db, 1) totalUpdated += attr.setMark(db, 1)
} }
for _, alias := range opts.Aliases { for _, alias := range opts.Aliases {
attr := findAttributeByAlias(db, alias, false) attr := findAttributeByAlias(db, alias, false)
totalUpdated += attr.SetMark(db, 1) totalUpdated += attr.setMark(db, 1)
} }
fmt.Println(totalUpdated, "marked") fmt.Println(totalUpdated, "marked")
return true return true
} }
func cmdUnmark(db *sql.DB, opts Options) bool { func cmdUnmark(db *sql.DB, opts options) bool {
var totalUpdated int64 var totalUpdated int64
for _, id := range opts.IDs { for _, id := range opts.IDs {
attr := findAttributeByID(db, id) attr := findAttributeByID(db, id)
totalUpdated += attr.SetMark(db, 0) totalUpdated += attr.setMark(db, 0)
} }
for _, alias := range opts.Aliases { for _, alias := range opts.Aliases {
attr := findAttributeByAlias(db, alias, false) attr := findAttributeByAlias(db, alias, false)
totalUpdated += attr.SetMark(db, 0) totalUpdated += attr.setMark(db, 0)
} }
fmt.Println(totalUpdated, "marked") fmt.Println(totalUpdated, "marked")

2
main.go
Unescape Escape View File

@ -49,7 +49,7 @@ func main() {
args, err := docopt.Parse(usage, nil, true, "version 0.0.0", false, true) args, err := docopt.Parse(usage, nil, true, "version 0.0.0", false, true)
check(err) check(err)
opts := OptionsFromArgs(args) opts := optionsFromArgs(args)
//pwd, _ = os.Getwd() //pwd, _ = os.Getwd()

26
nulltime.go
Unescape Escape View File

@ -0,0 +1,26 @@
package main
import (
"database/sql/driver"
"time"
)
// nullTime allows timestamps to be NULL
type nullTime struct {
Time time.Time
Valid bool // Valid is true if Time is not NULL
}
// Scan implements the Scanner interface.
func (nt *nullTime) Scan(value interface{}) error {
nt.Time, nt.Valid = value.(time.Time)
return nil
}
// Value implements the driver Valuer interface.
func (nt nullTime) Value() (driver.Value, error) {
if !nt.Valid {
return nil, nil
}
return nt.Time, nil
}

6
options.go
Unescape Escape View File

@ -11,7 +11,7 @@ const datelayout string = "06/01/02 03:04pm"
const ellipsis = "…" const ellipsis = "…"
const maximumShownMatches = -1 const maximumShownMatches = -1
type Options struct { type options struct {
ID int64 ID int64
Alias string Alias string
IDs []int64 IDs []int64
@ -34,7 +34,7 @@ type Options struct {
Alias2 string Alias2 string
} }
func OptionsFromArgs(args map[string]interface{}) (opts Options) { func optionsFromArgs(args map[string]interface{}) (opts options) {
// log.Printf("%v\n", args) // log.Printf("%v\n", args)
var err error var err error
@ -116,7 +116,7 @@ func OptionsFromArgs(args map[string]interface{}) (opts Options) {
return return
} }
func (opts Options) GetIDsArrayOfInterface() []interface{} { func (opts options) getIDsArrayOfInterface() []interface{} {
var interfaceIds = make([]interface{}, len(opts.IDs), len(opts.IDs)) var interfaceIds = make([]interface{}, len(opts.IDs), len(opts.IDs))
for i, id := range opts.IDs { for i, id := range opts.IDs {
interfaceIds[i] = id interfaceIds[i] = id

Write Preview
Loading…
Cancel
Save