diff --git a/.gitignore b/.gitignore index 62c8935..46fcd7f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,6 @@ -.idea/ \ No newline at end of file +.idea/ +__pycache__/ +*.log +config.ini +__init__.pyc +*.pyc \ No newline at end of file diff --git a/flow.py b/flow.py index 00e6c0c..409396d 100644 --- a/flow.py +++ b/flow.py @@ -49,6 +49,7 @@ from core.common import raw_decompress import gzip, json import io, sys, time +import platform TOOL_REQ_URL = { 'ffmpeg': 'https://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-3.2-win64-static.zip', @@ -123,6 +124,9 @@ def unzip_ffmpeg(zipfile): @staticmethod def checkFfmpeg(): dlm = nbdler.Manager() + if (platform.system()!='Windows'): + print('非windows系统请自行安装ffmpeg') + return True if (not os.path.exists('ffmpeg.exe') or os.path.exists('ffmpeg.exe.nbdler')) and not os.path.exists(cv.FFMPEG_PATH): dlg = wx.MessageDialog(None, u'该程序需要ffmpeg.exe才能完成工作,是否要下载?', u'提示', wx.YES_NO | wx.ICON_INFORMATION) if dlg.ShowModal() != wx.ID_YES: @@ -152,6 +156,9 @@ def checkFfmpeg(): @staticmethod def checkNode(): dlm = nbdler.Manager() + if (platform.system()!='Windows'): + print('非windows系统请自行安装node') + return True if not os.path.exists('node.exe') or os.path.exists('node.exe.nbdler'): dlg = wx.MessageDialog(None, u'该程序需要Nodejs.exe才能完成工作,是否要下载?', u'提示', wx.YES_NO | wx.ICON_INFORMATION) if dlg.ShowModal() != wx.ID_YES: diff --git a/gui/about.py b/gui/about.py index ffab545..b23e8b3 100644 --- a/gui/about.py +++ b/gui/about.py @@ -1,4 +1,4 @@ - +# -*- coding: UTF-8 -*- import wx import wx.adv