move get_bundled_dir to utils

pull/224/head
Lex Neva 2018-07-04 21:16:49 -04:00
rodzic a0659e2c2d
commit d090fa0038
3 zmienionych plików z 13 dodań i 8 usunięć

Wyświetl plik

@ -13,7 +13,7 @@ import logging
import wx
import inkex
from ..utils import guess_inkscape_config_path
from ..utils import guess_inkscape_config_path, get_bundled_dir
class InstallerFrame(wx.Frame):
@ -78,15 +78,9 @@ class InstallerFrame(wx.Frame):
def install_addons(self, type):
path = os.path.join(self.path, type)
src_dir = self.get_bundled_dir(type)
src_dir = get_bundled_dir(type)
self.copy_files(glob(os.path.join(src_dir, "*")), path)
def get_bundled_dir(self, name):
if getattr(sys, 'frozen', None) is not None:
return realpath(os.path.join(sys._MEIPASS, '..', name))
else:
return realpath(os.path.join(dirname(realpath(__file__)), '..', '..', name))
if (sys.platform == "win32"):
# If we try to just use shutil.copy it says the operation requires elevation.
def copy_files(self, files, dest):

Wyświetl plik

@ -2,3 +2,4 @@ from geometry import *
from cache import cache
from io import *
from inkscape import *
from paths import *

10
lib/utils/paths.py 100644
Wyświetl plik

@ -0,0 +1,10 @@
import sys
import os
from os.path import dirname, realpath
def get_bundled_dir(name):
if getattr(sys, 'frozen', None) is not None:
return realpath(os.path.join(sys._MEIPASS, "..", name))
else:
return realpath(os.path.join(dirname(realpath(__file__)), '..', '..', name))