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

Оптимизация проверки каналов (#5)

Browse Source 
- теперь проверяется только первый 1 Кб контента
- скорректирована проверка mpd-контента
This commit is contained in:
Anthony Axenov
2025-05-16 23:09:27 +08:00
parent 01ddf25ed5
commit e98d923ce5
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -9,5 +9,6 @@ output/
*.m3u8 *.m3u8
*.json *.json
*.ini *.ini
iptvc
!/**/*.gitkeep !/**/*.gitkeep

16
app/checker/checker.go
View File

@@ -217,7 +217,6 @@ func CheckChannels(pls playlist.Playlist) playlist.Playlist {
http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{InsecureSkipVerify: true} http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
req, err := http.NewRequest("GET", tvChannel.URL, nil) req, err := http.NewRequest("GET", tvChannel.URL, nil)
tvChannel.CheckedAt = time.Now().Unix()
if err != nil { if err != nil {
data := errorData{tvChannel: tvChannel, err: err} data := errorData{tvChannel: tvChannel, err: err}
chError <- data chError <- data
@@ -226,7 +225,9 @@ func CheckChannels(pls playlist.Playlist) playlist.Playlist {
//TODO user-agent //TODO user-agent
req.Header.Set("User-Agent", "Mozilla/5.0 WINK/1.31.1 (AndroidTV/9) HlsWinkPlayer") req.Header.Set("User-Agent", "Mozilla/5.0 WINK/1.31.1 (AndroidTV/9) HlsWinkPlayer")
req.Header.Add("Range", "bytes=0-1023") // 1 Kb, but sometimes servers ignore it
resp, err := httpClient.Do(req) resp, err := httpClient.Do(req)
tvChannel.CheckedAt = time.Now().Unix()
if err != nil { if err != nil {
data := errorData{tvChannel: tvChannel, err: err} data := errorData{tvChannel: tvChannel, err: err}
chError <- data chError <- data
@@ -236,7 +237,8 @@ func CheckChannels(pls playlist.Playlist) playlist.Playlist {
tvChannel.Status = resp.StatusCode tvChannel.Status = resp.StatusCode
tvChannel.IsOnline = tvChannel.Status < http.StatusBadRequest tvChannel.IsOnline = tvChannel.Status < http.StatusBadRequest
tvChannel.ContentType = resp.Header.Get("Content-Type") tvChannel.ContentType = resp.Header.Get("Content-Type")
bodyBytes, _ := io.ReadAll(resp.Body) chunk := io.LimitReader(resp.Body, 1024) // just for sure
bodyBytes, _ := io.ReadAll(chunk)
bodyString := string(bodyBytes) bodyString := string(bodyBytes)
_ = resp.Body.Close() _ = resp.Body.Close()
contentType := http.DetectContentType(bodyBytes) contentType := http.DetectContentType(bodyBytes)
@@ -246,7 +248,9 @@ func CheckChannels(pls playlist.Playlist) playlist.Playlist {
isContentCorrect := isContentBinary || isContentCorrect := isContentBinary ||
strings.Contains(bodyString, "#EXTM3U") || strings.Contains(bodyString, "#EXTM3U") ||
strings.Contains(bodyString, "<SegmentTemplate") strings.Contains(bodyString, "<MPD ") ||
strings.Contains(bodyString, "<SegmentTemplate ") ||
strings.Contains(bodyString, "<AdaptationSet ")
if tvChannel.Status >= http.StatusBadRequest || !isContentCorrect { if tvChannel.Status >= http.StatusBadRequest || !isContentCorrect {
tvChannel.Error = bodyString tvChannel.Error = bodyString
@@ -254,12 +258,6 @@ func CheckChannels(pls playlist.Playlist) playlist.Playlist {
return return
} }
if isContentBinary {
tvChannel.Content = "binary"
} else {
tvChannel.Content = bodyString
}
chOnline <- tvChannel chOnline <- tvChannel
return return
}(tvChannel) }(tvChannel)

1
app/playlist/playlist.go
View File

@@ -32,7 +32,6 @@ type Channel struct {
Status int `json:"status"` // Код статуса HTTP Status int `json:"status"` // Код статуса HTTP
IsOnline bool `json:"isOnline"` // Признак доступности канала (при Status < 400) IsOnline bool `json:"isOnline"` // Признак доступности канала (при Status < 400)
Error string `json:"error"` // Текст ошибки (при Status >= 400) Error string `json:"error"` // Текст ошибки (при Status >= 400)
Content string `json:"content"` // Тело ответа (формат m3u, либо маскированные бинарные данные, либо пусто)
ContentType string `json:"contentType"` // MIME-тип тела ответа ContentType string `json:"contentType"` // MIME-тип тела ответа
Tags []string `json:"tags"` // Список тегов канала Tags []string `json:"tags"` // Список тегов канала
CheckedAt int64 `json:"checkedAt"` // Время проверки в формате UNIX timestamp CheckedAt int64 `json:"checkedAt"` // Время проверки в формате UNIX timestamp