diff options
Diffstat (limited to 'lib/extensions')
| -rw-r--r-- | lib/extensions/lettering_custom_font_dir.py | 13 | ||||
| -rw-r--r-- | lib/extensions/print_pdf.py | 10 |
2 files changed, 5 insertions, 18 deletions
diff --git a/lib/extensions/lettering_custom_font_dir.py b/lib/extensions/lettering_custom_font_dir.py index a8ad9d98..626517fd 100644 --- a/lib/extensions/lettering_custom_font_dir.py +++ b/lib/extensions/lettering_custom_font_dir.py @@ -6,10 +6,10 @@ import json import os -import platformdirs from inkex import errormsg from ..i18n import _ +from ..utils import get_user_dir from .base import InkstitchExtension @@ -30,20 +30,13 @@ class LetteringCustomFontDir(InkstitchExtension): data = {'custom_font_dir': '%s' % path} - try: - config_path = platformdirs.user_config_dir('inkstitch') - except ImportError: - config_path = os.path.expanduser('~/.inkstitch') - if not os.path.exists(config_path): - os.makedirs(config_path) - config_path = os.path.join(config_path, 'custom_dirs.json') - + config_path = get_user_dir('custom_dirs.json') with open(config_path, 'w', encoding="utf8") as font_data: json.dump(data, font_data, indent=4, ensure_ascii=False) def get_custom_font_dir(): - custom_font_dir_path = os.path.join(platformdirs.user_config_dir('inkstitch'), 'custom_dirs.json') + custom_font_dir_path = get_user_dir('custom_dirs.json') try: with open(custom_font_dir_path, 'r') as custom_dirs: custom_dir = json.load(custom_dirs) diff --git a/lib/extensions/print_pdf.py b/lib/extensions/print_pdf.py index 4111a8d4..0bdd9d81 100644 --- a/lib/extensions/print_pdf.py +++ b/lib/extensions/print_pdf.py @@ -14,7 +14,6 @@ from copy import deepcopy from datetime import date from threading import Thread -import platformdirs import wx from flask import Flask, Response, jsonify, request, send_from_directory from jinja2 import Environment, FileSystemLoader, select_autoescape @@ -27,7 +26,7 @@ from ..i18n import translation as inkstitch_translation from ..stitch_plan import stitch_groups_to_stitch_plan from ..svg import render_stitch_plan from ..threads import ThreadCatalog -from ..utils import get_resource_dir +from ..utils import get_resource_dir, get_user_dir from .base import InkstitchExtension @@ -36,12 +35,7 @@ def datetimeformat(value, format='%Y/%m/%d'): def defaults_path(): - defaults_dir = platformdirs.user_config_dir('inkstitch') - - if not os.path.exists(defaults_dir): - os.makedirs(defaults_dir) - - return os.path.join(defaults_dir, 'print_settings.json') + return get_user_dir('print_settings.json') def load_defaults(): |
