diff --git a/.gitignore b/.gitignore index 1ee4b19..a2b4227 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ # Temporary storage for data ingestion files -/data +/data/tmp # Files and directories created by pub. .dart_tool/ diff --git a/lib/_data_ingestion/jmdict/parser.dart b/lib/_data_ingestion/jmdict/parser.dart index f94b749..7eb28b1 100644 --- a/lib/_data_ingestion/jmdict/parser.dart +++ b/lib/_data_ingestion/jmdict/parser.dart @@ -474,7 +474,7 @@ Future insertIntoDB(List entries, Database db) async { Future addDataFromJMdict(Database db) async { print('[JMdict] Reading file content...'); - String rawXML = File('data/JMdict.xml').readAsStringSync(); + String rawXML = File('data/tmp/JMdict.xml').readAsStringSync(); print('[JMdict] Parsing XML tags...'); XmlElement root = XmlDocument.parse(rawXML).getElement('JMdict')!; diff --git a/lib/_data_ingestion/kanjidic/parser.dart b/lib/_data_ingestion/kanjidic/parser.dart index 2fe5b19..dea0910 100644 --- a/lib/_data_ingestion/kanjidic/parser.dart +++ b/lib/_data_ingestion/kanjidic/parser.dart @@ -244,7 +244,7 @@ Future insertIntoDB(List characters, Database db) async { Future addDataFromKANJIDIC(Database db) async { print('[KANJIDIC2] Reading file...'); - String rawXML = File('data/kanjidic2.xml').readAsStringSync(); + String rawXML = File('data/tmp/kanjidic2.xml').readAsStringSync(); print('[KANJIDIC2] Parsing XML...'); XmlElement root = XmlDocument.parse(rawXML).getElement('kanjidic2')!; diff --git a/lib/_data_ingestion/radkfile/parser.dart b/lib/_data_ingestion/radkfile/parser.dart index b1d375e..1c57509 100644 --- a/lib/_data_ingestion/radkfile/parser.dart +++ b/lib/_data_ingestion/radkfile/parser.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:sqflite_common/sqlite_api.dart'; Future addDataFromRADKFILE(Database db) async { - final String content = File('data/radkfile_utf8').readAsStringSync(); + final String content = File('data/tmp/radkfile_utf8').readAsStringSync(); final Iterable blocks = content.replaceAll(RegExp(r'^#.*$'), '').split(r'$').skip(2); diff --git a/nix/database.nix b/nix/database.nix index 2409d32..1bccc4d 100644 --- a/nix/database.nix +++ b/nix/database.nix @@ -20,10 +20,10 @@ stdenvNoCC.mkDerivation { buildPhase = '' runHook preBuild - mkdir -p data - ln -s "${jmdict}"/* data - ln -s "${radkfile}"/* data - ln -s "${kanjidic2}"/* data + mkdir -p data/tmp + ln -s "${jmdict}"/* data/tmp + ln -s "${radkfile}"/* data/tmp + ln -s "${kanjidic2}"/* data/tmp for migration in migrations/*.sql; do sqlite3 jadb.sqlite < "$migration"