Версия 1.0.1

.env.example

@@ -1,10 +1,9 @@
 APP_DEBUG=false
 
-HTTP_HOST=0.0.0.0
+CACHE_ENABLED=false
-HTTP_PORT=8031
+CACHE_HOST=localhost
-
+CACHE_PORT=6379
-REDIS_HOST=
+CACHE_USERNAME=
-REDIS_PORT=
+CACHE_PASSWORD=
-REDIS_USERNAME=
+CACHE_DB=1
-REDIS_PASSWORD=
+CACHE_TTL=1800
-REDIS_DB=

README.md

@@ -1,5 +1,7 @@
 # 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)
+
 Консольная программа для проверки IPTV-плейлистов в формате m3u или m3u8.
 
 > [!IMPORTANT]

app/app.go

@@ -7,11 +7,13 @@
 package app
 
 import (
+	"axenov/iptv-checker/app/cache"
 	"axenov/iptv-checker/app/config"
+	"axenov/iptv-checker/app/logger"
 	"github.com/redis/go-redis/v9"
 )
 
-const VERSION = "0.1.0"
+const VERSION = "1.0.1"
 
 // Arguments описывает аргументы командной строки
 type Arguments struct {
@@ -25,14 +27,15 @@ type Arguments struct {
 
 var (
 	Args   Arguments
-	Redis  *redis.Client
+	Cache  *redis.Client
 	Config *config.Config
-	//TagBlocks []tagfile.TagBlock
 )
 
-// Init инициализирует глобальные переменные
+// Init инициализирует конфигурацию и подключение к keydb
 func Init() {
 	Config = config.Init()
-	//logger.Init(Args.NeedQuiet)
+	logger.Init(Args.NeedQuiet)
-	//Redis = cache.Init(Config.Redis)
+	if Config.Cache.IsEnabled {
+		Cache = cache.Init(&Config.Cache)
+	}
 }

app/cache/cache.go

@@ -15,22 +15,23 @@ import (
 	"strconv"
 )
 
-func Init(cfg config.RedisConfig) *redis.Client {
+func Init(cfg *config.CacheConfig) *redis.Client {
-	rdb := redis.NewClient(&redis.Options{
+	redis := redis.NewClient(&redis.Options{
 		Addr:         fmt.Sprintf("%s:%s", cfg.Host, strconv.Itoa(int(cfg.Port))),
 		DB:           int(cfg.Db),
 		PoolSize:     1000,
 		ReadTimeout:  -1,
 		WriteTimeout: -1,
 	})
-	client := rdb.Conn()
+	client := redis.Conn()
-
+	ctx := context.Background()
-	var ctx context.Context
+	err := client.Ping(ctx).Err()
-	if client.Ping(ctx).Err() != nil {
+	if err == nil {
-		log.Println("Error while connecting to Redis", cfg.Host, cfg.Port, cfg.Db)
+		log.Println("Connected to cache DB")
+		cfg.IsActive = true
 	} else {
-		log.Println("Connected to Redis", cfg.Host, cfg.Port, cfg.Db)
+		log.Println("Error while connecting to cache DB, program may work not as expected:", err)
 	}
 
-	return rdb
+	return redis
 }

app/checker/checker.go

@@ -12,8 +12,9 @@ import (
 	"axenov/iptv-checker/app/playlist"
 	"axenov/iptv-checker/app/tagfile"
 	"axenov/iptv-checker/app/utils"
+	"context"
+	"crypto/tls"
 	"encoding/json"
-	"fmt"
 	"io"
 	"log"
 	"maps"
@@ -27,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 {
@@ -52,43 +56,71 @@ func PrepareListsToCheck(files []string, urls []string, codes []string) []playli
 		}
 	}
 
-	ini, err := inifile.Init(app.Args.IniPath)
+	if len(lists) == 0 || len(codes) > 0 {
-	if err != nil {
+		ini, err := inifile.Init(app.Args.IniPath)
-		log.Printf("Warning: %s, all --code flags will be ignored\n", err)
+		if err != nil {
-		return lists
+			log.Printf("Warning: %s, all --code flags will be ignored\n", err)
-	}
+			return lists
-
-	if len(codes) > 0 {
-		for _, plsCode := range codes {
-			list := ini.Lists[plsCode]
-			if list.Url == "" {
-				log.Printf("Warning: playlist [%s] not found in ini-file, skipping\n", plsCode)
-				continue
-			}
-			lists = append(lists, list)
 		}
-	} else {
+
-		lists = slices.Collect(maps.Values(ini.Lists))
+		if len(codes) > 0 {
-		if int(app.Args.RandomCount) > 0 && int(app.Args.RandomCount) <= len(lists) {
+			for _, plsCode := range codes {
-			rand.Shuffle(len(lists), func(i int, j int) { lists[i], lists[j] = lists[j], lists[i] })
+				list := ini.Lists[plsCode]
-			lists = lists[:app.Args.RandomCount]
+				if list.Url == "" {
+					log.Printf("Warning: playlist [%s] not found in ini-file, skipping\n", plsCode)
+					continue
+				}
+				lists = append(lists, list)
+			}
+		} else {
+			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]
+			}
 		}
 	}
 
 	return lists
 }
 
-// CheckPlaylists проверяет плейлисты и возвращает их же с результатами проверки
+// getCachedPlaylists возвращает из кеша проверенные ранее плейлисты
-func CheckPlaylists(lists []playlist.Playlist) {
+func getCachedPlaylists() map[string]playlist.Playlist {
-	step := 0
+	result := make(map[string]playlist.Playlist)
-	count := len(lists)
+	keys := app.Cache.Keys(ctx, "*")
-	tagBlocks = tagfile.Init(app.Args.TagsPath)
+	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) {
+	count := len(lists)
 	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++
@@ -112,23 +144,40 @@ func CheckPlaylists(lists []playlist.Playlist) {
 		}
 
 		if err != nil {
-			log.Printf("Cannot read playlist [%s]: %s", pls.Url, err)
+			log.Printf("Cannot read playlist [%s]: %s\n", pls.Url, err)
+			offlineCount++
+			cachePlaylist(pls)
 			continue
 		}
 
 		log.Println("Parsing content...")
 		pls.IsOnline = true
+		onlineCount++
 		pls = pls.Parse()
 
 		log.Printf("Parsed, checking channels (%d)...\n", len(pls.Channels))
 		pls = CheckChannels(pls)
-
 		lists[idx] = pls
+		cachePlaylist(pls)
 	}
 
-	if app.Args.NeedJson {
+	return onlineCount, offlineCount
-		marshal, _ := json.Marshal(lists)
+}
-		fmt.Println(string(marshal))
+
+func cachePlaylist(pls playlist.Playlist) {
+	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")
 	}
 }
 
@@ -140,6 +189,11 @@ func CheckChannels(pls playlist.Playlist) playlist.Playlist {
 	}
 
 	count := len(pls.Channels)
+	if count == 0 {
+		log.Println("There are no channels to check, skipping")
+		return pls
+	}
+
 	timeout, routines := calcParameters(count)
 	httpClient := http.Client{Timeout: timeout}
 	chSemaphores := make(chan struct{}, routines)
@@ -160,6 +214,7 @@ func CheckChannels(pls playlist.Playlist) playlist.Playlist {
 
 			tvChannel.Tags = getTagsForChannel(tvChannel)
 
+			http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
 			req, err := http.NewRequest("GET", tvChannel.URL, nil)
 			tvChannel.CheckedAt = time.Now().Unix()
 			if err != nil {
@@ -182,7 +237,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") ||
@@ -251,9 +306,9 @@ func CheckChannels(pls playlist.Playlist) playlist.Playlist {
 	log.Printf(
 		"Checked successfully! online=%d onlinePercent=%.2f%% offline=%d offlinePercent=%.2f%% elapsedTime=%.2fs",
 		pls.OnlineCount,
-		float64(pls.OnlineCount)/float64(len(pls.Channels))*100,
+		float32(pls.OnlineCount)/float32(len(pls.Channels))*100,
 		pls.OfflineCount,
-		float64(pls.OfflineCount)/float64(len(pls.Channels))*100,
+		float32(pls.OfflineCount)/float32(len(pls.Channels))*100,
 		time.Since(startTime).Seconds(),
 	)
 
@@ -262,33 +317,18 @@ func CheckChannels(pls playlist.Playlist) playlist.Playlist {
 
 // calcParameters вычисляет оптимальное количество горутин и таймаут запроса
 func calcParameters(count int) (time.Duration, int) {
-	// коэффициент нагрузки
+	var routines int
-	var k float32
+	var percentage float32
-	// чем ниже, тем больше горутин, меньше таймаут, быстрее проверка, хуже результаты
-	// чем выше, тем меньше горутин, больше таймаут, медленнее проверка, лучше результаты
 
-	switch true {
+	if count <= 100 {
-	case count >= 4000:
+		routines = count
-		k = 5
+	} else {
-	case count >= 3000:
+		percentage = float32(runtime.NumCPU()) * 0.075
-		k = 4.5
+		for percentage >= 1 {
-	case count >= 2500:
+			percentage *= 0.5
-		k = 4
+		}
-	case count >= 2000:
+		routines = int(float32(count) * percentage)
-		k = 3.5
-	case count >= 1500:
-		k = 3
-	case count >= 1000:
-		k = 2.5
-	case count >= 500:
-		k = 2
-	case count >= 100:
-		k = 1.5
-	default:
-		k = 1
 	}
-
-	routines := int(float32(count) / k / float32(runtime.NumCPU()))
 	if routines > 500 {
 		routines = 500
 	}
@@ -296,7 +336,7 @@ func calcParameters(count int) (time.Duration, int) {
 		routines = 1
 	}
 
-	timeout := 10/k + 2
+	timeout := 10 / float32(count) * 150
 	if timeout > 10 {
 		timeout = 10
 	}
@@ -306,7 +346,7 @@ func calcParameters(count int) (time.Duration, int) {
 
 	duration := time.Duration(timeout) * time.Second
 	log.Printf(
-		"Check parameters calculated: count=%d timeout=%.2fs routines=%d\n",
+		"Check parameters calculated count=%d timeout=%.2fs routines=%d\n",
 		count,
 		duration.Seconds(),
 		routines,

app/config/config.go

@@ -7,6 +7,7 @@
 package config
 
 import (
+	"github.com/joho/godotenv"
 	"os"
 	"strconv"
 )
@@ -14,39 +15,34 @@ import (
 // Config описывает конфигурацию
 type Config struct {
 	DebugMode bool
-	Redis     RedisConfig
+	Cache     CacheConfig
-	Http      HttpConfig
 }
 
-// RedisConfig описывает конфигурацию подключения к Redis
+// CacheConfig описывает конфигурацию подключения к keydb
-type RedisConfig struct {
+type CacheConfig struct {
-	Host     string
+	IsEnabled bool
-	Port     uint
+	Host      string
-	Username string
+	Port      uint
-	Password string
+	Username  string
-	Db       uint
+	Password  string
-}
+	Db        uint
-
+	Ttl       uint
-// HttpConfig описывает конфигурацию веб-сервера
+	IsActive  bool
-type HttpConfig struct {
-	Host string
-	Port uint
 }
 
 // Init инициализирует объект конфигурации из переменных окружения
 func Init() *Config {
+	_ = godotenv.Load(".env")
 	return &Config{
-		DebugMode: readEnvBoolean("APP_DEBUG", false),
+		//DebugMode: readEnvBoolean("APP_DEBUG", false),
-		Redis: RedisConfig{
+		Cache: CacheConfig{
-			Host:     readEnv("REDIS_HOST", ""),
+			IsEnabled: readEnvBoolean("CACHE_ENABLED", false),
-			Port:     readEnvInteger("REDIS_PORT", 6379),
+			Host:      readEnv("CACHE_HOST", "localhost"),
-			Username: readEnv("REDIS_USERNAME", ""),
+			Port:      readEnvInteger("CACHE_PORT", 6379),
-			Password: readEnv("REDIS_PASSWORD", ""),
+			Username:  readEnv("CACHE_USERNAME", ""),
-			Db:       readEnvInteger("REDIS_DB", 0),
+			Password:  readEnv("CACHE_PASSWORD", ""),
-		},
+			Db:        readEnvInteger("CACHE_DB", 0),
-		Http: HttpConfig{
+			Ttl:       readEnvInteger("CACHE_TTL", 1800),
-			Host: readEnv("HTTP_HOST", "0.0.0.0"),
-			Port: readEnvInteger("HTTP_PORT", 1380),
 		},
 	}
 }
@@ -57,7 +53,6 @@ func readEnv(key string, defaultValue string) string {
 	if exists {
 		return value
 	}
-
 	return defaultValue
 }
 

app/inifile/inifile.go

@@ -44,7 +44,7 @@ func Init(path string) (IniFile, error) {
 
 	log.Println("Loading playlists from ini-file:", pathNormalized)
 	for _, section := range iniFile.Sections() {
-		if section.Name() == ini.DefaultSection { //TODO выкосить костыль
+		if section.Name() == ini.DefaultSection {
 			continue
 		}
 

app/playlist/playlist.go

@@ -123,6 +123,7 @@ func parseName(line string) string {
 func (pls *Playlist) Download() error {
 	content, err := utils.Fetch(pls.Url)
 	if err != nil {
+		pls.Content = err.Error()
 		return err
 	}
 
@@ -134,6 +135,7 @@ func (pls *Playlist) Download() error {
 func (pls *Playlist) ReadFromFs() error {
 	content, err := os.ReadFile(pls.Url)
 	if err != nil {
+		pls.Content = err.Error()
 		return err
 	}
 
@@ -144,6 +146,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)
 

app/tagfile/tagfile.go

@@ -65,20 +65,20 @@ func Init(path string) []TagBlock {
 	pathNormalized, _ := utils.ExpandPath(path)
 	_, err := os.Stat(pathNormalized)
 	if err != nil {
-		log.Println("Warning: tagfile load error (", err, "), all channels will be untagged")
+		log.Println("Warning: all channels will be untagged due to error:", err)
 		return nil
 	}
 
 	content, err := os.ReadFile(pathNormalized)
 	if err != nil {
-		log.Println("Warning: tagfile load error (", err, "), all channels will be untagged")
+		log.Println("Warning: all channels will be untagged due to error:", err)
 		return nil
 	}
 
 	var blocks []TagBlock
 	err = json.Unmarshal(content, &blocks)
 	if err != nil {
-		log.Println("Warning: tagfile load error (", err, "), all channels will be untagged")
+		log.Println("Warning: all channels will be untagged due to error:", err)
 		return nil
 	}
 

app/utils/utils.go

@@ -8,6 +8,7 @@ package utils
 
 import (
 	"crypto/md5"
+	"crypto/tls"
 	"encoding/hex"
 	"fmt"
 	"io"
@@ -55,6 +56,7 @@ func Fetch(url string) ([]byte, error) {
 		"Mozilla/5.0 WINK/1.31.1 (AndroidTV/9) HlsWinkPlayer",
 	)
 
+	http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
 	httpClient := http.Client{Timeout: 5 * time.Second}
 	resp, err := httpClient.Do(req)
 	if err != nil {

cmd/check.go

@@ -9,10 +9,11 @@ package cmd
 import (
 	"axenov/iptv-checker/app"
 	"axenov/iptv-checker/app/checker"
-	"axenov/iptv-checker/app/logger"
+	"encoding/json"
+	"fmt"
 	"github.com/spf13/cobra"
 	"log"
-	"os"
+	"time"
 )
 
 // checkCmd represents the file command
@@ -20,19 +21,28 @@ var checkCmd = &cobra.Command{
 	Use:   "check",
 	Short: "Check playlists",
 	Run: func(cmd *cobra.Command, args []string) {
-		logger.Init(app.Args.NeedQuiet)
+		app.Init()
 
 		files, _ := cmd.Flags().GetStringSlice("file")
 		urls, _ := cmd.Flags().GetStringSlice("url")
 		codes, _ := cmd.Flags().GetStringSlice("code")
-
-		if len(files) < 1 && len(urls) < 1 && len(codes) < 1 {
-			log.Println("ERROR: You should provide at least one of --file, --url or --code flags")
-			os.Exit(2)
-		}
-
 		lists := checker.PrepareListsToCheck(files, urls, codes)
-		checker.CheckPlaylists(lists)
+
+		startTime := time.Now()
+		onlineCount, offlineCount := checker.CheckPlaylists(lists)
+
+		log.Printf(
+			"Done! count=%d online=%d offline=%d elapsedTime=%.2fs\n",
+			len(lists),
+			onlineCount,
+			offlineCount,
+			time.Since(startTime).Seconds(),
+		)
+
+		if app.Args.NeedJson {
+			marshal, _ := json.Marshal(lists)
+			fmt.Println(string(marshal))
+		}
 	},
 }
 

cmd/root.go

@@ -27,7 +27,6 @@ Copyright (c) 2025, Антон Аксенов, MIT license.`,
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {
-	app.Init()
 	err := rootCmd.Execute()
 	if err != nil {
 		os.Exit(1)

go.mod

@@ -3,7 +3,9 @@ module axenov/iptv-checker
 go 1.23.6
 
 require (
+	github.com/joho/godotenv v1.5.1
 	github.com/redis/go-redis/v9 v9.7.3
+	github.com/spf13/cobra v1.9.1
 	gopkg.in/ini.v1 v1.67.0
 )
 
@@ -12,7 +14,6 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/spf13/cobra v1.9.1 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/stretchr/testify v1.7.0 // indirect
 )

go.sum

@@ -12,6 +12,8 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/r
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/redis/go-redis/v9 v9.7.3 h1:YpPyAayJV+XErNsatSElgRZZVCwXX9QzkKYNvO7x0wM=
@@ -27,6 +29,6 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=