From bd0fee1b2de564d6f8d9f979fb836ddd56de67a9 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sat, 31 May 2025 16:21:59 +0200 Subject: [PATCH] lib: move table_names to separate dir --- lib/_data_ingestion/jmdict/seed_data.dart | 2 +- lib/_data_ingestion/kanjidic/seed_data.dart | 2 +- lib/_data_ingestion/radkfile/seed_data.dart | 2 +- lib/_data_ingestion/tanos-jlpt/resolve.dart | 2 +- lib/_data_ingestion/tanos-jlpt/seed_data.dart | 2 +- lib/models/verifyTables.dart | 8 ++++---- lib/search/filter_kanji.dart | 2 +- lib/search/kanji_search.dart | 4 ++-- lib/search/radical_search.dart | 2 +- lib/search/word_search/data_query.dart | 4 ++-- lib/search/word_search/entry_id_query.dart | 2 +- .../jmdict/table_names.dart => table_names/jmdict.dart} | 0 .../table_names.dart => table_names/kanjidic.dart} | 0 .../table_names.dart => table_names/radkfile.dart} | 0 .../table_names.dart => table_names/tanos_jlpt.dart} | 0 15 files changed, 16 insertions(+), 16 deletions(-) rename lib/{_data_ingestion/jmdict/table_names.dart => table_names/jmdict.dart} (100%) rename lib/{_data_ingestion/kanjidic/table_names.dart => table_names/kanjidic.dart} (100%) rename lib/{_data_ingestion/radkfile/table_names.dart => table_names/radkfile.dart} (100%) rename lib/{_data_ingestion/tanos-jlpt/table_names.dart => table_names/tanos_jlpt.dart} (100%) diff --git a/lib/_data_ingestion/jmdict/seed_data.dart b/lib/_data_ingestion/jmdict/seed_data.dart index 9b846e1..25db0fb 100644 --- a/lib/_data_ingestion/jmdict/seed_data.dart +++ b/lib/_data_ingestion/jmdict/seed_data.dart @@ -2,7 +2,7 @@ import 'dart:collection'; import 'package:collection/collection.dart'; import 'package:jadb/_data_ingestion/jmdict/objects.dart'; -import 'package:jadb/_data_ingestion/jmdict/table_names.dart'; +import 'package:jadb/table_names/jmdict.dart'; import 'package:sqflite_common/sqlite_api.dart'; class ResolvedXref { diff --git a/lib/_data_ingestion/kanjidic/seed_data.dart b/lib/_data_ingestion/kanjidic/seed_data.dart index 9aedf60..21516ce 100644 --- a/lib/_data_ingestion/kanjidic/seed_data.dart +++ b/lib/_data_ingestion/kanjidic/seed_data.dart @@ -1,4 +1,4 @@ -import 'package:jadb/_data_ingestion/kanjidic/table_names.dart'; +import 'package:jadb/table_names/kanjidic.dart'; import 'package:sqflite_common/sqlite_api.dart'; import 'objects.dart'; diff --git a/lib/_data_ingestion/radkfile/seed_data.dart b/lib/_data_ingestion/radkfile/seed_data.dart index b0b81a4..bfe5908 100644 --- a/lib/_data_ingestion/radkfile/seed_data.dart +++ b/lib/_data_ingestion/radkfile/seed_data.dart @@ -1,4 +1,4 @@ -import 'package:jadb/_data_ingestion/radkfile/table_names.dart'; +import 'package:jadb/table_names/radkfile.dart'; import 'package:sqflite_common/sqlite_api.dart'; Future seedRADKFILEData( diff --git a/lib/_data_ingestion/tanos-jlpt/resolve.dart b/lib/_data_ingestion/tanos-jlpt/resolve.dart index 6e45f07..e60437b 100644 --- a/lib/_data_ingestion/tanos-jlpt/resolve.dart +++ b/lib/_data_ingestion/tanos-jlpt/resolve.dart @@ -1,4 +1,4 @@ -import 'package:jadb/_data_ingestion/jmdict/table_names.dart'; +import 'package:jadb/table_names/jmdict.dart'; import 'package:jadb/_data_ingestion/tanos-jlpt/objects.dart'; import 'package:jadb/_data_ingestion/tanos-jlpt/overrides.dart'; import 'package:sqflite_common/sqlite_api.dart'; diff --git a/lib/_data_ingestion/tanos-jlpt/seed_data.dart b/lib/_data_ingestion/tanos-jlpt/seed_data.dart index 8373fde..9083c04 100644 --- a/lib/_data_ingestion/tanos-jlpt/seed_data.dart +++ b/lib/_data_ingestion/tanos-jlpt/seed_data.dart @@ -1,4 +1,4 @@ -import 'package:jadb/_data_ingestion/tanos-jlpt/table_names.dart'; +import 'package:jadb/table_names/tanos_jlpt.dart'; import 'package:sqflite_common/sqlite_api.dart'; Future seedTanosJLPTData( diff --git a/lib/models/verifyTables.dart b/lib/models/verifyTables.dart index 57fc307..ad5fdbf 100644 --- a/lib/models/verifyTables.dart +++ b/lib/models/verifyTables.dart @@ -1,7 +1,7 @@ -import 'package:jadb/_data_ingestion/jmdict/table_names.dart'; -import 'package:jadb/_data_ingestion/kanjidic/table_names.dart'; -import 'package:jadb/_data_ingestion/radkfile/table_names.dart'; -import 'package:jadb/_data_ingestion/tanos-jlpt/table_names.dart'; +import 'package:jadb/table_names/jmdict.dart'; +import 'package:jadb/table_names/kanjidic.dart'; +import 'package:jadb/table_names/radkfile.dart'; +import 'package:jadb/table_names/tanos_jlpt.dart'; import 'package:sqflite_common/sqlite_api.dart'; Future verifyTablesWithDbConnection(DatabaseExecutor db) async { diff --git a/lib/search/filter_kanji.dart b/lib/search/filter_kanji.dart index e06e6c9..6b4e8f3 100644 --- a/lib/search/filter_kanji.dart +++ b/lib/search/filter_kanji.dart @@ -1,4 +1,4 @@ -import 'package:jadb/_data_ingestion/kanjidic/table_names.dart'; +import 'package:jadb/table_names/kanjidic.dart'; import 'package:sqflite_common/sqflite.dart'; Future> filterKanjiWithDbConnection( diff --git a/lib/search/kanji_search.dart b/lib/search/kanji_search.dart index 9596530..5dc1dfb 100644 --- a/lib/search/kanji_search.dart +++ b/lib/search/kanji_search.dart @@ -1,6 +1,6 @@ import 'package:collection/collection.dart'; -import 'package:jadb/_data_ingestion/kanjidic/table_names.dart'; -import 'package:jadb/_data_ingestion/radkfile/table_names.dart'; +import 'package:jadb/table_names/kanjidic.dart'; +import 'package:jadb/table_names/radkfile.dart'; import 'package:jadb/models/kanji_search/kanji_search_radical.dart'; import 'package:jadb/models/kanji_search/kanji_search_result.dart'; import 'package:sqflite_common/sqflite.dart'; diff --git a/lib/search/radical_search.dart b/lib/search/radical_search.dart index 22f87a7..ca94b7a 100644 --- a/lib/search/radical_search.dart +++ b/lib/search/radical_search.dart @@ -1,4 +1,4 @@ -import 'package:jadb/_data_ingestion/radkfile/table_names.dart'; +import 'package:jadb/table_names/radkfile.dart'; import 'package:sqflite_common/sqlite_api.dart'; // TODO: validate that the list of radicals all are valid radicals diff --git a/lib/search/word_search/data_query.dart b/lib/search/word_search/data_query.dart index 1bb876a..8990855 100644 --- a/lib/search/word_search/data_query.dart +++ b/lib/search/word_search/data_query.dart @@ -1,5 +1,5 @@ -import 'package:jadb/_data_ingestion/jmdict/table_names.dart'; -import 'package:jadb/_data_ingestion/tanos-jlpt/table_names.dart'; +import 'package:jadb/table_names/jmdict.dart'; +import 'package:jadb/table_names/tanos_jlpt.dart'; import 'package:jadb/util/sqlite_utils.dart'; import 'package:sqflite_common/sqflite.dart'; diff --git a/lib/search/word_search/entry_id_query.dart b/lib/search/word_search/entry_id_query.dart index 65693c3..5f6c29b 100644 --- a/lib/search/word_search/entry_id_query.dart +++ b/lib/search/word_search/entry_id_query.dart @@ -1,4 +1,4 @@ -import 'package:jadb/_data_ingestion/jmdict/table_names.dart'; +import 'package:jadb/table_names/jmdict.dart'; import 'package:jadb/search/word_search/word_search.dart'; import 'package:jadb/util/text_filtering.dart'; import 'package:sqflite_common/sqlite_api.dart'; diff --git a/lib/_data_ingestion/jmdict/table_names.dart b/lib/table_names/jmdict.dart similarity index 100% rename from lib/_data_ingestion/jmdict/table_names.dart rename to lib/table_names/jmdict.dart diff --git a/lib/_data_ingestion/kanjidic/table_names.dart b/lib/table_names/kanjidic.dart similarity index 100% rename from lib/_data_ingestion/kanjidic/table_names.dart rename to lib/table_names/kanjidic.dart diff --git a/lib/_data_ingestion/radkfile/table_names.dart b/lib/table_names/radkfile.dart similarity index 100% rename from lib/_data_ingestion/radkfile/table_names.dart rename to lib/table_names/radkfile.dart diff --git a/lib/_data_ingestion/tanos-jlpt/table_names.dart b/lib/table_names/tanos_jlpt.dart similarity index 100% rename from lib/_data_ingestion/tanos-jlpt/table_names.dart rename to lib/table_names/tanos_jlpt.dart