clean code, add golangci config, preallocate some slices and avoid copying body before parsing json (#9)
This commit is contained in:
parent
0a146c515c
commit
c7a2612056
12 changed files with 49 additions and 45 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -6,6 +6,7 @@
|
||||||
main_test.go
|
main_test.go
|
||||||
|
|
||||||
old/
|
old/
|
||||||
|
bin/
|
||||||
|
|
||||||
.env
|
.env
|
||||||
ext-cfg.yaml
|
ext-cfg.yaml
|
||||||
|
|
19
.golangci.yml
Normal file
19
.golangci.yml
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
run:
|
||||||
|
timeout: 5m
|
||||||
|
|
||||||
|
linters:
|
||||||
|
enable:
|
||||||
|
- bodyclose
|
||||||
|
- gocritic
|
||||||
|
- unconvert
|
||||||
|
- ineffassign
|
||||||
|
- staticcheck
|
||||||
|
- prealloc
|
||||||
|
- nilerr
|
||||||
|
- gosimple
|
||||||
|
- asasalint
|
||||||
|
disable:
|
||||||
|
- errcheck
|
||||||
|
|
||||||
|
issues:
|
||||||
|
exclude-use-default: false
|
|
@ -114,7 +114,7 @@ func HandleDefaultStoredFormatDownload(
|
||||||
storedMedias[0],
|
storedMedias[0],
|
||||||
isCaptionEnabled,
|
isCaptionEnabled,
|
||||||
)
|
)
|
||||||
var medias []*models.DownloadedMedia
|
medias := make([]*models.DownloadedMedia, 0, len(storedMedias))
|
||||||
for _, media := range storedMedias {
|
for _, media := range storedMedias {
|
||||||
medias = append(medias, &models.DownloadedMedia{
|
medias = append(medias, &models.DownloadedMedia{
|
||||||
FilePath: "",
|
FilePath: "",
|
||||||
|
|
|
@ -103,12 +103,12 @@ func StoreMedias(
|
||||||
msgs []gotgbot.Message,
|
msgs []gotgbot.Message,
|
||||||
medias []*models.DownloadedMedia,
|
medias []*models.DownloadedMedia,
|
||||||
) error {
|
) error {
|
||||||
var storedMedias []*models.Media
|
|
||||||
|
|
||||||
if len(medias) == 0 {
|
if len(medias) == 0 {
|
||||||
return errors.New("no media to store")
|
return errors.New("no media to store")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
storedMedias := make([]*models.Media, 0, len(medias))
|
||||||
|
|
||||||
for idx, msg := range msgs {
|
for idx, msg := range msgs {
|
||||||
fileID := GetMessageFileID(&msg)
|
fileID := GetMessageFileID(&msg)
|
||||||
if len(fileID) == 0 {
|
if len(fileID) == 0 {
|
||||||
|
|
|
@ -137,12 +137,12 @@ func GetEmbedMediaList(
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetIGramMediaList(ctx *models.DownloadContext) ([]*models.Media, error) {
|
func GetIGramMediaList(ctx *models.DownloadContext) ([]*models.Media, error) {
|
||||||
var mediaList []*models.Media
|
|
||||||
postURL := ctx.MatchedContentURL
|
postURL := ctx.MatchedContentURL
|
||||||
details, err := GetFromIGram(ctx, postURL)
|
details, err := GetFromIGram(ctx, postURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to get post: %w", err)
|
return nil, fmt.Errorf("failed to get post: %w", err)
|
||||||
}
|
}
|
||||||
|
mediaList := make([]*models.Media, 0, len(details.Items))
|
||||||
for _, item := range details.Items {
|
for _, item := range details.Items {
|
||||||
media := ctx.Extractor.NewMedia(
|
media := ctx.Extractor.NewMedia(
|
||||||
ctx.MatchedContentID,
|
ctx.MatchedContentID,
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package instagram
|
package instagram
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
"crypto/rand"
|
"crypto/rand"
|
||||||
"crypto/sha256"
|
"crypto/sha256"
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
|
@ -137,14 +138,14 @@ func ParseGQLMedia(
|
||||||
func ParseEmbedGQL(
|
func ParseEmbedGQL(
|
||||||
body []byte,
|
body []byte,
|
||||||
) (*Media, error) {
|
) (*Media, error) {
|
||||||
match := embedPattern.FindStringSubmatch(string(body))
|
match := embedPattern.FindSubmatch(body)
|
||||||
if len(match) < 2 {
|
if len(match) < 2 {
|
||||||
return nil, errors.New("failed to find JSON in response")
|
return nil, errors.New("failed to find JSON in response")
|
||||||
}
|
}
|
||||||
jsonData := match[1]
|
jsonData := match[1]
|
||||||
|
|
||||||
var data map[string]any
|
var data map[string]any
|
||||||
if err := json5.Unmarshal([]byte(jsonData), &data); err != nil {
|
if err := json5.Unmarshal(jsonData, &data); err != nil {
|
||||||
return nil, fmt.Errorf("failed to unmarshal JSON: %w", err)
|
return nil, fmt.Errorf("failed to unmarshal JSON: %w", err)
|
||||||
}
|
}
|
||||||
igCtx := util.TraverseJSON(data, "contextJSON")
|
igCtx := util.TraverseJSON(data, "contextJSON")
|
||||||
|
@ -193,39 +194,27 @@ func BuildIGramPayload(contentURL string) (io.Reader, error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("error marshalling payload: %w", err)
|
return nil, fmt.Errorf("error marshalling payload: %w", err)
|
||||||
}
|
}
|
||||||
reader := strings.NewReader(string(parsedPayload))
|
reader := bytes.NewReader(parsedPayload)
|
||||||
return reader, nil
|
return reader, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func ParseIGramResponse(body []byte) (*IGramResponse, error) {
|
func ParseIGramResponse(body []byte) (*IGramResponse, error) {
|
||||||
var rawResponse any
|
// try to unmarshal as a single IGramMedia and then as a slice
|
||||||
|
var media IGramMedia
|
||||||
|
|
||||||
if err := sonic.ConfigFastest.Unmarshal(body, &rawResponse); err != nil {
|
if err := sonic.ConfigFastest.Unmarshal(body, &media); err != nil {
|
||||||
return nil, fmt.Errorf("failed to decode response1: %w", err)
|
// try with slice
|
||||||
}
|
var mediaList []*IGramMedia
|
||||||
|
if err := sonic.ConfigFastest.Unmarshal(body, &mediaList); err != nil {
|
||||||
switch rawResponse.(type) {
|
return nil, fmt.Errorf("failed to decode response: %w", err)
|
||||||
case []any:
|
|
||||||
// array of IGramMedia
|
|
||||||
var media []*IGramMedia
|
|
||||||
if err := sonic.ConfigFastest.Unmarshal(body, &media); err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to decode response2: %w", err)
|
|
||||||
}
|
}
|
||||||
return &IGramResponse{
|
return &IGramResponse{
|
||||||
Items: media,
|
Items: mediaList,
|
||||||
}, nil
|
}, nil
|
||||||
case map[string]any:
|
|
||||||
// single IGramMedia
|
|
||||||
var media IGramMedia
|
|
||||||
if err := sonic.ConfigFastest.Unmarshal(body, &media); err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to decode response3: %w", err)
|
|
||||||
}
|
}
|
||||||
return &IGramResponse{
|
return &IGramResponse{
|
||||||
Items: []*IGramMedia{&media},
|
Items: []*IGramMedia{&media},
|
||||||
}, nil
|
}, nil
|
||||||
default:
|
|
||||||
return nil, fmt.Errorf("unexpected response type: %T", rawResponse)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetCDNURL(contentURL string) (string, error) {
|
func GetCDNURL(contentURL string) (string, error) {
|
||||||
|
|
|
@ -36,7 +36,6 @@ func FindBestPhoto(
|
||||||
func ParseVideoFormats(
|
func ParseVideoFormats(
|
||||||
images map[string]*Media,
|
images map[string]*Media,
|
||||||
) ([]*models.MediaFormat, error) {
|
) ([]*models.MediaFormat, error) {
|
||||||
var formats []*models.MediaFormat
|
|
||||||
var video *Media
|
var video *Media
|
||||||
var thumbnailURL string
|
var thumbnailURL string
|
||||||
|
|
||||||
|
@ -63,6 +62,8 @@ func ParseVideoFormats(
|
||||||
"av1Url": {"Av1URL", enums.MediaCodecAV1},
|
"av1Url": {"Av1URL", enums.MediaCodecAV1},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
formats := make([]*models.MediaFormat, 0, len(codecMapping))
|
||||||
|
|
||||||
for _, mapping := range codecMapping {
|
for _, mapping := range codecMapping {
|
||||||
url := getField(video, mapping.Field)
|
url := getField(video, mapping.Field)
|
||||||
if url == "" {
|
if url == "" {
|
||||||
|
|
|
@ -31,6 +31,7 @@ func ParseVideoObject(videoObj *Videos) ([]*models.MediaFormat, error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to extract hls formats: %w", err)
|
return nil, fmt.Errorf("failed to extract hls formats: %w", err)
|
||||||
}
|
}
|
||||||
|
formats = make([]*models.MediaFormat, 0, len(hlsFormats))
|
||||||
for _, hlsFormat := range hlsFormats {
|
for _, hlsFormat := range hlsFormats {
|
||||||
hlsFormat.Duration = video.Duration / 1000
|
hlsFormat.Duration = video.Duration / 1000
|
||||||
hlsFormat.Thumbnail = []string{video.Thumbnail}
|
hlsFormat.Thumbnail = []string{video.Thumbnail}
|
||||||
|
|
|
@ -176,7 +176,7 @@ func GetVideoAPI(
|
||||||
decoder := sonic.ConfigFastest.NewDecoder(resp.Body)
|
decoder := sonic.ConfigFastest.NewDecoder(resp.Body)
|
||||||
err = decoder.Decode(&data)
|
err = decoder.Decode(&data)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to unmarshal response: %w", err)
|
return nil, fmt.Errorf("failed to decode response: %w", err)
|
||||||
}
|
}
|
||||||
videoData, err := FindVideoData(data, awemeID)
|
videoData, err := FindVideoData(data, awemeID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -45,12 +45,12 @@ var ShortExtractor = &models.Extractor{
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to read body: %w", err)
|
return nil, fmt.Errorf("failed to read body: %w", err)
|
||||||
}
|
}
|
||||||
matchedURL := Extractor.URLPattern.FindStringSubmatch(string(body))
|
matchedURL := Extractor.URLPattern.FindSubmatch(body)
|
||||||
if matchedURL == nil {
|
if matchedURL == nil {
|
||||||
return nil, errors.New("failed to find url in body")
|
return nil, errors.New("failed to find url in body")
|
||||||
}
|
}
|
||||||
return &models.ExtractorResponse{
|
return &models.ExtractorResponse{
|
||||||
URL: matchedURL[0],
|
URL: string(matchedURL[0]),
|
||||||
}, nil
|
}, nil
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -174,13 +174,9 @@ func GetTweetAPI(
|
||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
return nil, fmt.Errorf("invalid response code: %s", resp.Status)
|
return nil, fmt.Errorf("invalid response code: %s", resp.Status)
|
||||||
}
|
}
|
||||||
body, err := io.ReadAll(resp.Body)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to read body: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
var apiResponse APIResponse
|
var apiResponse APIResponse
|
||||||
err = sonic.ConfigFastest.Unmarshal(body, &apiResponse)
|
err = sonic.ConfigFastest.NewDecoder(resp.Body).Decode(&apiResponse)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to parse response: %w", err)
|
return nil, fmt.Errorf("failed to parse response: %w", err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -246,7 +246,7 @@ func (media *Media) GetSortedFormats() []*MediaFormat {
|
||||||
}
|
}
|
||||||
|
|
||||||
// combine the best video and audio into a final list
|
// combine the best video and audio into a final list
|
||||||
var finalSortedList []*MediaFormat
|
finalSortedList := make([]*MediaFormat, 0, len(groupedVideos)+len(groupedAudios)+len(media.Formats))
|
||||||
for _, best := range groupedVideos {
|
for _, best := range groupedVideos {
|
||||||
finalSortedList = append(finalSortedList, best)
|
finalSortedList = append(finalSortedList, best)
|
||||||
}
|
}
|
||||||
|
|
|
@ -107,13 +107,10 @@ func copyHeaders(source, destination http.Header) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func parseProxyResponse(proxyResp *http.Response, originalReq *http.Request) (*http.Response, error) {
|
func parseProxyResponse(proxyResp *http.Response, originalReq *http.Request) (*http.Response, error) {
|
||||||
body, err := io.ReadAll(proxyResp.Body)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("error reading proxy response: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
var response models.EdgeProxyResponse
|
var response models.EdgeProxyResponse
|
||||||
if err := sonic.ConfigFastest.Unmarshal(body, &response); err != nil {
|
decoder := sonic.ConfigFastest.NewDecoder(proxyResp.Body)
|
||||||
|
if err := decoder.Decode(&response); err != nil {
|
||||||
return nil, fmt.Errorf("error parsing proxy response: %w", err)
|
return nil, fmt.Errorf("error parsing proxy response: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue