sovonegr/TorrServerJellyfin
1
0
Fork 0
mirror of https://github.com/Ernous/TorrServerJellyfin.git synced 2025-12-20 22:16:09 +05:00
Code Issues Packages Projects Releases Wiki Activity

cosmetics

Browse Source
This commit is contained in:
nikk gitanes
2025-02-01 08:07:21 +03:00
parent 0ea54ce652
commit 1be5080e96
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/settings/migrate.go
View File

@@ -8,6 +8,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"reflect" "reflect"
"time"
"server/log" "server/log"
"server/web/api/utils" "server/web/api/utils"
@@ -27,13 +28,14 @@ type torrentOldDB struct {
} }
// Migrate from torrserver.db to config.db // Migrate from torrserver.db to config.db
func Migrate1() { func MigrateTorrents() {
if _, err := os.Lstat(filepath.Join(Path, "torrserver.db")); os.IsNotExist(err) { if _, err := os.Lstat(filepath.Join(Path, "torrserver.db")); os.IsNotExist(err) {
return return
} }
db, err := bolt.Open(filepath.Join(Path, "torrserver.db"), 0o666, nil) db, err := bolt.Open(filepath.Join(Path, "torrserver.db"), 0o666, &bolt.Options{Timeout: 5 * time.Second})
if err != nil { if err != nil {
log.TLogln("MigrateTorrents", err)
return return
} }
@@ -107,7 +109,7 @@ func b2i(v []byte) int64 {
} }
/* /*
=== Migrate 2 === === MigrateToJson ===
Migrate 'Settings' and 'Viewed' buckets from BBolt ('config.db') Migrate 'Settings' and 'Viewed' buckets from BBolt ('config.db')
to separate JSON files ('settings.json' and 'viewed.json') to separate JSON files ('settings.json' and 'viewed.json')
@@ -117,7 +119,7 @@ due to the fact that BLOBs are stored there
To make user be able to roll settings back, no data is deleted from 'config.db' file. To make user be able to roll settings back, no data is deleted from 'config.db' file.
*/ */
func Migrate2(bboltDB, jsonDB TorrServerDB) error { func MigrateToJson(bboltDB, jsonDB TorrServerDB) error {
var err error = nil var err error = nil
const XPATH_SETTINGS = "Settings" const XPATH_SETTINGS = "Settings"

6
server/settings/settings.go
View File

@@ -48,12 +48,12 @@ func InitSets(readOnly, searchWA bool) {
tdb = NewDBReadCache(dbRouter) tdb = NewDBReadCache(dbRouter)
// We migrate settings here, it must be done before loadBTSets() // We migrate settings here, it must be done before loadBTSets()
if err := Migrate2(bboltDB, jsonDB); err != nil { if err := MigrateToJson(bboltDB, jsonDB); err != nil {
log.TLogln("Migrate2 failed") log.TLogln("MigrateToJson failed")
os.Exit(1) os.Exit(1)
} }
loadBTSets() loadBTSets()
Migrate1() MigrateTorrents()
} }
func CloseDB() { func CloseDB() {