Merge pull request #47 from fzxiao233/feature

[feature]添加ts2MP4开关

README.md

@@ -50,6 +50,7 @@
   "ExpressPort": 3000,  // 配置同传获取服务器的端口，详细见后文
   "DownloadQuality": "best",  // 配置下载画质 best为最佳画质 建议不调整 可选: best 1080p60 720p
   "DownloadDir": "/home/ubuntu/Matsuri",  // 下载目录 注意后无斜杠
+  "EnableTS2MP4": true,  // 是否启用ts转码mp4（关闭后断流文件不会合并
   "Module": [
     {
       "Name": "Youtube",  // 模块名，以下类推

config_example.json

@@ -6,6 +6,7 @@
   "ExpressPort": 3000,
   "DownloadQuality": "best",
   "DownloadDir": "",
+  "EnableTS2MP4": true,
   "Module": [
     {
       "Name": "Youtube",
@@ -30,16 +31,6 @@
         }
       ]
     },
-    {
-      "Name": "Mirrativ",
-      "Enable": false,
-      "Users": [
-        {
-          "TargetId": "3264432",
-          "Name": "natsuiromatsuri"
-        }
-      ]
-    },
     {
       "Name": "Bilibili",
       "Enable": true,
@@ -50,18 +41,6 @@
           "NeedDownload": true
         }
       ]
-    },
-    {
-      "Name": "BilibiliArticle",
-      "Enable": false,
-      "Users": [
-        {
-          "TargetId": "420711844"
-        },
-        {
-          "TargetId": "418124907"
-        }
-      ]
     }
   ]
 }

plugins/monitor/twitch.go

@@ -0,0 +1,19 @@
+package monitor
+
+import "github.com/fzxiao233/Vtb_Record/utils"
+
+type Twitch struct {
+	APIUrl string
+}
+
+func (t Twitch) getLiveStatus() error {
+	_, err := utils.HttpGet(t.APIUrl, map[string]string{})
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (t Twitch) CheckLive(userConfig utils.UsersConfig) {
+	t.APIUrl = "https://api.twitch.tv/helix/streams?user_login=" + userConfig.TargetId
+}

plugins/videoProcesser.go

@@ -28,10 +28,12 @@ func (p *ProcessVideo) startDownloadVideo(ch chan string) {
 		p.videoPathList = append(p.videoPathList, aFilePath)
 		if p.isNewLive() {
 			videoName := p.liveStatus.video.Title + ".ts"
-			if len(p.videoPathList) > 1 {
-				videoName = p.videoPathList.mergeVideo(p.liveStatus.video.Title, p.liveStatus.video.UsersConfig.DownloadDir)
-			} else {
-				videoName = ts2mp4(aFilePath, p.liveStatus.video.UsersConfig.DownloadDir, p.liveStatus.video.Title)
+			if utils.Config.EnableTS2MP4 {
+				if len(p.videoPathList) > 1 {
+					videoName = p.videoPathList.mergeVideo(p.liveStatus.video.Title, p.liveStatus.video.UsersConfig.DownloadDir)
+				} else {
+					videoName = ts2mp4(aFilePath, p.liveStatus.video.UsersConfig.DownloadDir, p.liveStatus.video.Title)
+				}
 			}
 			if videoName == "" {
 				return

utils/config.go

@@ -34,6 +34,7 @@ type MainConfig struct {
 	Module          []ModuleConfig
 	RedisHost       string
 	ExpressPort     string
+	EnableTS2MP4    bool
 }
 
 func init() {