nathan/xTeVe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fix: Image caching (#172)

Browse Source
This commit is contained in:
marmei
2020-10-03 11:56:50 +02:00
parent db59f7ef37
commit f43ce0f7c5
8 changed files with 312 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/data.go
View File

@@ -12,6 +12,7 @@ import (
"time"
"../src/internal/authentication"
"../src/internal/imgcache"
)
// Einstellungen ändern (WebUI)
@@ -203,25 +204,38 @@ func updateServerSettings(request RequestStruct) (settings SettingsStruct, err e
if cacheImages == true {
if Settings.EpgSource == "XEPG" {
if Settings.EpgSource == "XEPG" && System.ImageCachingInProgress == 0 {
go func() {
Data.Cache.Images, err = imgcache.New(System.Folder.ImagesCache, fmt.Sprintf("%s://%s/images/", System.ServerProtocol.WEB, System.Domain), Settings.CacheImages)
if err != nil {
ShowError(err, 0)
}
if Settings.CacheImages == true {
switch Settings.CacheImages {
createXMLTVFile()
cachingImages()
createXMLTVFile()
createM3UFile()
case false:
createXMLTVFile()
createM3UFile()
} else {
case true:
go func() {
createXMLTVFile()
createM3UFile()
}
System.ImageCachingInProgress = 1
showInfo("Image Caching:Images are cached")
}()
Data.Cache.Images.Image.Caching()
showInfo("Image Caching:Done")
System.ImageCachingInProgress = 0
buildXEPG(false)
}()
}
}
@@ -496,6 +510,11 @@ func saveXEpgMapping(request RequestStruct) (err error) {
var tmp = Data.XEPG
Data.Cache.Images, err = imgcache.New(System.Folder.ImagesCache, fmt.Sprintf("%s://%s/images/", System.ServerProtocol.WEB, System.Domain), Settings.CacheImages)
if err != nil {
ShowError(err, 0)
}
err = json.Unmarshal([]byte(mapToJSON(request.EpgMapping)), &tmp)
if err != nil {
return
@@ -512,19 +531,9 @@ func saveXEpgMapping(request RequestStruct) (err error) {
System.ScanInProgress = 1
cleanupXEPG()
System.ScanInProgress = 0
buildXEPG(true)
go func() {
createXMLTVFile()
createM3UFile()
showInfo("XEPG:" + fmt.Sprintf("Ready to use"))
go cachingImages()
System.ScanInProgress = 0
}()
} else {
// Wenn während des erstellen der Datanbank das Mapping erneut gespeichert wird, wird die Datenbank erst später erneut aktualisiert.
@@ -545,15 +554,10 @@ func saveXEpgMapping(request RequestStruct) (err error) {
}
System.ScanInProgress = 1
cleanupXEPG()
buildXEPG(false)
createXMLTVFile()
createM3UFile()
showInfo("XEPG:" + fmt.Sprintf("Ready to use"))
go cachingImages()
System.ScanInProgress = 0
buildXEPG(false)
showInfo("XEPG:" + fmt.Sprintf("Ready to use"))
System.BackgroundProcess = false