From 28b4dc6450958be5eefe82f9234baad3c80a060c Mon Sep 17 00:00:00 2001 From: orestonce Date: Fri, 24 Jun 2022 06:44:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0windows=E5=9B=BE=E6=A0=87/?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 10 +++++----- m3u8d-qt/favicon.ico | Bin 0 -> 4286 bytes m3u8d-qt/m3u8d-qt.pro | 2 +- m3u8d-qt/mainwindow.cpp | 2 +- m3u8d-qt/version.rc | 37 +++++++++++++++++++++++++++++++++++++ 5 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 m3u8d-qt/favicon.ico create mode 100644 m3u8d-qt/version.rc diff --git a/README.md b/README.md index bcba4ad..32357c5 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ -## m3u8d 一款m3u8下载工具 -* 提供windows图形界面(Qt), mac、linux命令行, linux支持arm和386 -* 使用gomedia转换、合并ts格式为mp4 -* windows自带GUI界面的版本下载: [m3u8d_qt_v1.4.2_windows_amd64.exe](https://github.com/orestonce/m3u8d/releases/download/v1.4.2/m3u8d_qt_v1.4.2_windows_amd64.exe): +## m3u8视频下载工具 +* 提供windows图形界面(Qt), mac、linux命令行, linux支持arm、386、mipsle +* 程序会自动将下载的ts文件合并转换格式为mp4 +* windows自带GUI界面的版本下载: [m3u8d_qt_v1.4.3_windows_amd64.exe](https://github.com/orestonce/m3u8d/releases/download/v1.4.3/m3u8d_qt_v1.4.3_windows_amd64.exe): ![](m3u8d-qt/screenshot.png) * 全部版本下载, 包括windows图形界面/linux命令行/mac命令行: https://github.com/orestonce/m3u8d/releases ## 实现说明 * download.go 大部分抄自 https://github.com/llychao/m3u8-downloader -* 使用 https://github.com/yapingcat/gomedia 代替ffmpeg进行格式转换 +* 使用[gomedia](https://github.com/yapingcat/gomedia) 代替ffmpeg进行格式转换 * 支持跳过前面几个ts文件(一般是广告, 嘿嘿) * 程序会在下载保存目录创建: * downloading/ 目录, 用于存放正在下载的分段ts视频, 按照m3u8的url进行划分 diff --git a/m3u8d-qt/favicon.ico b/m3u8d-qt/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..efeb393ccec9a4ead535d84bd8f8a23bfb3dc494 GIT binary patch literal 4286 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 - QIntValidator* vd = new QIntValidator; + QIntValidator* vd = new QIntValidator(this); vd->setRange(0, 9999); ui->lineEdit_SkipTsCountFromHead->setValidator(vd); ui->lineEdit_SkipTsCountFromHead->setPlaceholderText("[0,9999]"); diff --git a/m3u8d-qt/version.rc b/m3u8d-qt/version.rc new file mode 100644 index 0000000..9446f11 --- /dev/null +++ b/m3u8d-qt/version.rc @@ -0,0 +1,37 @@ +IDI_ICON1 ICON "favicon.ico" + +#if defined(UNDER_CE) +#include +#else +#include +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,4,3,0 + PRODUCTVERSION 1,4,3,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE 0x0L + BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "080404b0" + BEGIN + VALUE "ProductVersion", "1.4.3.0\0" + VALUE "ProductName", "m3u8Ƶع\0" + VALUE "LegalCopyright", "https://github.com/orestonce/m3u8d\0" + VALUE "FileDescription", "m3u8Ƶع\0" + END + END + + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x804, 1200 + END + END \ No newline at end of file