浏览代码

Finalized and merged openwrt db implementation

Toby Chui 3 年之前
父节点
当前提交
2adadc8b4b

+ 1 - 1
mod/auth/authlogger/authlogger.go

@@ -38,7 +38,7 @@ type LoginRecord struct {
 func NewLogger() (*Logger, error) {
 	db, err := database.NewDatabase("./system/auth/authlog.db", false)
 	if err != nil {
-		return nil, errors.New("*ERROR* Failed to create database for login tracking")
+		return nil, errors.New("*ERROR* Failed to create database for login tracking: " + err.Error())
 	}
 	return &Logger{
 		database: db,

+ 1 - 1
mod/database/database.go

@@ -13,7 +13,7 @@ import (
 )
 
 type Database struct {
-	Db       interface{}
+	Db       interface{} //This will be nil on openwrt and *bolt.DB in the rest of the systems
 	Tables   sync.Map
 	ReadOnly bool
 }

+ 1 - 0
mod/info/hardwareinfo/sysinfo_darwin.go

@@ -1,3 +1,4 @@
+//go:build darwin
 // +build darwin
 
 package hardwareinfo

+ 1 - 0
mod/info/hardwareinfo/sysinfo_window.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package hardwareinfo

+ 5 - 0
mod/user/permissionHandler.go

@@ -64,6 +64,11 @@ func (u *User) GetInterfaceModules() []string {
 
 	}
 
+	if len(results) == 0 && u.IsAdmin() {
+		//Critial error occured. Assign desktop module to admin
+		results = append(results, "desktop")
+	}
+
 	return results
 }