diff options
Diffstat (limited to 'lib/extensions')
| -rw-r--r-- | lib/extensions/install.py | 50 | ||||
| -rw-r--r-- | lib/extensions/preferences.py | 2 | ||||
| -rw-r--r-- | lib/extensions/print_pdf.py | 34 | ||||
| -rw-r--r-- | lib/extensions/simulator.py | 2 |
4 files changed, 58 insertions, 30 deletions
diff --git a/lib/extensions/install.py b/lib/extensions/install.py index 62cfde73..501694ed 100644 --- a/lib/extensions/install.py +++ b/lib/extensions/install.py @@ -4,18 +4,48 @@ # Licensed under the GNU GPL version 3.0 or later. See the file LICENSE for details. from .base import InkstitchExtension -from ..api import APIServer -from ..gui import open_url +import os +import sys +from glob import glob +from ..utils import get_bundled_dir, guess_inkscape_config_path +from inkex import errormsg +from ..i18n import _ class Install(InkstitchExtension): - def __init__(self): - InkstitchExtension.__init__(self) + def __init__(self, *args, **kwargs): + InkstitchExtension.__init__(self, *args, **kwargs) def effect(self): - api_server = APIServer(self) - port = api_server.start_server() - electron = open_url("/install?port=%d" % port) - electron.wait() - api_server.stop() - api_server.join() + path = os.path.join(guess_inkscape_config_path(), 'palettes') + src_dir = get_bundled_dir('palettes') + try: + copy_files(glob(os.path.join(src_dir, "*")), path) + errormsg(_("Successfully installed color palettes for Inkscape.\n\n" + "Please restart Inkscape.")) + except IOError: + errormsg(_("Could not install color palettes. Please file an issue on " + "https://github.com/inkstitch/inkstitch/issues")) + + +if sys.platform == "win32": + # If we try to just use shutil.copy it says the operation requires elevation. + def copy_files(files, dest): + import pythoncom + import winutils + + pythoncom.CoInitialize() + + if not os.path.exists(dest): + os.makedirs(dest) + + winutils.copy(files, dest) +else: + def copy_files(files, dest): + import shutil + + if not os.path.exists(dest): + os.makedirs(dest) + + for palette_file in files: + shutil.copy(palette_file, dest) diff --git a/lib/extensions/preferences.py b/lib/extensions/preferences.py index 8a06f829..44c1b5aa 100644 --- a/lib/extensions/preferences.py +++ b/lib/extensions/preferences.py @@ -27,7 +27,7 @@ class Preferences(InkstitchExtension): def effect(self): api_server = APIServer(self) port = api_server.start_server() - electron = open_url("/preferences?port=%d" % port) + electron = open_url("/preferences", port) electron.wait() api_server.stop() api_server.join() diff --git a/lib/extensions/print_pdf.py b/lib/extensions/print_pdf.py index 01878e8d..1d5af76a 100644 --- a/lib/extensions/print_pdf.py +++ b/lib/extensions/print_pdf.py @@ -3,7 +3,6 @@ # Copyright (c) 2010 Authors # Licensed under the GNU GPL version 3.0 or later. See the file LICENSE for details. -import errno import json import logging import os @@ -13,6 +12,7 @@ import time from copy import deepcopy from datetime import date from threading import Thread +from contextlib import closing import appdirs from flask import Flask, Response, jsonify, request, send_from_directory @@ -162,25 +162,24 @@ class PrintPreviewServer(Thread): def disable_logging(self): logging.getLogger('werkzeug').setLevel(logging.ERROR) + # https://github.com/aluo-x/Learning_Neural_Acoustic_Fields/blob/master/train.py + # https://github.com/pytorch/pytorch/issues/71029 + def find_free_port(self): + with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as s: + s.bind(('localhost', 0)) + return s.getsockname()[1] + def run(self): self.disable_logging() self.host = "127.0.0.1" - self.port = 5000 - - while True: - try: - self.flask_server = make_server(self.host, self.port, self.app) - self.server_thread = Thread(target=self.flask_server.serve_forever) - self.server_thread.start() - except socket.error as e: - if e.errno == errno.EADDRINUSE: - self.port += 1 - continue - else: - raise - else: - break + self.port = self.find_free_port() + # exporting the port number for languages to work in electron vuejs part of inkstitch + os.environ['FLASKPORT'] = str(self.port) + + self.flask_server = make_server(self.host, self.port, self.app) + self.server_thread = Thread(target=self.flask_server.serve_forever) + self.server_thread.start() class Print(InkstitchExtension): @@ -331,13 +330,12 @@ class Print(InkstitchExtension): realistic_color_block_svgs=realistic_color_block_svgs ) print_server.start() - # Wait for print_server.host and print_server.port to be populated. # Hacky, but Flask doesn't have an option for a callback to be run # after startup. time.sleep(0.5) - browser_window = open_url("http://%s:%s/" % (print_server.host, print_server.port)) + browser_window = open_url(print_server.host, print_server.port, True) browser_window.wait() print_server.stop() print_server.join() diff --git a/lib/extensions/simulator.py b/lib/extensions/simulator.py index c04e1acd..3b532bf2 100644 --- a/lib/extensions/simulator.py +++ b/lib/extensions/simulator.py @@ -18,7 +18,7 @@ class Simulator(InkstitchExtension): return api_server = APIServer(self) port = api_server.start_server() - electron = open_url("/simulator?port=%d" % port) + electron = open_url("/simulator", port) electron.wait() api_server.stop() api_server.join() |