sovonegr/TorrServerJellyfin
1
0
Fork 0
mirror of https://github.com/Ernous/TorrServerJellyfin.git synced 2025-12-19 21:46:11 +05:00
Code Issues Packages Projects Releases Wiki Activity

cosmetics

Browse Source
This commit is contained in:
nikk gitanes
2024-05-26 00:33:00 +03:00
parent cb0f0dd194
commit 6505d6e55d
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/settings/jsondb.go
View File

@@ -41,7 +41,6 @@ func (v *JsonDB) CloseDB() {
func (v *JsonDB) Set(xPath, name string, value []byte) {
var err error = nil
jsonObj := map[string]interface{}{}
if err := json.Unmarshal(value, &jsonObj); err == nil {
if filename, err := v.xPathToFilename(xPath); err == nil {
v.lock(filename)
@@ -101,8 +100,9 @@ func (v *JsonDB) Rem(xPath, name string) {
defer v.unlock(filename)
if root, err := v.readJsonFileAsMap(filename); err == nil {
delete(root, name)
v.writeMapAsJsonFile(filename, root)
return
if err = v.writeMapAsJsonFile(filename, root); err == nil {
return
}
}
}
v.log(fmt.Sprintf("Rem: error removing entry %s->%s", xPath, name), err)
@@ -135,7 +135,9 @@ func (v *JsonDB) readJsonFileAsMap(filename string) (map[string]interface{}, err
jsonData := map[string]interface{}{}
path := filepath.Join(v.Path, filename)
if fileData, err := os.ReadFile(path); err == nil {
err = json.Unmarshal(fileData, &jsonData)
if err = json.Unmarshal(fileData, &jsonData); err != nil {
v.log(fmt.Sprintf("readJsonFileAsMap fileData: %s error", fileData), err)
}
}
return jsonData, err
}
@@ -143,9 +145,10 @@ func (v *JsonDB) readJsonFileAsMap(filename string) (map[string]interface{}, err
func (v *JsonDB) writeMapAsJsonFile(filename string, o map[string]interface{}) error {
var err error = nil
path := filepath.Join(v.Path, filename)
if fileData, err := json.MarshalIndent(o, "", " "); err == nil {
err = os.WriteFile(path, fileData, v.fileMode)
if err = os.WriteFile(path, fileData, v.fileMode); err != nil {
v.log(fmt.Sprintf("writeMapAsJsonFile path: %s, fileMode: %s, fileData: %s error", path, v.fileMode, fileData), err)
}
}
return err
}

3
server/settings/settings.go
View File

@@ -1,7 +1,6 @@
package settings
import (
"fmt"
"os"
"path/filepath"
@@ -49,7 +48,7 @@ func InitSets(readOnly, searchWA bool) {
// We migrate settings here, it must be done before loadBTSets()
if err := Migrate2(bboltDB, jsonDB); err != nil {
log.TLogln(fmt.Sprintf("Migrate2 failed"))
log.TLogln("Migrate2 failed")
os.Exit(1)
}
loadBTSets()

4
server/settings/viewed.go
View File

@@ -93,8 +93,6 @@ func ListViewed(hash string) []*Viewed {
return ret
}
if err != nil {
log.TLogln("Error list viewed:", err)
}
log.TLogln("Error list viewed:", err)
return []*Viewed{}
}