From 1545ccbf9473684d220b5a05dff24f5c99eb9291 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Tue, 15 Apr 2025 14:18:35 +0200 Subject: [PATCH] Restructure project into `bin` and `lib` --- bin/common.dart | 1 - bin/jadb.dart | 7 +++---- {bin => lib}/jmdict/objects.dart | 4 ++-- {bin => lib}/jmdict/parser.dart | 2 +- {bin => lib}/kanjidic/objects.dart | 2 +- {bin => lib}/kanjidic/parser.dart | 0 {bin => lib}/objects.dart | 0 {bin => lib}/radkfile/objects.dart | 0 {bin => lib}/radkfile/parser.dart | 0 {bin => lib}/romaji_transliteration.dart | 0 10 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 bin/common.dart rename {bin => lib}/jmdict/objects.dart (99%) rename {bin => lib}/jmdict/parser.dart (99%) rename {bin => lib}/kanjidic/objects.dart (99%) rename {bin => lib}/kanjidic/parser.dart (100%) rename {bin => lib}/objects.dart (100%) rename {bin => lib}/radkfile/objects.dart (100%) rename {bin => lib}/radkfile/parser.dart (100%) rename {bin => lib}/romaji_transliteration.dart (100%) diff --git a/bin/common.dart b/bin/common.dart deleted file mode 100644 index 8b13789..0000000 --- a/bin/common.dart +++ /dev/null @@ -1 +0,0 @@ - diff --git a/bin/jadb.dart b/bin/jadb.dart index daf014c..3e7be33 100644 --- a/bin/jadb.dart +++ b/bin/jadb.dart @@ -2,13 +2,12 @@ import 'dart:ffi'; import 'dart:io'; import 'package:args/args.dart'; +import 'package:jadb/jmdict/parser.dart'; +import 'package:jadb/kanjidic/parser.dart'; +import 'package:jadb/radkfile/parser.dart'; import 'package:sqflite_common_ffi/sqflite_ffi.dart'; import 'package:sqlite3/open.dart'; -import 'jmdict/parser.dart'; -import 'kanjidic/parser.dart'; -import 'radkfile/parser.dart'; - ArgParser argParser() { final parser = ArgParser(); parser.addOption( diff --git a/bin/jmdict/objects.dart b/lib/jmdict/objects.dart similarity index 99% rename from bin/jmdict/objects.dart rename to lib/jmdict/objects.dart index 2601a14..2271d59 100644 --- a/bin/jmdict/objects.dart +++ b/lib/jmdict/objects.dart @@ -1,5 +1,5 @@ -import '../common.dart'; -import '../objects.dart'; +import 'package:jadb/objects.dart'; + class TableNames { static const String entry = 'JMdict_Entry'; diff --git a/bin/jmdict/parser.dart b/lib/jmdict/parser.dart similarity index 99% rename from bin/jmdict/parser.dart rename to lib/jmdict/parser.dart index 374b875..73e42d2 100644 --- a/bin/jmdict/parser.dart +++ b/lib/jmdict/parser.dart @@ -1,10 +1,10 @@ import 'dart:collection'; import 'dart:io'; +import 'package:jadb/romaji_transliteration.dart'; import 'package:sqflite_common/sqlite_api.dart'; import 'package:xml/xml.dart'; -import '../romaji_transliteration.dart'; import 'objects.dart'; List getPriNums(XmlElement e, String prefix) { diff --git a/bin/kanjidic/objects.dart b/lib/kanjidic/objects.dart similarity index 99% rename from bin/kanjidic/objects.dart rename to lib/kanjidic/objects.dart index 34b1ac2..e700b46 100644 --- a/bin/kanjidic/objects.dart +++ b/lib/kanjidic/objects.dart @@ -1,4 +1,4 @@ -import '../objects.dart'; +import 'package:jadb/objects.dart'; class TableNames { static const String character = 'KANJIDIC_Character'; diff --git a/bin/kanjidic/parser.dart b/lib/kanjidic/parser.dart similarity index 100% rename from bin/kanjidic/parser.dart rename to lib/kanjidic/parser.dart diff --git a/bin/objects.dart b/lib/objects.dart similarity index 100% rename from bin/objects.dart rename to lib/objects.dart diff --git a/bin/radkfile/objects.dart b/lib/radkfile/objects.dart similarity index 100% rename from bin/radkfile/objects.dart rename to lib/radkfile/objects.dart diff --git a/bin/radkfile/parser.dart b/lib/radkfile/parser.dart similarity index 100% rename from bin/radkfile/parser.dart rename to lib/radkfile/parser.dart diff --git a/bin/romaji_transliteration.dart b/lib/romaji_transliteration.dart similarity index 100% rename from bin/romaji_transliteration.dart rename to lib/romaji_transliteration.dart