zias/wolk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: add more go linters (#970)

Browse Source
This commit is contained in:
Oleg Lobanov
2020-06-01 01:12:36 +02:00
committed by GitHub
parent 54d92a2708
commit 700f32718e
56 changed files with 436 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
storage/bolt/importer/conf.go
View File

@@ -7,14 +7,14 @@ import (
"os"
"path/filepath"
"github.com/filebrowser/filebrowser/v2/auth"
"github.com/filebrowser/filebrowser/v2/users"
"github.com/asdine/storm"
"github.com/filebrowser/filebrowser/v2/settings"
"github.com/filebrowser/filebrowser/v2/storage"
toml "github.com/pelletier/go-toml"
yaml "gopkg.in/yaml.v2"
"github.com/filebrowser/filebrowser/v2/auth"
"github.com/filebrowser/filebrowser/v2/settings"
"github.com/filebrowser/filebrowser/v2/storage"
"github.com/filebrowser/filebrowser/v2/users"
)
type oldDefs struct {

17
storage/bolt/importer/importer.go
View File

@@ -2,34 +2,35 @@ package importer
import (
"github.com/asdine/storm"
"github.com/filebrowser/filebrowser/v2/storage/bolt"
)
// Import imports an old configuration to a newer database.
func Import(oldDB, oldConf, newDB string) error {
old, err := storm.Open(oldDB)
func Import(oldDBPath, oldConf, newDBPath string) error {
oldDB, err := storm.Open(oldDBPath)
if err != nil {
return err
}
defer old.Close()
defer oldDB.Close()
new, err := storm.Open(newDB)
newDB, err := storm.Open(newDBPath)
if err != nil {
return err
}
defer new.Close()
defer newDB.Close()
sto, err := bolt.NewStorage(new)
sto, err := bolt.NewStorage(newDB)
if err != nil {
return err
}
err = importUsers(old, sto)
err = importUsers(oldDB, sto)
if err != nil {
return err
}
err = importConf(old, oldConf, sto)
err = importConf(oldDB, oldConf, sto)
if err != nil {
return err
}

9
storage/bolt/importer/users.go
View File

@@ -5,10 +5,11 @@ import (
"fmt"
"github.com/asdine/storm"
bolt "go.etcd.io/bbolt"
"github.com/filebrowser/filebrowser/v2/rules"
"github.com/filebrowser/filebrowser/v2/storage"
"github.com/filebrowser/filebrowser/v2/users"
bolt "go.etcd.io/bbolt"
)
type oldUser struct {
@@ -29,7 +30,7 @@ type oldUser struct {
}
func readOldUsers(db *storm.DB) ([]*oldUser, error) {
users := []*oldUser{}
var oldUsers []*oldUser
err := db.Bolt.View(func(tx *bolt.Tx) error {
return tx.Bucket([]byte("User")).ForEach(func(k []byte, v []byte) error {
if len(v) > 0 && string(v)[0] == '{' {
@@ -40,14 +41,14 @@ func readOldUsers(db *storm.DB) ([]*oldUser, error) {
return err
}
users = append(users, user)
oldUsers = append(oldUsers, user)
}
return nil
})
})
return users, err
return oldUsers, err
}
func convertUsersToNew(old []*oldUser) ([]*users.User, error) {