Версия 1.0.2

README.md

@@ -1,6 +1,6 @@
 # IPTV Checker (iptvc)
 
-![Последний релиз](https://img.shields.io/gitea/v/release/IPTV/iptvc?gitea_url=https%3A%2F%2Fgit.axenov.dev&display_name=release&color=green&cacheSeconds=600)
+[![Последний релиз](https://img.shields.io/gitea/v/release/IPTV/iptvc?gitea_url=https%3A%2F%2Fgit.axenov.dev&display_name=release&color=green&cacheSeconds=600)](https://git.axenov.dev/IPTV/iptvc/releases/latest)
 
 Консольная программа для проверки IPTV-плейлистов в формате m3u или m3u8.
 

app/app.go

@@ -13,7 +13,7 @@ import (
 	"github.com/redis/go-redis/v9"
 )
 
-const VERSION = "1.0.0"
+const VERSION = "1.0.2"
 
 // Arguments описывает аргументы командной строки
 type Arguments struct {

app/checker/checker.go

@@ -18,6 +18,7 @@ import (
 	"io"
 	"log"
 	"maps"
+	"math"
 	"math/rand"
 	"net/http"
 	"os"
@@ -146,6 +147,7 @@ func CheckPlaylists(lists []playlist.Playlist) (int, int) {
 		if err != nil {
 			log.Printf("Cannot read playlist [%s]: %s\n", pls.Url, err)
 			offlineCount++
+			cachePlaylist(pls)
 			continue
 		}
 
@@ -156,9 +158,14 @@ func CheckPlaylists(lists []playlist.Playlist) (int, int) {
 
 		log.Printf("Parsed, checking channels (%d)...\n", len(pls.Channels))
 		pls = CheckChannels(pls)
-
 		lists[idx] = pls
+		cachePlaylist(pls)
+	}
 
+	return onlineCount, offlineCount
+}
+
+func cachePlaylist(pls playlist.Playlist) {
 	if app.Config.Cache.IsActive {
 		jsonBytes, err := json.Marshal(pls)
 		if err != nil {
@@ -175,9 +182,6 @@ func CheckPlaylists(lists []playlist.Playlist) (int, int) {
 	}
 }
 
-	return onlineCount, offlineCount
-}
-
 // CheckChannels проверяет каналы и возвращает их же с результатами проверки
 func CheckChannels(pls playlist.Playlist) playlist.Playlist {
 	type errorData struct {
@@ -265,7 +269,6 @@ func CheckChannels(pls playlist.Playlist) playlist.Playlist {
 		select {
 		case tvChannel := <-chOnline:
 			tvChannel.IsOnline = true
-			pls.OnlineCount++
 			pls.Channels[tvChannel.Id] = tvChannel
 			if app.Args.Verbose {
 				log.Printf("[%.3d/%.3d] ONLINE '%s'\n", idx, count, tvChannel.Title)
@@ -274,7 +277,6 @@ func CheckChannels(pls playlist.Playlist) playlist.Playlist {
 				log.Printf("> MimeType: %s\n", tvChannel.ContentType)
 			}
 		case tvChannel := <-chOffline:
-			pls.OfflineCount++
 			pls.Channels[tvChannel.Id] = tvChannel
 			if app.Args.Verbose {
 				log.Printf("[%.3d/%.3d] OFFLINE '%s'\n", idx, count, tvChannel.Title)
@@ -283,7 +285,6 @@ func CheckChannels(pls playlist.Playlist) playlist.Playlist {
 				log.Printf("> Status: %d\n", tvChannel.Status)
 			}
 		case data := <-chError:
-			pls.OfflineCount++
 			pls.Channels[data.tvChannel.Id] = data.tvChannel
 			if app.Args.Verbose {
 				log.Printf("[%.3d/%.3d] ERROR '%s'\n", idx, count, data.tvChannel.Title)
@@ -300,6 +301,14 @@ func CheckChannels(pls playlist.Playlist) playlist.Playlist {
 	close(chError)
 	pls.CheckedAt = time.Now().Unix()
 
+	for _, tvChannel := range pls.Channels {
+		if tvChannel.IsOnline {
+			pls.OnlineCount++
+		} else {
+			pls.OfflineCount++
+		}
+	}
+
 	log.Printf(
 		"Checked successfully! online=%d onlinePercent=%.2f%% offline=%d offlinePercent=%.2f%% elapsedTime=%.2fs",
 		pls.OnlineCount,
@@ -314,26 +323,27 @@ func CheckChannels(pls playlist.Playlist) playlist.Playlist {
 
 // calcParameters вычисляет оптимальное количество горутин и таймаут запроса
 func calcParameters(count int) (time.Duration, int) {
-	var routines int
-	var percentage float32
-
-	if count <= 100 {
-		routines = count
-	} else {
-		percentage = float32(runtime.NumCPU()) * 0.075
+	percentage := float32(runtime.NumCPU()) / 10
 	for percentage >= 1 {
 		percentage *= 0.5
 	}
-		routines = int(float32(count) * percentage)
-	}
-	if routines > 500 {
-		routines = 500
+
+	routines := int(float32(count) * percentage)
+	if routines > 1500 {
+		routines = 1500
 	}
 	if routines < 1 {
 		routines = 1
 	}
 
-	timeout := 10 / float32(count) * 150
+	var digits int
+	x := count
+	for x >= 10 {
+		digits++
+		x /= 10
+	}
+
+	timeout := int(math.Ceil(math.Pow(10, float64(digits)) / float64(count) * 15))
 	if timeout > 10 {
 		timeout = 10
 	}

app/playlist/playlist.go

@@ -12,6 +12,7 @@ import (
 	"os"
 	"regexp"
 	"strings"
+	"time"
 )
 
 // Group - структура для хранения информации о группе каналов
@@ -123,6 +124,8 @@ func parseName(line string) string {
 func (pls *Playlist) Download() error {
 	content, err := utils.Fetch(pls.Url)
 	if err != nil {
+		pls.Content = err.Error()
+		pls.CheckedAt = time.Now().Unix()
 		return err
 	}
 
@@ -134,6 +137,8 @@ func (pls *Playlist) Download() error {
 func (pls *Playlist) ReadFromFs() error {
 	content, err := os.ReadFile(pls.Url)
 	if err != nil {
+		pls.Content = err.Error()
+		pls.CheckedAt = time.Now().Unix()
 		return err
 	}
 
@@ -144,6 +149,7 @@ func (pls *Playlist) ReadFromFs() error {
 // Parse разбирает плейлист
 func (pls *Playlist) Parse() Playlist {
 	isChannel := false
+	pls.Attributes = make(map[string]string)
 	pls.Channels = make(map[string]Channel)
 	pls.Groups = make(map[string]Group)