From 408f5987d0d7af0d3208d194315518d25db19e21 Mon Sep 17 00:00:00 2001 From: tech-shrimp Date: Fri, 29 Mar 2024 15:32:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpyinstaller=E4=B8=8Bffmeg?= =?UTF-8?q?=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- decrypter/video_decrypt.py | 4 +++- gui/gui.py | 7 ++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/decrypter/video_decrypt.py b/decrypter/video_decrypt.py index 637a758..b8a2b01 100644 --- a/decrypter/video_decrypt.py +++ b/decrypter/video_decrypt.py @@ -44,7 +44,7 @@ class VideoDecrypter: # 这是到_internal文件夹 resource_dir = getattr(sys, '_MEIPASS') # 获取_internal上一级文件夹再拼接 - return os.path.join(resource_dir, 'output', dir_name, 'videos', f'{md5}_{duration}.mp4') + return os.path.join(os.path.dirname(resource_dir), 'output', dir_name, 'videos', f'{md5}_{duration}.mp4') else: return os.path.join(os.getcwd(), 'output', dir_name, 'videos', f'{md5}_{duration}.mp4') @@ -117,8 +117,10 @@ class VideoDecrypter: input_path = str(file.resolve()) ffmpeg_path = self.get_ffmpeg_path() output_path = self.get_output_path(dir_name, md5, duration) + print("ffmpeg_path: " + str(ffmpeg_path)) if os.path.exists(ffmpeg_path): cmd = f'''"{ffmpeg_path}" -loglevel quiet -i "{input_path}" -c:v libx264 "{output_path}"''' + print("ffmpeg_path cmd:" + cmd) subprocess.run(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) else: shutil.copy(file.resolve(), f"output/{dir_name}/videos/{md5}_{duration}.mp4") diff --git a/gui/gui.py b/gui/gui.py index 0a381f8..d18a4fa 100644 --- a/gui/gui.py +++ b/gui/gui.py @@ -1,14 +1,11 @@ import os -import threading import tkinter import tkinter.font import tkinter.ttk from datetime import datetime, timedelta from pathlib import Path from typing import Optional -from time import sleep import tkcalendar -from pywxdump import read_info from decrypter.db_decrypt import DatabaseDecrypter from decrypter.video_decrypt import VideoDecrypter from gui.auto_scroll_guide import AutoScrollGuide @@ -82,13 +79,13 @@ class Gui: self.waiting_label.config(text="微信已登录") self.auto_scroll_button_text = tkinter.StringVar() - self.auto_scroll_button_text.set("读取全部朋友") + self.auto_scroll_button_text.set("自动浏览全部朋友圈") self.auto_scroll_button = tkinter.ttk.Button(self.root, textvariable=self.auto_scroll_button_text, command=self.open_auto_scroll_guide) self.auto_scroll_button.place(relx=0.35, rely=0.15, anchor='center') self.auto_scroll_button_single_text = tkinter.StringVar() - self.auto_scroll_button_single_text.set("读取单个朋友") + self.auto_scroll_button_single_text.set("自动浏览单个朋友") self.auto_scroll_button_single = tkinter.ttk.Button(self.root, textvariable=self.auto_scroll_button_single_text, command=self.switch_auto_scroll_single) self.auto_scroll_button_single.place(relx=0.655, rely=0.15, anchor='center')