Merge branch 'dev'

Author: qianjianeng

.gitignore

@@ -14,8 +14,5 @@
 .idea
 video
 build
-deal
 log
-account
-main.go
 *.ts

README.md

@@ -11,7 +11,7 @@
 
 [视频全自动发布器](https://github.com/suifengqjn/mediaBot)
 
-
+流程：视频自动采集->伪原创剪辑->全自动发布： 全自动流水线生产，躺着赚钱
 
 视频自媒体批量处理软件，秒杀市面上绝大部分收费软件。
 针对视频自媒体运营者，包括原创和伪原创，这一款软件就足够了。

account/account.go

@@ -0,0 +1,16 @@
+package account
+
+const (
+AccTypeFree = iota
+AccTypeMonth
+AccTypeYear
+AccTypeVIP
+)
+
+type Account struct {
+Type int
+Key string
+RemainCount int
+StartTime string
+EndTime string
+}

config.toml

@@ -61,9 +61,15 @@ system = 0
  w = 576
  h = 1024
 
+##压缩,一般 调整 crf 即可
+[compress]
+ switch = true
+ preset = "medium" #（ultrafast，superfast，veryfast，faster，fast，medium，slow，slower，veryslow和placebo）
+ crf = 40 # 指定输出视频的质量，取值范围是0-51，默认值为23，数字越小输出视频的质量越高
+
 ## 9. 文字水印
 [waterText]
- switch = true
+ switch = false
  content = "文字logo"
  path = "./source/simsun.ttc"
  size = 50
@@ -89,7 +95,7 @@ system = 0
 
 ## 10. 图片水印
 [waterImage]
- switch = true
+ switch = false
  path = "./source/item.png"
  style = 3
  sp1 = 50
@@ -102,11 +108,11 @@ system = 0
 
 ## 12. 片头
 [filmTitle]
- switch = true
+ switch = false
  path = "./source/head.mp4"
 
 ## 13. 片尾
 [filmEnd]
- switch = true
+ switch = false
  path = "./source/foot.mp4"
 

deal/config/config.go

@@ -19,6 +19,7 @@ type Config struct {
 Crop Crop
 ClearWater ClearWater
 Resolution Resolution
+Compress Compress
 WaterText WaterText
 RunWaterText RunWaterText `toml:"RunWaterText"`
 WaterImage WaterImage
@@ -78,6 +79,12 @@ type Resolution struct {
 H int
 }
 
+type Compress struct {
+Switch bool
+Preset string
+Crf int
+}
+
 type WaterText struct {
 Switch bool
 Content string

deal/factory/factory.go

@@ -145,6 +145,9 @@ func deal(f string, con *config.Config)string {
 f = ffmpeg.UpdateResolution(fCmd, f, con.Resolution.W, con.Resolution.H)
 }
 
+if con.Compress.Switch {
+f = ffmpeg.Compress(fCmd, f, con.Compress.Preset, con.Compress.Crf)
+}
 //9. water text
 if con.WaterText.Switch {
 info, err := ffmpeg.GetVideoInfo(fCmd, f)