diff options
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/install.py | 55 | ||||
| -rw-r--r-- | lib/api/lang.py | 11 | ||||
| -rw-r--r-- | lib/api/page_specs.py | 8 | ||||
| -rw-r--r-- | lib/api/server.py | 34 |
4 files changed, 35 insertions, 73 deletions
diff --git a/lib/api/install.py b/lib/api/install.py deleted file mode 100644 index 654f8171..00000000 --- a/lib/api/install.py +++ /dev/null @@ -1,55 +0,0 @@ -# Authors: see git history -# -# Copyright (c) 2010 Authors -# Licensed under the GNU GPL version 3.0 or later. See the file LICENSE for details. - -import os -import sys -from glob import glob - -from flask import Blueprint, jsonify, request - -from ..utils import get_bundled_dir, guess_inkscape_config_path - -install = Blueprint('install', __name__) - - -@install.route('/palettes', methods=["POST"]) -def palettes(): - try: - base_path = request.json.get('path') or guess_inkscape_config_path() - path = os.path.join(base_path, 'palettes') - src_dir = get_bundled_dir('palettes') - copy_files(glob(os.path.join(src_dir, "*")), path) - except Exception as exc: - return jsonify({"error": str(exc)}), 500 - - return jsonify({"status": "success"}) - - -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) - - -@install.route('/default-path') -def default_path(): - return guess_inkscape_config_path() diff --git a/lib/api/lang.py b/lib/api/lang.py new file mode 100644 index 00000000..73c190f4 --- /dev/null +++ b/lib/api/lang.py @@ -0,0 +1,11 @@ +import os + +from flask import Blueprint, jsonify + +languages = Blueprint('languages', __name__) + + +@languages.route('') +def get_lang(): + languages = dict(os.environ) + return jsonify(languages) diff --git a/lib/api/page_specs.py b/lib/api/page_specs.py index 7b023683..8d3aee49 100644 --- a/lib/api/page_specs.py +++ b/lib/api/page_specs.py @@ -15,16 +15,22 @@ def get_page_specs(): height = svg.get('height', 0) pagecolor = "white" deskcolor = "white" + bordercolor = "black" + showpageshadow = True namedview = svg.namedview if namedview is not None: pagecolor = namedview.get('pagecolor', pagecolor) deskcolor = namedview.get('inkscape:deskcolor', deskcolor) + bordercolor = namedview.get('bordercolor', bordercolor) + showpageshadow = namedview.get('inkscape:showpageshadow', showpageshadow) page_specs = { "width": width, "height": height, "pagecolor": pagecolor, - "deskcolor": deskcolor + "deskcolor": deskcolor, + "bordercolor": bordercolor, + "showpageshadow": showpageshadow } return jsonify(page_specs) diff --git a/lib/api/server.py b/lib/api/server.py index 41a42731..26efa521 100644 --- a/lib/api/server.py +++ b/lib/api/server.py @@ -9,17 +9,20 @@ import socket import sys import time from threading import Thread +from contextlib import closing import requests from flask import Flask, g from werkzeug.serving import make_server from ..utils.json import InkStitchJSONProvider -from .install import install from .simulator import simulator from .stitch_plan import stitch_plan from .preferences import preferences from .page_specs import page_specs +from .lang import languages +# this for electron axios +from flask_cors import CORS class APIServer(Thread): @@ -42,13 +45,14 @@ class APIServer(Thread): cli.show_server_banner = lambda *x: None self.app = Flask(__name__) + CORS(self.app) self.app.json = InkStitchJSONProvider(self.app) self.app.register_blueprint(simulator, url_prefix="/simulator") self.app.register_blueprint(stitch_plan, url_prefix="/stitch_plan") - self.app.register_blueprint(install, url_prefix="/install") self.app.register_blueprint(preferences, url_prefix="/preferences") self.app.register_blueprint(page_specs, url_prefix="/page_specs") + self.app.register_blueprint(languages, url_prefix="/languages") @self.app.before_request def store_extension(): @@ -67,25 +71,21 @@ class APIServer(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() + 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() def ready_checker(self): """Wait until the server is started. |