chore: remove outdated changes

docs/fields.md

@@ -25,7 +25,3 @@ A long string of text displayed as a box of text.
 A date and time value.
 
 -   e.g: Date Published, Date Taken, etc.
-
-<!-- prettier-ignore -->
-!!! note
-    Datetime types are a work in progress, and can't currently be manually created or edited.

docs/roadmap.md

@@ -245,12 +245,18 @@ Discrete library objects representing [attributes](<https://en.wikipedia.org/wik
 
 ### :material-file-cog: [Macros](macros.md)
 
+<<<<<<< HEAD
+
 -   [ ] Standard, Human Readable Format (TOML) :material-chevron-triple-up:{ .priority-high title="High Priority" } **[v9.5.x]**
 -   [ ] Versioning System :material-chevron-triple-up:{ .priority-high title="High Priority" } **[v9.5.x]**
--   [ ] Triggers **[v9.5.x]**
-    -   [ ] On File Added :material-chevron-triple-up:{ .priority-high title="High Priority" }
-    -   [ ] On Library Refresh :material-chevron-triple-up:{ .priority-high title="High Priority" }
-    -   [ ] [...]
+-   [ ] # Triggers **[v9.5.x]**
+-   [x] Standard, Human Readable Format (TOML) :material-chevron-triple-up:{ .priority-high title="High Priority" } **[v9.5.5]**
+-   [x] Versioning System :material-chevron-triple-up:{ .priority-high title="High Priority" } **[v9.5.5]**
+-   [ ] Triggers **[v9.5.5]**
+    > > > > > > > d8d2542f (chore: remove outdated changes)
+        -   [ ] On File Added :material-chevron-triple-up:{ .priority-high title="High Priority" }
+        -   [ ] On Library Refresh :material-chevron-triple-up:{ .priority-high title="High Priority" }
+        -   [ ] [...]
 -   [ ] Actions **[v9.5.x]**
     -   [x] Import from JSON file :material-chevron-triple-up:{ .priority-high title="High Priority" }
     -   [ ] Import from plaintext file :material-chevron-triple-up:{ .priority-high title="High Priority" }
@@ -281,8 +287,8 @@ Packs are intended as an easy way to import and export specific data between lib
     -   [ ] Standard, Human Readable Format (TOML) :material-chevron-triple-up:{ .priority-high title="High Priority" }
     -   [ ] Versioning System :material-chevron-double-up:{ .priority-med title="Medium Priority" }
 -   [x] Macro Sharing :material-chevron-triple-up:{ .priority-high title="High Priority" } **[v9.5.x]**
-    -   [ ] Importable :material-chevron-triple-up:{ .priority-high title="High Priority" }
-    -   [ ] Exportable :material-chevron-triple-up:{ .priority-high title="High Priority" }
+    -   [x] Importable :material-chevron-triple-up:{ .priority-high title="High Priority" }
+    -   [x] Exportable :material-chevron-triple-up:{ .priority-high title="High Priority" }
 -   [ ] Sharable Entry Data :material-chevron-double-up:{ .priority-med title="Medium Priority" } **[v9.9.x]**
     -   _Specifics of this are yet to be determined_
 -   [ ] Export Library to Human Readable Format :material-chevron-triple-up:{ .priority-high title="High Priority" } **[v10.0.0]**

src/tagstudio/core/library/alchemy/library.py

@@ -1094,14 +1094,6 @@ class Library:
                 {at for at in ancestor_tags if at not in direct_tags},
             ]
 
-            # logger.info(
-            #     "searching tags",
-            #     search=name,
-            #     limit=limit,
-            #     statement=str(query),
-            #     results=len(res),
-            # )
-
             session.expunge_all()
 
             return res

src/tagstudio/qt/ts_qt.py

@@ -556,7 +556,6 @@ class QtDriver(DriverMixin, QObject):
 
         # region Macros Menu ==========================================================
         self.main_window.menu_bar.macros_menu.aboutToShow.connect(self.update_macros_menu)
-        self.update_macros_menu()
 
         def create_folders_tags_modal():
             if not hasattr(self, "folders_modal"):

src/tagstudio/qt/views/main_window.py

@@ -381,14 +381,6 @@ class MainMenuBar(QMenuBar):
     def setup_macros_menu(self):
         self.macros_menu = QMenu(Translations["menu.macros"], self)
 
-        self.test_macro_1 = "import_metadata.toml"
-        self.test_macro_1_action = QAction(self.test_macro_1, self)
-        self.macros_menu.addAction(self.test_macro_1_action)
-
-        self.test_macro_2 = "conditionals.toml"
-        self.test_macro_2_action = QAction(self.test_macro_2, self)
-        self.macros_menu.addAction(self.test_macro_2_action)
-
         self.folders_to_tags_action = QAction(Translations["menu.macros.folders_to_tags"], self)
         self.folders_to_tags_action.setEnabled(False)
         self.macros_menu.addAction(self.folders_to_tags_action)