Реализовано кеширование проверенных плейлистов, при включенном кеше -r теперь не учитывает только некешированные из ini-файла

This commit is contained in:
2025-05-08 11:14:59 +08:00
parent 994df87846
commit c1a7f7e289
10 changed files with 106 additions and 47 deletions

View File

@@ -12,7 +12,9 @@ import (
"axenov/iptv-checker/app/playlist"
"axenov/iptv-checker/app/tagfile"
"axenov/iptv-checker/app/utils"
"context"
"crypto/tls"
"encoding/json"
"io"
"log"
"maps"
@@ -26,7 +28,10 @@ import (
"time"
)
var tagBlocks []tagfile.TagBlock
var (
tagBlocks []tagfile.TagBlock
ctx = context.Background()
)
// PrepareListsToCheck готовит список плейлистов для проверки
func PrepareListsToCheck(files []string, urls []string, codes []string) []playlist.Playlist {
@@ -68,7 +73,19 @@ func PrepareListsToCheck(files []string, urls []string, codes []string) []playli
lists = append(lists, list)
}
} else {
lists = slices.Collect(maps.Values(ini.Lists))
if app.Config.Cache.IsActive {
cachedLists := getCachedPlaylists()
for key := range ini.Lists {
if _, ok := cachedLists[key]; ok {
continue
}
lists = append(lists, ini.Lists[key])
}
log.Printf("Found %d cached playlists\n", len(cachedLists))
} else {
lists = slices.Collect(maps.Values(ini.Lists))
}
if int(app.Args.RandomCount) > 0 && int(app.Args.RandomCount) <= len(lists) {
rand.Shuffle(len(lists), func(i int, j int) { lists[i], lists[j] = lists[j], lists[i] })
lists = lists[:app.Args.RandomCount]
@@ -79,17 +96,31 @@ func PrepareListsToCheck(files []string, urls []string, codes []string) []playli
return lists
}
// getCachedPlaylists возвращает из кеша проверенные ранее плейлисты
func getCachedPlaylists() map[string]playlist.Playlist {
result := make(map[string]playlist.Playlist)
keys := app.Cache.Keys(ctx, "*")
for _, key := range keys.Val() {
value := app.Cache.Get(ctx, key).Val()
var pls playlist.Playlist
_ = json.Unmarshal([]byte(value), &pls)
result[pls.Code] = pls
}
return result
}
// CheckPlaylists проверяет плейлисты и возвращает их же с результатами проверки
func CheckPlaylists(lists []playlist.Playlist) (int, int) {
step, onlineCount, offlineCount := 0, 0, 0
count := len(lists)
tagBlocks = tagfile.Init(app.Args.TagsPath)
if count == 0 {
log.Println("There are no playlists to check")
os.Exit(0)
}
log.Printf("%d playlists will be checked\n", len(lists))
step, onlineCount, offlineCount := 0, 0, 0
tagBlocks = tagfile.Init(app.Args.TagsPath)
for idx := range lists {
pls := lists[idx]
step++
@@ -127,6 +158,21 @@ func CheckPlaylists(lists []playlist.Playlist) (int, int) {
pls = CheckChannels(pls)
lists[idx] = pls
if app.Config.Cache.IsActive {
jsonBytes, err := json.Marshal(pls)
if err != nil {
log.Printf("Error while saving playlist to cache: %s", err)
}
ttl := time.Duration(app.Config.Cache.Ttl) * time.Second
written := app.Cache.Set(ctx, pls.Code, string(jsonBytes), ttl)
if written.Err() != nil {
log.Printf("Error while saving playlist to cache: %s", err)
}
log.Println("Cached sucessfully")
}
}
return onlineCount, offlineCount
@@ -188,7 +234,7 @@ func CheckChannels(pls playlist.Playlist) playlist.Playlist {
tvChannel.ContentType = resp.Header.Get("Content-Type")
bodyBytes, _ := io.ReadAll(resp.Body)
bodyString := string(bodyBytes)
resp.Body.Close()
_ = resp.Body.Close()
contentType := http.DetectContentType(bodyBytes)
isContentBinary := strings.Contains(contentType, "octet-stream") ||