qiushang 3 天之前
父节点
当前提交
e35e7eeda3
共有 4 个文件被更改,包括 21 次插入6 次删除
  1. 3 3
      nsis/test.nsi
  2. 1 1
      package.json
  3. 4 0
      src/renderer/components/header.vue
  4. 13 2
      src/renderer/components/home.vue

+ 3 - 3
nsis/test.nsi

@@ -1,16 +1,16 @@
 # ====================== 自定义宏 产品信息==============================
 !define PRODUCT_MID        		    "EkoFCqqaUJXy"
-!define PRODUCT_VERSION        		"2.0.9.0"
+!define PRODUCT_VERSION        		"2.0.9.1"
 !define PRODUCT_NAME           		"星优视频解析下载器"
 !define INSTALL_OUTPUT_NAME    		"XYCaptureVideo_XY.exe" 
 !define EXE_NAME               		"XYCaptureVideo.exe"
 !define PRODUCT_PATHNAME           	"XYCaptureVideo"     #安装卸载项用到的KEY,注册表
 !define INSTALL_APPEND_PATH         "XYCaptureVideo"     #安装路径追加的名称 
-!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYCaptureVideo/lastest2.0.9.0.7z"
+!define APP_DOWNLOAD_URL    		"https://xy.xingyousoft.com/soft/XYCaptureVideo/lastest2.0.9.1.7z"
 !define PRODUCT_PUBLISHER      	    "苏州星优办公软件有限公司"
 !define PRODUCT_LEGAL          	    "苏州星优办公软件有限公司"
 !define STATISTICS_url              "https://www.xingyousoft.com/api/index/user_log"   # 统计网址
-!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYCaptureVideo/uninstallWeb/?v=2.0.9.0"   # 接卸优惠网址
+!define UNINSTALL_url               "https://xy.xingyousoft.com/soft/XYCaptureVideo/uninstallWeb/?v=2.0.9.1"   # 接卸优惠网址
 
 # ====================== 自定义宏 安装信息==============================
 !define INSTALL_7Z_NAME 	   		"app.7z"

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
 	"name": "XYCaptureVideo",
-	"version": "2.0.9.0",
+	"version": "2.0.9.1",
 	"author": "苏州星优办公软件有限公司",
 	"description": "An electron-vue project",
 	"license": "captureVideo",

+ 4 - 0
src/renderer/components/header.vue

@@ -137,6 +137,7 @@
 				<el-row type="flex" justify="space-around">
 					<el-button size="mini" @click="toLogin('douyin')" :loading="douyinLoading">抖音</el-button>
 					<el-button size="mini" @click="toLogin('kuaishou')" :loading="kuaishouLoading">快手</el-button>
+					<el-button size="mini" @click="toLogin('xiaohongshu')" :loading="xiaohongshuLoading">小红书</el-button>
 					<el-button size="mini" @click="toLogin('weibo')" :loading="weiboLoading">微博</el-button>
 				</el-row>
 				<el-divider content-position="left">代理设置
@@ -274,6 +275,7 @@
 				
 				douyinLoading: false,
 				kuaishouLoading: false,
+				xiaohongshuLoading: false,
 				weiboLoading: false,
 				cacheLoading: false,
 				saveLoading: false,
@@ -425,6 +427,8 @@
 					url = 'https://www.kuaishou.com';
 				}else if(type == 'weibo'){
 					url = 'https://www.weibo.com';
+				}else if(type == 'xiaohongshu'){
+					url = 'https://www.xiaohongshu.com'
 				}
 				this[type + 'Loading'] = true;
 				setTimeout(() => {

+ 13 - 2
src/renderer/components/home.vue

@@ -429,10 +429,12 @@
 			}
 			
 			let dir = this.$utils.getStorage('downloadDir');
-			if(dir){
+			if(dir && fs.existsSync(dir)){
 				this.downloadDir = dir;
 			}
-			
+			if (!fs.existsSync(this.downloadDir + separator + pjson.softInfo.softName)) {
+				fs.mkdirSync(this.downloadDir + separator + pjson.softInfo.softName);
+			}
 			if (!fs.existsSync(os.tmpdir() + separator + 'chrome-data-capture-video')) {
 				fs.mkdirSync(os.tmpdir() + separator + 'chrome-data-capture-video');
 			}
@@ -604,6 +606,7 @@
 					});
 				}
 			},
+			// b站合并下载
 			mergeClick(flag){
 				if(flag){
 					this.mergeModal = true;
@@ -829,6 +832,7 @@
 						];
 					}
 					let params = [
+						'--no-playlist',
 						'--dump-json',
 						...userAgent,
 						formatUrl
@@ -870,6 +874,13 @@
 						if(errStr.indexOf('Unsupported URL') > -1){
 							this.videoParsing(formatUrl);
 							return false;
+						}else if(formatUrl.indexOf('xiaohongshu.com/') > -1 && errStr.indexOf('No video formats') > -1){
+							this.$notify.error({
+								title: '设置中登录小红书账号下载!',
+								message: errStr
+							});
+							this.videoParsing(formatUrl);
+							return false;
 						}else{
 							this.$notify.error({
 								title: '网址解析失败!',