Fix: Issue #5

This commit is contained in:
aceberg 2022-08-26 13:26:43 +07:00
parent c62d81ca5b
commit 32d1b9eb7b
3 changed files with 8 additions and 3 deletions

View file

@ -14,7 +14,7 @@ on:
env: env:
IMAGE_NAME: watchyourlan IMAGE_NAME: watchyourlan
TAGS: latest, v0.7 TAGS: latest, v0.7.1
jobs: jobs:

View file

@ -36,6 +36,7 @@ func db_select() (dbHosts []Host) {
log.Fatal(err) log.Fatal(err)
} }
oneHost.Name = unquote_str(oneHost.Name) oneHost.Name = unquote_str(oneHost.Name)
oneHost.Hw = unquote_str(oneHost.Hw)
dbHosts = append(dbHosts, oneHost) dbHosts = append(dbHosts, oneHost)
} }

View file

@ -26,19 +26,23 @@ func db_create() {
} }
func db_insert(oneHost Host) { func db_insert(oneHost Host) {
oneHost.Name = quote_str(oneHost.Name)
oneHost.Hw = quote_str(oneHost.Hw)
sqlStatement := `INSERT INTO "now" (NAME, IP, MAC, HW, DATE, KNOWN, NOW) sqlStatement := `INSERT INTO "now" (NAME, IP, MAC, HW, DATE, KNOWN, NOW)
VALUES ('%s','%s','%s','%s','%s','%d','%d');` VALUES ('%s','%s','%s','%s','%s','%d','%d');`
sqlStatement = fmt.Sprintf(sqlStatement, quote_str(oneHost.Name), oneHost.Ip, oneHost.Mac, oneHost.Hw, oneHost.Date, oneHost.Known, oneHost.Now) sqlStatement = fmt.Sprintf(sqlStatement, oneHost.Name, oneHost.Ip, oneHost.Mac, oneHost.Hw, oneHost.Date, oneHost.Known, oneHost.Now)
//fmt.Println("Insert statement:", sqlStatement) //fmt.Println("Insert statement:", sqlStatement)
db_exec(sqlStatement) db_exec(sqlStatement)
} }
func db_update(oneHost Host) { func db_update(oneHost Host) {
oneHost.Name = quote_str(oneHost.Name)
oneHost.Hw = quote_str(oneHost.Hw)
sqlStatement := `UPDATE "now" set sqlStatement := `UPDATE "now" set
NAME = '%s', IP = '%s', MAC = '%s', HW = '%s', DATE = '%s', NAME = '%s', IP = '%s', MAC = '%s', HW = '%s', DATE = '%s',
KNOWN = '%d', NOW = '%d' KNOWN = '%d', NOW = '%d'
WHERE ID = '%d';` WHERE ID = '%d';`
sqlStatement = fmt.Sprintf(sqlStatement, quote_str(oneHost.Name), oneHost.Ip, oneHost.Mac, oneHost.Hw, oneHost.Date, oneHost.Known, oneHost.Now, oneHost.Id) sqlStatement = fmt.Sprintf(sqlStatement, oneHost.Name, oneHost.Ip, oneHost.Mac, oneHost.Hw, oneHost.Date, oneHost.Known, oneHost.Now, oneHost.Id)
//fmt.Println("Update statement:", sqlStatement) //fmt.Println("Update statement:", sqlStatement)
db_exec(sqlStatement) db_exec(sqlStatement)
} }