From de09da1592202a2d1821b010bcd668fe6f726a5a Mon Sep 17 00:00:00 2001 From: Andrew Arneson Date: Wed, 24 Apr 2024 23:18:16 -0600 Subject: [PATCH] remove tagstudio prefix for source libraries --- tagstudio/src/core/library.py | 6 +++--- tagstudio/src/core/ts_core.py | 2 +- tagstudio/src/qt/main_window.py | 2 +- tagstudio/src/qt/ts_qt.py | 14 +++++++------- tagstudio/tag_studio.py | 6 +++--- tagstudio/tests/core/test_tags.py | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tagstudio/src/core/library.py b/tagstudio/src/core/library.py index 0ece31d1..97f2e871 100644 --- a/tagstudio/src/core/library.py +++ b/tagstudio/src/core/library.py @@ -17,9 +17,9 @@ from enum import Enum import ujson -from tagstudio.src.core import ts_core -from tagstudio.src.core.utils.str import strip_punctuation -from tagstudio.src.core.utils.web import strip_web_protocol +from src.core import ts_core +from src.core.utils.str import strip_punctuation +from src.core.utils.web import strip_web_protocol TYPE = ['file', 'meta', 'alt', 'mask'] # RESULT_TYPE = Enum('Result', ['ENTRY', 'COLLATION', 'TAG_GROUP']) diff --git a/tagstudio/src/core/ts_core.py b/tagstudio/src/core/ts_core.py index 4115cbb2..5f50954d 100644 --- a/tagstudio/src/core/ts_core.py +++ b/tagstudio/src/core/ts_core.py @@ -7,7 +7,7 @@ import json import os -from tagstudio.src.core.library import Entry, Library +from src.core.library import Entry, Library VERSION: str = '9.1.0' # Major.Minor.Patch VERSION_BRANCH: str = 'Alpha' # 'Alpha', 'Beta', or '' for Full Release diff --git a/tagstudio/src/qt/main_window.py b/tagstudio/src/qt/main_window.py index daa79d6f..8055d930 100644 --- a/tagstudio/src/qt/main_window.py +++ b/tagstudio/src/qt/main_window.py @@ -19,7 +19,7 @@ from PySide6.QtWidgets import (QComboBox, QFrame, QGridLayout, QHBoxLayout, QVBoxLayout, QLayout, QLineEdit, QMainWindow, QMenuBar, QPushButton, QScrollArea, QSizePolicy, QStatusBar, QWidget, QSplitter, QMenu) -from tagstudio.src.qt.pagination import Pagination +from src.qt.pagination import Pagination class Ui_MainWindow(QMainWindow): diff --git a/tagstudio/src/qt/ts_qt.py b/tagstudio/src/qt/ts_qt.py index 61c6a5c9..729f7657 100644 --- a/tagstudio/src/qt/ts_qt.py +++ b/tagstudio/src/qt/ts_qt.py @@ -34,17 +34,17 @@ from PySide6.QtWidgets import (QApplication, QWidget, QVBoxLayout, QHBoxLayout, QMenu) from humanfriendly import format_timespan, format_size -from tagstudio.src.core.library import Collation, Entry, ItemType, Library, Tag -from tagstudio.src.core.palette import ColorType, get_tag_color -from tagstudio.src.core.ts_core import (TagStudioCore, TAG_COLORS, DATE_FIELDS, TEXT_FIELDS, BOX_FIELDS, ALL_FILE_TYPES, +from src.core.library import Collation, Entry, ItemType, Library, Tag +from src.core.palette import ColorType, get_tag_color +from src.core.ts_core import (TagStudioCore, TAG_COLORS, DATE_FIELDS, TEXT_FIELDS, BOX_FIELDS, ALL_FILE_TYPES, SHORTCUT_TYPES, PROGRAM_TYPES, ARCHIVE_TYPES, PRESENTATION_TYPES, SPREADSHEET_TYPES, TEXT_TYPES, AUDIO_TYPES, VIDEO_TYPES, IMAGE_TYPES, LIBRARY_FILENAME, COLLAGE_FOLDER_NAME, BACKUP_FOLDER_NAME, TS_FOLDER_NAME, VERSION_BRANCH, VERSION) -from tagstudio.src.core.utils.web import strip_web_protocol -from tagstudio.src.qt.flowlayout import FlowLayout, FlowWidget -from tagstudio.src.qt.main_window import Ui_MainWindow -import tagstudio.src.qt.resources_rc +from src.core.utils.web import strip_web_protocol +from src.qt.flowlayout import FlowLayout, FlowWidget +from src.qt.main_window import Ui_MainWindow +import src.qt.resources_rc # SIGQUIT is not defined on Windows if sys.platform == "win32": diff --git a/tagstudio/tag_studio.py b/tagstudio/tag_studio.py index 683529f4..54039eb7 100644 --- a/tagstudio/tag_studio.py +++ b/tagstudio/tag_studio.py @@ -4,9 +4,9 @@ """TagStudio launcher.""" -from tagstudio.src.core.ts_core import TagStudioCore -from tagstudio.src.cli.ts_cli import CliDriver -from tagstudio.src.qt.ts_qt import QtDriver +from src.core.ts_core import TagStudioCore +from src.cli.ts_cli import CliDriver +from src.qt.ts_qt import QtDriver import argparse import traceback diff --git a/tagstudio/tests/core/test_tags.py b/tagstudio/tests/core/test_tags.py index 7ff70d0b..33c8e895 100644 --- a/tagstudio/tests/core/test_tags.py +++ b/tagstudio/tests/core/test_tags.py @@ -1,4 +1,4 @@ -from tagstudio.src.core.library import Tag +from src.core.library import Tag class TestTags: