ideomatic

Author: laktak

cmd/chkbit/main.go

@@ -124,7 +124,7 @@ func (m *Main) logInfo(col, text string) {
 }
 
 func (m *Main) logError(text string) {
-	text = chkbit.STATUS_PANIC.String() + " " + text
+	text = chkbit.StatusPanic.String() + " " + text
 
 	if m.progress == Fancy {
 		lterm.Write(termAlertFG)
@@ -148,13 +148,13 @@ func (m *Main) printError(text string) {
 }
 
 func (m *Main) logStatus(stat chkbit.Status, message string) bool {
-	if stat == chkbit.STATUS_UPDATE_INDEX {
+	if stat == chkbit.StatusUpdateIndex {
 		return false
 	}
 
-	if stat == chkbit.STATUS_ERR_DMG {
+	if stat == chkbit.StatusErrorDamage {
 		m.dmgList = append(m.dmgList, message)
-	} else if stat == chkbit.STATUS_PANIC {
+	} else if stat == chkbit.StatusPanic {
 		m.errList = append(m.errList, message)
 	}
 
@@ -164,7 +164,7 @@ func (m *Main) logStatus(stat chkbit.Status, message string) bool {
 
 	if m.verbose || !stat.IsVerbose() {
 
-		if m.progress == Quiet && stat == chkbit.STATUS_INFO {
+		if m.progress == Quiet && stat == chkbit.StatusInfo {
 			return false
 		}
 
@@ -259,11 +259,11 @@ func (m *Main) process(cmd Command, cli CLI) (bool, error) {
 
 	if cli.Db {
 		var root string
-		root, pathList, err = m.context.UseIndexDb(pathList)
+		root, pathList, err = m.context.UseStoreDb(pathList)
 		if err == nil {
 			// pathList is relative to root
 			err = os.Chdir(root)
-			m.logInfo("", "Using indexdb in "+root)
+			m.logInfo("", "Using store-db in "+root)
 		}
 		if err != nil {
 			return false, err

context.go

@@ -68,32 +68,32 @@ func (context *Context) log(stat Status, message string) {
 	context.mutex.Lock()
 	defer context.mutex.Unlock()
 	switch stat {
-	case STATUS_ERR_DMG:
+	case StatusErrorDamage:
 		context.NumTotal++
-	case STATUS_UPDATE_INDEX:
+	case StatusUpdateIndex:
 		context.NumIdxUpd++
-	case STATUS_UP_WARN_OLD:
+	case StatusUpdateWarnOld:
 		context.NumTotal++
 		context.NumUpd++
-	case STATUS_UPDATE:
+	case StatusUpdate:
 		context.NumTotal++
 		context.NumUpd++
-	case STATUS_NEW:
+	case StatusNew:
 		context.NumTotal++
 		context.NumNew++
-	case STATUS_OK:
+	case StatusOK:
 		if !context.AddOnly {
 			context.NumTotal++
 		}
-	case STATUS_MISSING:
+	case StatusMissing:
 		context.NumDel++
 	}
 
 	context.LogQueue <- &LogEvent{stat, message}
 }
 
 func (context *Context) logErr(path string, err error) {
-	context.log(STATUS_PANIC, path+": "+err.Error())
+	context.log(StatusPanic, path+": "+err.Error())
 }
 
 func (context *Context) perfMonFiles(numFiles int64) {
@@ -152,7 +152,7 @@ func (context *Context) Process(pathList []string) {
 	if updated, err := context.store.Finish(); err != nil {
 		context.logErr("index", err)
 	} else if updated {
-		context.log(STATUS_INFO, "The index db was updated")
+		context.log(StatusInfo, "The index db was updated")
 	}
 	context.LogQueue <- nil
 }
@@ -193,7 +193,7 @@ func (context *Context) scanDir(root string, parentIgnore *Ignore) {
 			if !ignore.shouldIgnore(file.Name()) {
 				dirList = append(dirList, file.Name())
 			} else {
-				context.log(STATUS_IGNORE, file.Name()+"/")
+				context.log(StatusIgnore, file.Name()+"/")
 			}
 		} else if file.Type().IsRegular() {
 			filesToIndex = append(filesToIndex, file.Name())
@@ -209,7 +209,7 @@ func (context *Context) scanDir(root string, parentIgnore *Ignore) {
 	}
 }
 
-func (context *Context) UseIndexDb(pathList []string) (root string, relativePathList []string, err error) {
+func (context *Context) UseStoreDb(pathList []string) (root string, relativePathList []string, err error) {
 
 	if len(pathList) == 0 {
 		return "", nil, errors.New("missing path(s)")
@@ -225,7 +225,7 @@ func (context *Context) UseIndexDb(pathList []string) (root string, relativePath
 
 			// below root?
 			if !strings.HasPrefix(path, root) {
-				return "", nil, fmt.Errorf("path %s is not below the indexdb in %s", path, root)
+				return "", nil, fmt.Errorf("path %s is not below the store-db in %s", path, root)
 			}
 
 			relativePath, err := filepath.Rel(root, path)

index.go

@@ -74,7 +74,7 @@ func (i *Index) getIndexFilepath() string {
 }
 
 func (i *Index) logFilePanic(name string, message string) {
-	i.context.log(STATUS_PANIC, filepath.Join(i.path, name)+": "+message)
+	i.context.log(StatusPanic, filepath.Join(i.path, name)+": "+message)
 }
 
 func (i *Index) logFile(stat Status, name string) {
@@ -89,7 +89,7 @@ func (i *Index) calcHashes(ignore *Ignore) {
 	for _, name := range i.files {
 		if ignore.shouldIgnore(name) {
 			if !ignore.context.isChkbitFile(name) {
-				i.logFile(STATUS_IGNORE, name)
+				i.logFile(StatusIgnore, name)
 			}
 			continue
 		}
@@ -135,40 +135,40 @@ func (i *Index) calcHashes(ignore *Ignore) {
 func (i *Index) showIgnoredOnly(ignore *Ignore) {
 	for _, name := range i.files {
 		if ignore.shouldIgnore(name) {
-			i.logFile(STATUS_IGNORE, name)
+			i.logFile(StatusIgnore, name)
 		}
 	}
 }
 
 func (i *Index) checkFix(forceUpdateDmg bool) {
 	for name, b := range i.new {
 		if a, ok := i.cur[name]; !ok {
-			i.logFile(STATUS_NEW, name)
+			i.logFile(StatusNew, name)
 			i.modified = true
 		} else {
 			amod := int64(a.ModTime)
 			bmod := int64(b.ModTime)
 			if a.Hash != nil && b.Hash != nil && *a.Hash == *b.Hash {
-				i.logFile(STATUS_OK, name)
+				i.logFile(StatusOK, name)
 				if amod != bmod {
 					i.modified = true
 				}
 				continue
 			}
 
 			if amod == bmod {
-				i.logFile(STATUS_ERR_DMG, name)
+				i.logFile(StatusErrorDamage, name)
 				if !forceUpdateDmg {
 					// keep DMG entry
 					i.new[name] = a
 				} else {
 					i.modified = true
 				}
 			} else if amod < bmod {
-				i.logFile(STATUS_UPDATE, name)
+				i.logFile(StatusUpdate, name)
 				i.modified = true
 			} else if amod > bmod {
-				i.logFile(STATUS_UP_WARN_OLD, name)
+				i.logFile(StatusUpdateWarnOld, name)
 				i.modified = true
 			}
 		}
@@ -178,7 +178,7 @@ func (i *Index) checkFix(forceUpdateDmg bool) {
 		if _, ok := i.new[name]; !ok {
 			i.modified = true
 			if i.context.ShowMissing {
-				i.logFile(STATUS_MISSING, name)
+				i.logFile(StatusMissing, name)
 			}
 		}
 	}
@@ -192,7 +192,7 @@ func (i *Index) checkFix(forceUpdateDmg bool) {
 		if !m[name] {
 			i.modified = true
 			if i.context.ShowMissing {
-				i.logDir(STATUS_MISSING, name+"/")
+				i.logDir(StatusMissing, name+"/")
 			}
 		}
 	}
@@ -284,7 +284,7 @@ func (i *Index) load() error {
 		}
 		if data.IdxHash != hashMd5(text) {
 			i.modified = true
-			i.logFile(STATUS_ERR_IDX, i.getIndexFilepath())
+			i.logFile(StatusErrorIdx, i.getIndexFilepath())
 		}
 	} else {
 		var data1 indexFile1

status.go

@@ -3,31 +3,31 @@ package chkbit
 type Status string
 
 const (
-	STATUS_PANIC       Status = "EXC"
-	STATUS_ERR_IDX     Status = "ERX"
-	STATUS_ERR_DMG     Status = "DMG"
-	STATUS_UP_WARN_OLD Status = "old"
-	STATUS_UPDATE      Status = "upd"
-	STATUS_NEW         Status = "new"
-	STATUS_OK          Status = "ok "
-	STATUS_IGNORE      Status = "ign"
-	STATUS_MISSING     Status = "del"
-	STATUS_INFO        Status = "msg"
+	StatusPanic         Status = "EXC"
+	StatusErrorIdx      Status = "ERX"
+	StatusErrorDamage   Status = "DMG"
+	StatusUpdateWarnOld Status = "old"
+	StatusUpdate        Status = "upd"
+	StatusNew           Status = "new"
+	StatusOK            Status = "ok "
+	StatusIgnore        Status = "ign"
+	StatusMissing       Status = "del"
+	StatusInfo          Status = "msg"
 
 	// internal
-	STATUS_UPDATE_INDEX Status = "xup"
+	StatusUpdateIndex Status = "xup"
 )
 
 func (s Status) String() string {
 	return (string)(s)
 }
 
 func (s Status) IsErrorOrWarning() bool {
-	return s == STATUS_PANIC || s == STATUS_ERR_DMG || s == STATUS_ERR_IDX || s == STATUS_UP_WARN_OLD
+	return s == StatusPanic || s == StatusErrorDamage || s == StatusErrorIdx || s == StatusUpdateWarnOld
 }
 
 func (s Status) IsVerbose() bool {
-	return s == STATUS_OK || s == STATUS_IGNORE
+	return s == StatusOK || s == StatusIgnore
 }
 
 type LogEvent struct {

store.go

@@ -50,7 +50,7 @@ func (s *store) UseDb(path string, indexName string, refresh bool) {
 }
 
 func (s *store) logErr(message string) {
-	s.logQueue <- &LogEvent{STATUS_PANIC, "index-db: " + message}
+	s.logQueue <- &LogEvent{StatusPanic, "index-db: " + message}
 }
 
 func (s *store) Open(readOnly bool, numWorkers int) error {

worker.go

@@ -30,7 +30,7 @@ func (context *Context) runWorker(id int) {
 				if changed, err := index.save(); err != nil {
 					context.logErr(item.path, err)
 				} else if changed {
-					context.log(STATUS_UPDATE_INDEX, "")
+					context.log(StatusUpdateIndex, "")
 				}
 			}
 		}