diff --git a/dart/.gitignore b/dart/.gitignore index 3a85790..aa6c365 100644 --- a/dart/.gitignore +++ b/dart/.gitignore @@ -1,3 +1,7 @@ # https://dart.dev/guides/libraries/private-files # Created by `dart pub` .dart_tool/ +.idea +build +generated* +pubspec.lock \ No newline at end of file diff --git a/dart/bin/dbikc.dart b/dart/bin/dbikc.dart index 23fce64..755120c 100644 --- a/dart/bin/dbikc.dart +++ b/dart/bin/dbikc.dart @@ -1,5 +1,6 @@ import 'dart:io'; +import 'package:dart/constants.dart'; import 'package:libac_dart/argparse/Args.dart'; import 'package:libac_dart/argparse/Builder.dart'; import 'package:libac_dart/argparse/CLIHelper.dart'; @@ -15,7 +16,8 @@ Future main(List args) async { .build(); var helpText = CLIHelper.makeArgCLIHelp(defaults); - var HEADER = "Double Breasted Interrupted Key Cipher\nVersion: 1.0\n\n"; + var HEADER = + "Double Breasted Interrupted Key Cipher\nVersion: ${HelperConsts.DBIKC_VERSION}\n\n"; Arguments parsed = await CLIHelper.parseArgs(args, Arguments()); if (parsed.hasArg("help") || !parsed.hasArg("value")) { diff --git a/dart/bin/mkfsreport.dart b/dart/bin/mkfsreport.dart index 3d6ce49..56de8bb 100644 --- a/dart/bin/mkfsreport.dart +++ b/dart/bin/mkfsreport.dart @@ -6,19 +6,19 @@ import 'dart:io'; +import 'package:dart/constants.dart'; import 'package:libac_dart/argparse/Args.dart'; import 'package:libac_dart/argparse/Builder.dart'; import 'package:libac_dart/argparse/CLIHelper.dart'; import 'package:libac_dart/argparse/types/Bool.dart'; import 'package:libac_dart/argparse/types/String.dart'; -import 'package:libac_dart/consts.dart'; import 'package:libac_dart/utils/IOTools.dart'; +String get MKFSREPORT_VER => HelperConsts.MKFSREPORT_VERSION; Future main(List args) async { - String VERSION = "1.0.082424.0758"; bool verbose = false; String HEADER = - "Make File System Report\nVersion: $VERSION\nUsing LibAC Version: ${Constants.VERSION}\nAuthor: Tara Piccari\n\n"; + "Make File System Report\nVersion: ${HelperConsts.MKFSREPORT_VERSION}\nUsing LibAC Version: ${HelperConsts.LIBAC_VERSION}\nAuthor: Tara Piccari\n\n"; Arguments defaults = ArgumentsBuilder.builder() .withArgument(BoolArgument( @@ -68,11 +68,11 @@ Future main(List args) async { String report = ""; if (!parsed.hasArg("nohtml")) - report = - await generateHTMLReport(FIC, ascending: ascending, VERSION: VERSION); + report = await generateHTMLReport(FIC, + ascending: ascending, VERSION: MKFSREPORT_VER); else - report = - await generateTextReport(FIC, ascending: ascending, VERSION: VERSION); + report = await generateTextReport(FIC, + ascending: ascending, VERSION: MKFSREPORT_VER); if (verbose) { StringArgument outputPath = parsed.getArg("out") as StringArgument; @@ -99,7 +99,7 @@ Future generateHTMLReport(FileInformationCache FIC,

File System Report


Generated by mkfsreport v${VERSION}
- Bundled LibAC Version: ${Constants.VERSION}
+ Bundled LibAC Version: ${HelperConsts.LIBAC_VERSION}
     MKFSREPORT and LibAC are provided free of charge with no implied warranties. The software is provided as-is.
     
@@ -146,7 +146,7 @@ Future generateTextReport(FileInformationCache FIC,
   MKFSReport
   {File System Report}
   Generated by mkfsreport v${VERSION}
-  Bundled LibAC Version: ${Constants.VERSION} [https://git.zontreck.com/AriasCreations/LibAC-dart]
+  Bundled LibAC Version: ${HelperConsts.LIBAC_VERSION} [https://git.zontreck.com/AriasCreations/LibAC-dart]
     
     MKFSREPORT and LibAC are provided free of charge with no implied warranties. The software is provided as-is.
     
diff --git a/dart/bin/nbt2snbt.dart b/dart/bin/nbt2snbt.dart
index aaf536b..8904279 100644
--- a/dart/bin/nbt2snbt.dart
+++ b/dart/bin/nbt2snbt.dart
@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:dart/constants.dart';
 import 'package:libac_dart/argparse/Args.dart';
 import 'package:libac_dart/argparse/Builder.dart';
 import 'package:libac_dart/argparse/CLIHelper.dart';
@@ -8,10 +9,9 @@ import 'package:libac_dart/argparse/types/String.dart';
 import 'package:libac_dart/nbt/NbtIo.dart';
 import 'package:libac_dart/nbt/SnbtIo.dart';
 import 'package:libac_dart/nbt/impl/CompoundTag.dart';
-import 'package:nbteditor/Consts2.dart';
 
 const HEADER =
-    "nbt2snbt\nCopyright Piccari Creations 2024 - Tara Piccari\nVersion: $VERSION\nPurpose: Converts Named Binary Tag files to a more readable Stringified version\n\n";
+    "nbt2snbt\nCopyright Piccari Creations 2024 - Tara Piccari\nVersion: ${HelperConsts.NBT_VERSION}\nPurpose: Converts Named Binary Tag files to a more readable Stringified version\n\n";
 void main(List args) async {
   Arguments usage = ArgumentsBuilder.builder()
       .withArgument(
diff --git a/dart/bin/snbt2nbt.dart b/dart/bin/snbt2nbt.dart
index a43b7ef..0308072 100644
--- a/dart/bin/snbt2nbt.dart
+++ b/dart/bin/snbt2nbt.dart
@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:dart/constants.dart';
 import 'package:libac_dart/argparse/Args.dart';
 import 'package:libac_dart/argparse/Builder.dart';
 import 'package:libac_dart/argparse/CLIHelper.dart';
@@ -8,10 +9,9 @@ import 'package:libac_dart/argparse/types/String.dart';
 import 'package:libac_dart/nbt/NbtIo.dart';
 import 'package:libac_dart/nbt/SnbtIo.dart';
 import 'package:libac_dart/nbt/impl/CompoundTag.dart';
-import 'package:nbteditor/Consts2.dart';
 
 const HEADER =
-    "snbt2nbt\nCopyright Piccari Creations 2024 - Tara Piccari\nVersion: $VERSION\nPurpose: Converts the more readable stringified NBT to Named Binary Tag format\n\n";
+    "snbt2nbt\nCopyright Piccari Creations 2024 - Tara Piccari\nVersion: ${HelperConsts.NBT_VERSION}\nPurpose: Converts the more readable stringified NBT to Named Binary Tag format\n\n";
 void main(List args) async {
   Arguments usage = ArgumentsBuilder.builder()
       .withArgument(
diff --git a/dart/lib/constants.dart b/dart/lib/constants.dart
new file mode 100644
index 0000000..57f22aa
--- /dev/null
+++ b/dart/lib/constants.dart
@@ -0,0 +1,8 @@
+import 'package:libac_dart/consts.dart';
+
+class HelperConsts {
+  static const NBT_VERSION = "1.0.083024+1123";
+  static const MKFSREPORT_VERSION = "1.0.082424.0758";
+  static const DBIKC_VERSION = "1.0.083024+2032";
+  static String get LIBAC_VERSION => Constants.VERSION;
+}