mirror of
https://github.com/ProudMuBai/GoFilm.git
synced 2026-05-06 11:49:39 +08:00
collect optimization
This commit is contained in:
@@ -3,7 +3,6 @@ package conver
|
||||
import (
|
||||
"encoding/xml"
|
||||
"log"
|
||||
"regexp"
|
||||
"server/config"
|
||||
"server/model/collect"
|
||||
"server/model/system"
|
||||
@@ -77,7 +76,6 @@ func ConvertFilmDetail(detail collect.FilmDetail) system.MovieDetail {
|
||||
1.对常见分割符进行统一化处理
|
||||
2.如果演员和导演名单过长,则进行截断, 最多只保留3个
|
||||
*/
|
||||
detail.VodActor = regexp.MustCompile(`[$&#%]`).ReplaceAllString(detail.VodActor, ",")
|
||||
|
||||
md := system.MovieDetail{
|
||||
Mid: detail.VodID,
|
||||
@@ -113,7 +111,7 @@ func ConvertFilmDetail(detail collect.FilmDetail) system.MovieDetail {
|
||||
md.PlayFrom = strings.Split(detail.VodPlayFrom, detail.VodPlayNote)
|
||||
// v2 只保留m3u8播放源
|
||||
md.PlayList = GenFilmPlayList(detail.VodPlayURL, detail.VodPlayNote)
|
||||
md.DownloadList = GenFilmPlayList(detail.VodDownURL, detail.VodPlayNote)
|
||||
//md.DownloadList = GenFilmPlayList(detail.VodDownURL, detail.VodPlayNote)
|
||||
|
||||
return md
|
||||
}
|
||||
|
||||
@@ -13,41 +13,40 @@ import (
|
||||
func CovertFilmDetailVo(fd system.FilmDetailVo) (system.MovieDetail, error) {
|
||||
t, err := time.ParseInLocation(time.DateTime, fd.AddTime, time.Local)
|
||||
md := system.MovieDetail{
|
||||
Id: fd.Id,
|
||||
Cid: fd.Cid,
|
||||
Pid: fd.Pid,
|
||||
Name: fd.Name,
|
||||
Picture: fd.Picture,
|
||||
DownFrom: fd.DownFrom,
|
||||
MovieDescriptor: system.MovieDescriptor{
|
||||
SubTitle: fd.SubTitle,
|
||||
CName: fd.CName,
|
||||
EnName: fd.EnName,
|
||||
Initial: fd.Initial,
|
||||
ClassTag: fd.ClassTag,
|
||||
Actor: fd.Actor,
|
||||
Director: fd.Director,
|
||||
Writer: fd.Writer,
|
||||
Blurb: fd.Content,
|
||||
Remarks: fd.Remarks,
|
||||
ReleaseDate: fd.ReleaseDate,
|
||||
Area: fd.Area,
|
||||
Language: fd.Language,
|
||||
Year: fd.Year,
|
||||
State: fd.State,
|
||||
UpdateTime: fd.UpdateTime,
|
||||
AddTime: t.Unix(),
|
||||
DbId: fd.DbId,
|
||||
DbScore: fd.DbScore,
|
||||
Hits: fd.Hits,
|
||||
Content: fd.Content,
|
||||
},
|
||||
Mid: fd.Id,
|
||||
Cid: fd.Cid,
|
||||
Pid: fd.Pid,
|
||||
Name: fd.Name,
|
||||
Picture: fd.Picture,
|
||||
SubTitle: fd.SubTitle,
|
||||
CName: fd.CName,
|
||||
EnName: fd.EnName,
|
||||
Initial: fd.Initial,
|
||||
ClassTag: fd.ClassTag,
|
||||
Actor: fd.Actor,
|
||||
Director: fd.Director,
|
||||
Writer: fd.Writer,
|
||||
Blurb: fd.Content,
|
||||
Remarks: fd.Remarks,
|
||||
ReleaseDate: fd.ReleaseDate,
|
||||
Area: fd.Area,
|
||||
Language: fd.Language,
|
||||
Year: fd.Year,
|
||||
State: fd.State,
|
||||
UpdateTime: fd.UpdateTime,
|
||||
AddTime: t.Unix(),
|
||||
DbId: fd.DbId,
|
||||
DbScore: fd.DbScore,
|
||||
Hits: fd.Hits,
|
||||
Content: fd.Content,
|
||||
PlayFrom: fd.PlayFrom,
|
||||
DownFrom: fd.DownFrom,
|
||||
}
|
||||
// 通过分割符切分播放源信息 PlaySeparator $$$
|
||||
//md.PlayFrom = strings.Split(fd.VodPlayFrom, fd.VodPlayNote)
|
||||
// v2 只保留m3u8播放源
|
||||
md.PlayList = GenFilmPlayList(fd.PlayLink, "$$$")
|
||||
//md.DownloadList = GenFilmPlayList(fd.DownloadLink, fd.VodPlayNote)
|
||||
|
||||
md.DownloadList = GenFilmPlayList(fd.DownloadLink, "$$$")
|
||||
return md, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user