allan716 3 лет назад
Родитель
Сommit
2dc8a52b90

+ 2 - 29
internal/backend/controllers/v1/video_list.go

@@ -70,9 +70,6 @@ func (cb *ControllerBase) RefreshVideoListHandler(c *gin.Context) {
 
 		pathUrlMap := cb.StaticFileSystemBackEnd.GetPathUrlMap()
 		cb.MovieInfos, cb.SeasonInfos = cb.videoScanAndRefreshHelper.ScrabbleUpVideoList(scanVideoResult, pathUrlMap)
-		println("haha")
-		// 这里会把得到的 Normal 和 Emby 的结果都放入 cb.scanVideoResult
-		// 根据 用户的情况,选择行返回是 Emby Or Normal 的结果
 		// 并且如果是 Emby 那么会在页面上出现一个刷新字幕列表的按钮(这个需要 Emby 中video 的 ID)
 	}()
 
@@ -81,35 +78,11 @@ func (cb *ControllerBase) RefreshVideoListHandler(c *gin.Context) {
 	return
 }
 
-func (cb ControllerBase) MovieListHandler(c *gin.Context) {
+func (cb ControllerBase) VideoListHandler(c *gin.Context) {
 	var err error
 	defer func() {
 		// 统一的异常处理
-		cb.ErrorProcess(c, "MovieListHandler", err)
-	}()
-
-	bok, allJobs, err := cb.cronHelper.DownloadQueue.GetAllJobs()
-	if err != nil {
-		return
-	}
-
-	if bok == false {
-		c.JSON(http.StatusOK, backend.ReplyAllJobs{
-			AllJobs: make([]task_queue.OneJob, 0),
-		})
-		return
-	}
-
-	c.JSON(http.StatusOK, backend.ReplyAllJobs{
-		AllJobs: allJobs,
-	})
-}
-
-func (cb ControllerBase) SeriesListHandler(c *gin.Context) {
-	var err error
-	defer func() {
-		// 统一的异常处理
-		cb.ErrorProcess(c, "SeriesListHandler", err)
+		cb.ErrorProcess(c, "VideoListHandler", err)
 	}()
 
 	bok, allJobs, err := cb.cronHelper.DownloadQueue.GetAllJobs()

+ 2 - 3
internal/backend/routers/base_router.go

@@ -39,9 +39,8 @@ func InitRouter(fileDownloader *file_downloader.FileDownloader, router *gin.Engi
 	GroupV1 := router.Group("/" + cbV1.GetVersion())
 	{
 		GroupV1.POST("/video/list/refresh", cbV1.RefreshVideoListHandler)
-		GroupV1.GET("/video/list/refresh", cbV1.RefreshVideoListStatusHandler)
-		GroupV1.GET("/video/list/movies", cbV1.MovieListHandler)
-		GroupV1.GET("/video/list/series", cbV1.SeriesListHandler)
+		GroupV1.GET("/video/list/refresh-status", cbV1.RefreshVideoListStatusHandler)
+		GroupV1.GET("/video/list", cbV1.VideoListHandler)
 
 		GroupV1.Use(middle.CheckAuth())
 

+ 0 - 4
internal/types/backend/reply_movie_list.go

@@ -1,9 +1,5 @@
 package backend
 
-type ReplyMovieList struct {
-	Movies []MovieInfo `json:"movies"`
-}
-
 type MovieInfo struct {
 	Name                     string `json:"name"`
 	DirRootUrl               string `json:"dir_root_url"`

+ 0 - 4
internal/types/backend/reply_series_list.go

@@ -1,9 +1,5 @@
 package backend
 
-type ReplySeriesList struct {
-	SeasonInfos []SeasonInfo `json:"season_infos"`
-}
-
 type SeasonInfo struct {
 	Name          string         `json:"name"`
 	RootDirPath   string         `json:"root_dir_path"`

+ 6 - 0
internal/types/backend/reply_video_list.go

@@ -0,0 +1,6 @@
+package backend
+
+type ReplyVideoList struct {
+	MovieInfos  []MovieInfo  `json:"movie_infos"`
+	SeasonInfos []SeasonInfo `json:"season_infos"`
+}