IPTV/iptvc
1
1
Fork 0
Code Issues 4 Pull Requests Actions Packages Releases 13 Activity

wip2

Browse Source
This commit is contained in:
Anthony Axenov
2026-05-30 09:24:42 +08:00
parent 6c3de4b2ef
commit e054f458bb
17 changed files with 533 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/app.go
+23 -1
View File
@@ -10,11 +10,12 @@ import (
"axenov/iptv-checker/app/cache"
"axenov/iptv-checker/app/config"
"axenov/iptv-checker/app/logger"
"log"
"github.com/redis/go-redis/v9"
)
const VERSION = "1.1.3"
var version = "dev"
// Arguments описывает аргументы командной строки
type Arguments struct {
@@ -34,6 +35,18 @@ var (
Config *config.Config
)
// SetVersion устанавливает версию приложения
func SetVersion(v string) {
if v != "" {
version = v
}
}
// Version возвращает версию приложения
func Version() string {
return version
}
// Init инициализирует конфигурацию и подключение к keydb
func Init() {
Config = config.Init()
@@ -42,3 +55,12 @@ func Init() {
Cache = cache.Init(&Config.Cache)
}
}
// Shutdown корректно завершает работу приложения
func Shutdown() {
if Cache != nil {
if err := Cache.Close(); err != nil {
log.Printf("Error closing cache connection: %s", err)
}
}
}
app/checker/checker.go
+74 -28
View File
@@ -28,13 +28,20 @@ import (
"time"
)
var (
// Checker выполняет проверку плейлистов и каналов.
type Checker struct {
tagBlocks []tagfile.TagBlock
ctx = context.Background()
)
}
// NewChecker создаёт новый экземпляр Checker.
func NewChecker(tagsPath string) *Checker {
return &Checker{
tagBlocks: tagfile.Init(tagsPath),
}
}
// PrepareListsToCheck готовит список плейлистов для проверки
func PrepareListsToCheck(files []string, urls []string, codes []string) []playlist.Playlist {
func (c *Checker) PrepareListsToCheck(files []string, urls []string, codes []string) []playlist.Playlist {
var lists []playlist.Playlist
if len(files) > 0 {
@@ -51,7 +58,11 @@ func PrepareListsToCheck(files []string, urls []string, codes []string) []playli
if len(urls) > 0 {
for _, url := range urls {
pls, _ := playlist.MakeFromUrl(url)
pls, err := playlist.MakeFromUrl(url)
if err != nil {
log.Printf("Warning: %s, skipping\n", err)
continue
}
lists = append(lists, pls)
}
}
@@ -74,7 +85,7 @@ func PrepareListsToCheck(files []string, urls []string, codes []string) []playli
}
} else {
if app.Config.Cache.IsActive {
cachedLists := getCachedPlaylists()
cachedLists := c.getCachedPlaylists()
for key := range ini.Lists {
if _, ok := cachedLists[key]; ok {
continue
@@ -97,20 +108,30 @@ func PrepareListsToCheck(files []string, urls []string, codes []string) []playli
}
// getCachedPlaylists возвращает из кеша проверенные ранее плейлисты
func getCachedPlaylists() map[string]playlist.Playlist {
func (c *Checker) 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()
ctx := context.Background()
iter := app.Cache.Scan(ctx, 0, "*", 100).Iterator()
for iter.Next(ctx) {
key := iter.Val()
value, err := app.Cache.Get(ctx, key).Result()
if err != nil {
continue
}
var pls playlist.Playlist
_ = json.Unmarshal([]byte(value), &pls)
if err := json.Unmarshal([]byte(value), &pls); err != nil {
continue
}
result[pls.Code] = pls
}
if err := iter.Err(); err != nil {
log.Printf("Error scanning cache: %s", err)
}
return result
}
// CheckPlaylists проверяет плейлисты и возвращает их же с результатами проверки
func CheckPlaylists(lists []playlist.Playlist) (int, int) {
func (c *Checker) CheckPlaylists(ctx context.Context, lists []playlist.Playlist) (int, int) {
count := len(lists)
if count == 0 {
log.Println("There are no playlists to check")
@@ -119,7 +140,6 @@ func CheckPlaylists(lists []playlist.Playlist) (int, int) {
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]
@@ -146,7 +166,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)
c.cachePlaylist(pls)
continue
}
@@ -156,15 +176,15 @@ func CheckPlaylists(lists []playlist.Playlist) (int, int) {
pls = pls.Parse()
log.Printf("Parsed, checking channels (%d)...\n", len(pls.Channels))
pls = CheckChannels(pls)
pls = c.CheckChannels(ctx, pls)
lists[idx] = pls
cachePlaylist(pls)
c.cachePlaylist(pls)
}
return onlineCount, offlineCount
}
func cachePlaylist(pls playlist.Playlist) {
func (c *Checker) cachePlaylist(pls playlist.Playlist) {
if !app.Config.Cache.IsActive {
return
}
@@ -172,19 +192,27 @@ func cachePlaylist(pls playlist.Playlist) {
jsonBytes, err := json.Marshal(pls)
if err != nil {
log.Printf("Error while saving playlist to cache: %s", err)
return
}
key := pls.Code
if key == "" {
key = "raw:" + utils.Md5str(pls.Url)
}
ctx := context.Background()
ttl := time.Duration(app.Config.Cache.Ttl) * time.Second
written := app.Cache.Set(ctx, pls.Code, string(jsonBytes), ttl)
written := app.Cache.Set(ctx, key, string(jsonBytes), ttl)
if written.Err() != nil {
log.Printf("Error while saving playlist to cache: %s", err)
log.Printf("Error while saving playlist to cache: %s", written.Err())
return
}
log.Println("Cached sucessfully")
}
// CheckChannels проверяет каналы и возвращает их же с результатами проверки
func CheckChannels(pls playlist.Playlist) playlist.Playlist {
func (c *Checker) CheckChannels(ctx context.Context, pls playlist.Playlist) playlist.Playlist {
type errorData struct {
tvChannel playlist.Channel
err error
@@ -200,7 +228,13 @@ func CheckChannels(pls playlist.Playlist) playlist.Playlist {
pls.OfflineCount = 0
timeout, routines := calcParameters(count)
httpClient := http.Client{Timeout: timeout}
tr := &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
}
httpClient := http.Client{
Timeout: timeout,
Transport: tr,
}
chSemaphores := make(chan struct{}, routines)
chOnline := make(chan playlist.Channel, len(pls.Channels))
chOffline := make(chan playlist.Channel, len(pls.Channels))
@@ -211,16 +245,18 @@ func CheckChannels(pls playlist.Playlist) playlist.Playlist {
for _, tvChannel := range pls.Channels {
wg.Add(1)
go func(tvChannel playlist.Channel) {
chSemaphores <- struct{}{}
defer func() {
if r := recover(); r != nil {
log.Printf("Panic while checking channel '%s': %v", tvChannel.Title, r)
}
<-chSemaphores
wg.Done()
}()
chSemaphores <- struct{}{}
tvChannel.Tags = getTagsForChannel(tvChannel)
tvChannel.Tags = c.getTagsForChannel(tvChannel)
http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
req, err := http.NewRequest("GET", tvChannel.URL, nil)
req, err := http.NewRequestWithContext(ctx, "GET", tvChannel.URL, nil)
if err != nil {
data := errorData{tvChannel: tvChannel, err: err}
chError <- data
@@ -241,7 +277,13 @@ func CheckChannels(pls playlist.Playlist) playlist.Playlist {
tvChannel.IsOnline = tvChannel.Status < http.StatusBadRequest
tvChannel.ContentType = resp.Header.Get("Content-Type")
chunk := io.LimitReader(resp.Body, 512) // just for sure
bodyBytes, _ := io.ReadAll(chunk)
bodyBytes, err := io.ReadAll(chunk)
if err != nil {
_ = resp.Body.Close()
data := errorData{tvChannel: tvChannel, err: err}
chError <- data
return
}
bodyString := string(bodyBytes)
_ = resp.Body.Close()
contentType := http.DetectContentType(bodyBytes)
@@ -325,6 +367,10 @@ func CheckChannels(pls playlist.Playlist) playlist.Playlist {
// calcParameters вычисляет оптимальное количество горутин и таймаут запроса
func calcParameters(count int) (time.Duration, int) {
if count <= 0 {
return 10 * time.Second, 1
}
routines := count
if routines > 3000 {
routines = 3000
@@ -360,10 +406,10 @@ func calcParameters(count int) (time.Duration, int) {
}
// getTagsForChannel ищет и возвращает теги для канала
func getTagsForChannel(tvChannel playlist.Channel) []string {
func (c *Checker) getTagsForChannel(tvChannel playlist.Channel) []string {
var foundTags []string
for _, block := range tagBlocks {
for _, block := range c.tagBlocks {
tags := block.GetTags(tvChannel)
if tags != nil {
foundTags = append(foundTags, tags...)
app/config/config.go
+3 -4
View File
@@ -7,15 +7,15 @@
package config
import (
"github.com/joho/godotenv"
"os"
"strconv"
"github.com/joho/godotenv"
)
// Config описывает конфигурацию
type Config struct {
DebugMode bool
Cache CacheConfig
Cache CacheConfig
}
// CacheConfig описывает конфигурацию подключения к keydb
@@ -34,7 +34,6 @@ type CacheConfig struct {
func Init() *Config {
_ = godotenv.Load(".env")
return &Config{
//DebugMode: readEnvBoolean("APP_DEBUG", false),
Cache: CacheConfig{
IsEnabled: readEnvBoolean("CACHE_ENABLED", false),
Host: readEnv("CACHE_HOST", "localhost"),
app/config/config_test.go
+49
View File
@@ -0,0 +1,49 @@
package config
import (
"os"
"testing"
)
func TestReadEnv(t *testing.T) {
_ = os.Setenv("TEST_VAR_IPTVC", "value123")
defer os.Unsetenv("TEST_VAR_IPTVC")
got := readEnv("TEST_VAR_IPTVC", "default")
if got != "value123" {
t.Errorf("readEnv = %q, want %q", got, "value123")
}
gotDefault := readEnv("TEST_VAR_MISSING", "default")
if gotDefault != "default" {
t.Errorf("readEnv default = %q, want %q", gotDefault, "default")
}
}
func TestReadEnvBoolean(t *testing.T) {
_ = os.Setenv("TEST_BOOL", "true")
defer os.Unsetenv("TEST_BOOL")
if !readEnvBoolean("TEST_BOOL", false) {
t.Error("readEnvBoolean(true) returned false")
}
if readEnvBoolean("TEST_BOOL_MISSING", false) {
t.Error("readEnvBoolean(missing, false) returned true")
}
}
func TestReadEnvInteger(t *testing.T) {
_ = os.Setenv("TEST_INT", "42")
defer os.Unsetenv("TEST_INT")
got := readEnvInteger("TEST_INT", 0)
if got != 42 {
t.Errorf("readEnvInteger = %d, want 42", got)
}
gotDefault := readEnvInteger("TEST_INT_MISSING", 10)
if gotDefault != 10 {
t.Errorf("readEnvInteger default = %d, want 10", gotDefault)
}
}
app/logger/logger.go
-20
View File
@@ -9,7 +9,6 @@ package logger
import (
"io"
"log"
"log/slog"
"os"
)
@@ -20,22 +19,3 @@ func Init(quiet bool) {
log.SetOutput(io.Discard)
}
}
// InitSlog инициализирует продвинутый логгер
// TODO пока непонятно что с этим делать
func InitSlog(quiet bool, debug bool) {
writer := os.Stdout
if quiet {
writer = nil
}
level := slog.LevelInfo
if debug {
level = slog.LevelDebug
}
options := slog.HandlerOptions{Level: level, AddSource: false}
handler := slog.NewTextHandler(writer, &options)
logger := slog.New(handler)
slog.SetDefault(logger)
}
app/playlist/playlist.go
+7 -6
View File
@@ -54,8 +54,10 @@ type Playlist struct {
CheckedAt int64 `json:"checkedAt"` // Время проверки в формате UNIX timestamp
}
// tmpChannel хранит временные данные о канале, который обрабатывается в Parse
var tmpChannel = Channel{}
var (
attrRegex = regexp.MustCompile(`(?U)([a-z-]+)="(.*)"`)
titleRegex = regexp.MustCompile(`['"]?\s*,\s*(.+)`)
)
// MakeFromFile создаёт экземпляр плейлиста из файла
func MakeFromFile(filepath string) (Playlist, error) {
@@ -98,8 +100,7 @@ func MakeFromUrl(url string) (Playlist, error) {
// parseAttributes парсит атрибуты тегов #EXT*
func parseAttributes(line string) map[string]string {
result := make(map[string]string)
regex := regexp.MustCompile(`(?U)([a-z-]+)="(.*)"`)
regexMatches := regex.FindAllStringSubmatch(line, -1)
regexMatches := attrRegex.FindAllStringSubmatch(line, -1)
for _, match := range regexMatches {
result[match[1]] = match[2]
}
@@ -110,8 +111,7 @@ func parseAttributes(line string) map[string]string {
func parseTitle(line string) string {
// сначала пытаемся по-доброму: в строке есть тег, могут быть атрибуты,
// есть запятая-разделитель, после неё -- название канала (с запятыми или без)
regex := regexp.MustCompile(`['"]?\s*,\s*(.+)`)
regexMatches := regex.FindAllStringSubmatch(line, -1)
regexMatches := titleRegex.FindAllStringSubmatch(line, -1)
if len(regexMatches) > 0 && len(regexMatches[0]) >= 2 {
return strings.TrimSpace(regexMatches[0][1])
}
@@ -159,6 +159,7 @@ func (pls *Playlist) ReadFromFs() error {
// Parse разбирает плейлист
func (pls *Playlist) Parse() Playlist {
isChannel := false
tmpChannel := Channel{}
pls.Attributes = make(map[string]string)
pls.Channels = make(map[string]Channel)
pls.Groups = make(map[string]Group)
app/playlist/playlist_test.go
+63
View File
@@ -0,0 +1,63 @@
package playlist
import (
"testing"
)
func TestParseAttributes(t *testing.T) {
line := `#EXTINF:-1 tvg-id="test" group-title="News",Channel Name`
attrs := parseAttributes(line)
if attrs["tvg-id"] != "test" {
t.Errorf("tvg-id = %q, want %q", attrs["tvg-id"], "test")
}
if attrs["group-title"] != "News" {
t.Errorf("group-title = %q, want %q", attrs["group-title"], "News")
}
}
func TestParseTitle(t *testing.T) {
tests := []struct {
input string
expected string
}{
{`#EXTINF:-1,Channel Name`, "Channel Name"},
{`#EXTINF:-1 tvg-id="x",Another Channel`, "Another Channel"},
}
for _, tt := range tests {
t.Run(tt.expected, func(t *testing.T) {
got := parseTitle(tt.input)
if got != tt.expected {
t.Errorf("parseTitle(%q) = %q, want %q", tt.input, got, tt.expected)
}
})
}
}
func TestPlaylistParse(t *testing.T) {
content := `#EXTM3U
#EXTINF:-1 tvg-id="1" group-title="News",First Channel
http://example.com/1
#EXTINF:-1 tvg-id="2",Second Channel
http://example.com/2
`
pls := Playlist{Content: content}
result := pls.Parse()
if len(result.Channels) != 2 {
t.Errorf("channels count = %d, want 2", len(result.Channels))
}
if len(result.Groups) != 1 {
t.Errorf("groups count = %d, want 1", len(result.Groups))
}
for _, ch := range result.Channels {
if ch.URL == "" {
t.Error("channel URL is empty")
}
if ch.Title == "" {
t.Error("channel Title is empty")
}
}
}
app/tagfile/tagfile.go
+6 -2
View File
@@ -75,8 +75,12 @@ func (block *TagBlock) GetTags(ch playlist.Channel) []string {
// Init инициализирует объекты тегов из тегфайла
func Init(path string) []TagBlock {
pathNormalized, _ := utils.ExpandPath(path)
_, err := os.Stat(pathNormalized)
pathNormalized, err := utils.ExpandPath(path)
if err != nil {
log.Println("Warning: all channels will be untagged due to error:", err)
return nil
}
_, err = os.Stat(pathNormalized)
if err != nil {
log.Println("Warning: all channels will be untagged due to error:", err)
return nil
app/utils/utils.go
+7 -2
View File
@@ -52,8 +52,13 @@ func Fetch(url string) ([]byte, error) {
}
req.Header.Set("User-Agent", "Mozilla/5.0 WINK/1.31.1 (AndroidTV/9) HlsWinkPlayer")
http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
httpClient := http.Client{Timeout: 10 * time.Second}
transport := &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
}
httpClient := http.Client{
Timeout: 10 * time.Second,
Transport: transport,
}
resp, err := httpClient.Do(req)
if err != nil {
return nil, err
app/utils/utils_test.go
+51
View File
@@ -0,0 +1,51 @@
package utils
import (
"testing"
)
func TestMd5str(t *testing.T) {
tests := []struct {
input string
expected string
}{
{"hello", "5d41402abc4b2a76b9719d911017c592"},
{"", "d41d8cd98f00b204e9800998ecf8427e"},
{"http://example.com/stream", "a1b2c3d4e5f6"}, // just length check
}
for _, tt := range tests {
t.Run(tt.input, func(t *testing.T) {
got := Md5str(tt.input)
if len(got) != 32 {
t.Errorf("Md5str(%q) length = %d, want 32", tt.input, len(got))
}
})
}
}
func TestArrayUnique(t *testing.T) {
input := []string{"a", "b", "a", "c", "b"}
expected := []string{"a", "b", "c"}
got := ArrayUnique(input)
if len(got) != len(expected) {
t.Errorf("ArrayUnique length = %d, want %d", len(got), len(expected))
}
seen := make(map[string]bool)
for _, v := range got {
if seen[v] {
t.Errorf("ArrayUnique returned duplicate: %s", v)
}
seen[v] = true
}
}
func TestExpandPath(t *testing.T) {
got, err := ExpandPath("/tmp/test.txt")
if err != nil {
t.Fatalf("ExpandPath error: %v", err)
}
if got == "" {
t.Error("ExpandPath returned empty string")
}
}