From 3a6f2a993ef0c3a06a015735f7376bbc5c0ab75d Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sat, 3 Apr 2021 16:26:10 +1000 Subject: [PATCH] move operations into submodule --- qt/aqt/addcards.py | 2 +- qt/aqt/browser.py | 20 +++++++++++-------- qt/aqt/deckbrowser.py | 7 ++++++- qt/aqt/editor.py | 2 +- qt/aqt/filtered_deck.py | 2 +- qt/aqt/main.py | 2 +- qt/aqt/operations/__init__.py | 0 qt/aqt/{card_ops.py => operations/card.py} | 0 .../collection.py} | 0 qt/aqt/{deck_ops.py => operations/deck.py} | 0 qt/aqt/{note_ops.py => operations/note.py} | 0 .../scheduling.py} | 0 qt/aqt/{tag_ops.py => operations/tag.py} | 0 qt/aqt/overview.py | 2 +- qt/aqt/reviewer.py | 12 +++++------ qt/aqt/sidebar.py | 4 ++-- qt/aqt/studydeck.py | 2 +- 17 files changed, 32 insertions(+), 23 deletions(-) create mode 100644 qt/aqt/operations/__init__.py rename qt/aqt/{card_ops.py => operations/card.py} (100%) rename qt/aqt/{collection_ops.py => operations/collection.py} (100%) rename qt/aqt/{deck_ops.py => operations/deck.py} (100%) rename qt/aqt/{note_ops.py => operations/note.py} (100%) rename qt/aqt/{scheduling_ops.py => operations/scheduling.py} (100%) rename qt/aqt/{tag_ops.py => operations/tag.py} (100%) diff --git a/qt/aqt/addcards.py b/qt/aqt/addcards.py index 3b45b9e25..bd60b8365 100644 --- a/qt/aqt/addcards.py +++ b/qt/aqt/addcards.py @@ -13,8 +13,8 @@ from anki.models import NotetypeId from anki.notes import DuplicateOrEmptyResult, Note, NoteId from anki.utils import htmlToTextLine, isMac from aqt import AnkiQt, gui_hooks -from aqt.note_ops import add_note from aqt.notetypechooser import NotetypeChooser +from aqt.operations.note import add_note from aqt.qt import * from aqt.sound import av_player from aqt.utils import ( diff --git a/qt/aqt/browser.py b/qt/aqt/browser.py index f5dec950d..a2394ca2e 100644 --- a/qt/aqt/browser.py +++ b/qt/aqt/browser.py @@ -20,27 +20,31 @@ from anki.stats import CardStats from anki.tags import MARKED_TAG from anki.utils import ids2str, isMac from aqt import AnkiQt, gui_hooks -from aqt.card_ops import set_card_deck, set_card_flag -from aqt.collection_ops import undo from aqt.editor import Editor from aqt.exporting import ExportDialog from aqt.find_and_replace import FindAndReplaceDialog from aqt.main import ResetReason -from aqt.note_ops import remove_notes -from aqt.previewer import BrowserPreviewer as PreviewDialog -from aqt.previewer import Previewer -from aqt.qt import * -from aqt.scheduling_ops import ( +from aqt.operations.card import set_card_deck, set_card_flag +from aqt.operations.collection import undo +from aqt.operations.note import remove_notes +from aqt.operations.scheduling import ( forget_cards, reposition_new_cards_dialog, set_due_date_dialog, suspend_cards, unsuspend_cards, ) +from aqt.operations.tag import ( + add_tags_to_notes, + clear_unused_tags, + remove_tags_from_notes, +) +from aqt.previewer import BrowserPreviewer as PreviewDialog +from aqt.previewer import Previewer +from aqt.qt import * from aqt.sidebar import SidebarTreeView from aqt.switch import Switch from aqt.table import Table -from aqt.tag_ops import add_tags_to_notes, clear_unused_tags, remove_tags_from_notes from aqt.utils import ( HelpPage, KeyboardModifiersPressed, diff --git a/qt/aqt/deckbrowser.py b/qt/aqt/deckbrowser.py index 6663e5ed6..eb759c3fc 100644 --- a/qt/aqt/deckbrowser.py +++ b/qt/aqt/deckbrowser.py @@ -12,7 +12,12 @@ from anki.collection import OpChanges from anki.decks import DeckId, DeckTreeNode from anki.utils import intTime from aqt import AnkiQt, gui_hooks -from aqt.deck_ops import add_deck_dialog, remove_decks, rename_deck, reparent_decks +from aqt.operations.deck import ( + add_deck_dialog, + remove_decks, + rename_deck, + reparent_decks, +) from aqt.qt import * from aqt.sound import av_player from aqt.toolbar import BottomBar diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py index 24d7d6aa6..4278cc71d 100644 --- a/qt/aqt/editor.py +++ b/qt/aqt/editor.py @@ -30,7 +30,7 @@ from anki.httpclient import HttpClient from anki.notes import DuplicateOrEmptyResult, Note from anki.utils import checksum, isLin, isWin, namedtmp from aqt import AnkiQt, colors, gui_hooks -from aqt.note_ops import update_note +from aqt.operations.note import update_note from aqt.qt import * from aqt.sound import av_player from aqt.theme import theme_manager diff --git a/qt/aqt/filtered_deck.py b/qt/aqt/filtered_deck.py index d449ef907..fcce0af09 100644 --- a/qt/aqt/filtered_deck.py +++ b/qt/aqt/filtered_deck.py @@ -10,8 +10,8 @@ from anki.errors import SearchError from anki.lang import without_unicode_isolation from anki.scheduler import FilteredDeckForUpdate from aqt import AnkiQt, colors, gui_hooks +from aqt.operations.scheduling import add_or_update_filtered_deck from aqt.qt import * -from aqt.scheduling_ops import add_or_update_filtered_deck from aqt.theme import theme_manager from aqt.utils import ( HelpPage, diff --git a/qt/aqt/main.py b/qt/aqt/main.py index 29d7321d6..140bb7317 100644 --- a/qt/aqt/main.py +++ b/qt/aqt/main.py @@ -56,12 +56,12 @@ from anki.sound import AVTag, SoundOrVideoTag from anki.utils import devMode, ids2str, intTime, isMac, isWin, splitFields from aqt import gui_hooks from aqt.addons import DownloadLogEntry, check_and_prompt_for_updates, show_log_to_user -from aqt.collection_ops import undo from aqt.dbcheck import check_db from aqt.emptycards import show_empty_cards from aqt.legacy import install_pylib_legacy from aqt.mediacheck import check_media_db from aqt.mediasync import MediaSyncer +from aqt.operations.collection import undo from aqt.profiles import ProfileManager as ProfileManagerType from aqt.qt import * from aqt.qt import sip diff --git a/qt/aqt/operations/__init__.py b/qt/aqt/operations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/qt/aqt/card_ops.py b/qt/aqt/operations/card.py similarity index 100% rename from qt/aqt/card_ops.py rename to qt/aqt/operations/card.py diff --git a/qt/aqt/collection_ops.py b/qt/aqt/operations/collection.py similarity index 100% rename from qt/aqt/collection_ops.py rename to qt/aqt/operations/collection.py diff --git a/qt/aqt/deck_ops.py b/qt/aqt/operations/deck.py similarity index 100% rename from qt/aqt/deck_ops.py rename to qt/aqt/operations/deck.py diff --git a/qt/aqt/note_ops.py b/qt/aqt/operations/note.py similarity index 100% rename from qt/aqt/note_ops.py rename to qt/aqt/operations/note.py diff --git a/qt/aqt/scheduling_ops.py b/qt/aqt/operations/scheduling.py similarity index 100% rename from qt/aqt/scheduling_ops.py rename to qt/aqt/operations/scheduling.py diff --git a/qt/aqt/tag_ops.py b/qt/aqt/operations/tag.py similarity index 100% rename from qt/aqt/tag_ops.py rename to qt/aqt/operations/tag.py diff --git a/qt/aqt/overview.py b/qt/aqt/overview.py index b1e626543..8d2df0d76 100644 --- a/qt/aqt/overview.py +++ b/qt/aqt/overview.py @@ -8,7 +8,7 @@ from typing import Any, Callable, Dict, List, Optional, Tuple import aqt from anki.collection import OpChanges from aqt import gui_hooks -from aqt.scheduling_ops import empty_filtered_deck, rebuild_filtered_deck +from aqt.operations.scheduling import empty_filtered_deck, rebuild_filtered_deck from aqt.sound import av_player from aqt.toolbar import BottomBar from aqt.utils import askUserDialog, openLink, shortcut, tooltip, tr diff --git a/qt/aqt/reviewer.py b/qt/aqt/reviewer.py index f23f2669c..feb9d8e4d 100644 --- a/qt/aqt/reviewer.py +++ b/qt/aqt/reviewer.py @@ -18,19 +18,19 @@ from anki.collection import Config, OpChanges from anki.tags import MARKED_TAG from anki.utils import stripHTML from aqt import AnkiQt, gui_hooks -from aqt.card_ops import set_card_flag -from aqt.note_ops import remove_notes -from aqt.profiles import VideoDriver -from aqt.qt import * -from aqt.scheduling_ops import ( +from aqt.operations.card import set_card_flag +from aqt.operations.note import remove_notes +from aqt.operations.scheduling import ( bury_cards, bury_note, set_due_date_dialog, suspend_cards, suspend_note, ) +from aqt.operations.tag import add_tags_to_notes, remove_tags_from_notes +from aqt.profiles import VideoDriver +from aqt.qt import * from aqt.sound import av_player, play_clicked_audio, record_audio -from aqt.tag_ops import add_tags_to_notes, remove_tags_from_notes from aqt.theme import theme_manager from aqt.toolbar import BottomBar from aqt.utils import askUserDialog, downArrow, qtMenuShortcutWorkaround, tooltip, tr diff --git a/qt/aqt/sidebar.py b/qt/aqt/sidebar.py index 12f49084b..6cfa9a196 100644 --- a/qt/aqt/sidebar.py +++ b/qt/aqt/sidebar.py @@ -15,10 +15,10 @@ from anki.tags import TagTreeNode from anki.types import assert_exhaustive from aqt import colors, gui_hooks from aqt.clayout import CardLayout -from aqt.deck_ops import remove_decks, rename_deck, reparent_decks from aqt.models import Models +from aqt.operations.deck import remove_decks, rename_deck, reparent_decks +from aqt.operations.tag import remove_tags_from_all_notes, rename_tag, reparent_tags from aqt.qt import * -from aqt.tag_ops import remove_tags_from_all_notes, rename_tag, reparent_tags from aqt.theme import ColoredIcon, theme_manager from aqt.utils import KeyboardModifiersPressed, askUser, getOnlyText, showWarning, tr diff --git a/qt/aqt/studydeck.py b/qt/aqt/studydeck.py index e92873665..e028e6718 100644 --- a/qt/aqt/studydeck.py +++ b/qt/aqt/studydeck.py @@ -7,7 +7,7 @@ import aqt from anki.collection import OpChangesWithId from anki.decks import DeckId from aqt import gui_hooks -from aqt.deck_ops import add_deck_dialog +from aqt.operations.deck import add_deck_dialog from aqt.qt import * from aqt.utils import ( HelpPage,