Save KnowledgeDatabase for the Upgrader

Tribler · Sep 27, 2023 · 47b13d5 · 47b13d5
1 parent f2095ee
commit 47b13d5
Show file tree

Hide file tree

Showing 7 changed files with 462 additions and 6 deletions.
diff --git a/src/tribler/core/upgrade/tags_to_knowledge/migration.py b/src/tribler/core/upgrade/tags_to_knowledge/migration.py
@@ -7,8 +7,8 @@
 from pony.orm import db_session, select
 
 from tribler.core.components.knowledge.community.knowledge_payload import StatementOperation
-from tribler.core.components.database.db.knowledge_db import KnowledgeDatabase, ResourceType
-from tribler.core.upgrade.tags_to_knowledge.tags_db import TagDatabase
+from tribler.core.upgrade.tags_to_knowledge.previous_dbs.knowledge_db import KnowledgeDatabase, ResourceType
+from tribler.core.upgrade.tags_to_knowledge.previous_dbs.tags_db import TagDatabase
 from tribler.core.utilities.path_util import Path
 from tribler.core.utilities.simpledefs import STATEDIR_DB_DIR
 from tribler.core.utilities.unicode import hexlify

diff --git a/src/tribler/core/upgrade/tags_to_knowledge/previous_dbs/__init__.py b/src/tribler/core/upgrade/tags_to_knowledge/previous_dbs/__init__.py
diff --git a/src/tribler/core/upgrade/tags_to_knowledge/previous_dbs/knowledge_db.py b/src/tribler/core/upgrade/tags_to_knowledge/previous_dbs/knowledge_db.py
diff --git a/...core/upgrade/tags_to_knowledge/tags_db.py → ...tags_to_knowledge/previous_dbs/tags_db.py b/...core/upgrade/tags_to_knowledge/tags_db.py → ...tags_to_knowledge/previous_dbs/tags_db.py
diff --git a/src/tribler/core/upgrade/tags_to_knowledge/tests/test_migration.py b/src/tribler/core/upgrade/tags_to_knowledge/tests/test_migration.py
@@ -7,9 +7,9 @@
 from pony.orm import db_session
 
 from tribler.core.components.knowledge.community.knowledge_payload import StatementOperation
-from tribler.core.components.database.db.knowledge_db import KnowledgeDatabase
+from tribler.core.upgrade.tags_to_knowledge.previous_dbs.knowledge_db import KnowledgeDatabase
 from tribler.core.upgrade.tags_to_knowledge.migration import MigrationTagsToKnowledge
-from tribler.core.upgrade.tags_to_knowledge.tags_db import TagDatabase
+from tribler.core.upgrade.tags_to_knowledge.previous_dbs.tags_db import TagDatabase
 from tribler.core.utilities.simpledefs import STATEDIR_DB_DIR
 
 

diff --git a/src/tribler/core/upgrade/tests/test_upgrader.py b/src/tribler/core/upgrade/tests/test_upgrader.py
@@ -14,7 +14,7 @@
 from tribler.core.components.metadata_store.db.store import CURRENT_DB_VERSION, MetadataStore
 from tribler.core.tests.tools.common import TESTS_DATA_DIR
 from tribler.core.upgrade.db8_to_db10 import calc_progress
-from tribler.core.upgrade.tags_to_knowledge.tags_db import TagDatabase
+from tribler.core.upgrade.tags_to_knowledge.previous_dbs.tags_db import TagDatabase
 from tribler.core.upgrade.upgrade import TriblerUpgrader, cleanup_noncompliant_channel_torrents
 from tribler.core.utilities.configparser import CallbackConfigParser
 from tribler.core.utilities.utilities import random_infohash

diff --git a/src/tribler/core/upgrade/upgrade.py b/src/tribler/core/upgrade/upgrade.py
@@ -20,7 +20,7 @@
 from tribler.core.upgrade.config_converter import convert_config_to_tribler76
 from tribler.core.upgrade.db8_to_db10 import PonyToPonyMigration, get_db_version
 from tribler.core.upgrade.tags_to_knowledge.migration import MigrationTagsToKnowledge
-from tribler.core.upgrade.tags_to_knowledge.tags_db import TagDatabase
+from tribler.core.upgrade.tags_to_knowledge.previous_dbs.tags_db import TagDatabase
 from tribler.core.utilities.configparser import CallbackConfigParser
 from tribler.core.utilities.path_util import Path
 from tribler.core.utilities.simpledefs import STATEDIR_CHANNELS_DIR, STATEDIR_DB_DIR