Nemcio/DemonEditor
1
0
Fork 0
mirror of https://github.com/DYefremov/DemonEditor.git synced 2026-01-16 20:43:14 +01:00
Code Issues Packages Projects Releases Activity

changed 7-zip extract cmd

Browse Source
This commit is contained in:
DYefremov
2021-10-14 11:56:30 +03:00
parent 4f8f6cfcc9
commit a3cf5edd5e
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/tools/picons.py
View File

@@ -37,7 +37,7 @@ from html.parser import HTMLParser
import requests
from app.commons import run_task, log
from app.settings import SettingsType, IS_LINUX, IS_WIN
from app.settings import SettingsType, IS_LINUX, IS_WIN, IS_DARWIN, GTK_PATH
from .satellites import _HEADERS
_ENIGMA2_PICON_KEY = "{:X}:{:X}:{}"
@@ -128,12 +128,15 @@ class PiconsCzDownloader:
def extract(self, src, dest, picon_ids=None):
""" Extracts 7z archives. """
# TODO: think about https://github.com/miurahr/py7zr
exe = "7zr"
if IS_LINUX and not os.path.isfile("/usr/bin/7zr"):
raise PiconsError("7-zip [7zr] archiver not found!")
exe = "7z"
if IS_DARWIN and GTK_PATH:
exe = "./7z"
if IS_LINUX and not os.path.isfile(f"/usr/bin/{exe}"):
raise PiconsError("7-zip [7z] archiver not found!")
if IS_WIN:
exe = "C:\\Program Files\\7-Zip\\7z.exe"
exe = f"C:{os.sep}Program Files{os.sep}7-Zip{os.sep}{exe}.exe"
if not os.path.isfile(exe):
raise PiconsError("7-Zip executable not found!")