add some of the upload functions

Author: lukehmcc

lib/functions/filesystem.dart

@@ -1,7 +1,34 @@
 import 'dart:io';
 
+class ProcessedDirectory {
+  Map<String, Stream<List<int>>> fileStreams = {};
+  Map<String, int> lengths = {};
+
+  ProcessedDirectory();
+}
+
 Future<void> ensureDirExistence(Directory directory) async {
   if (!await directory.exists()) {
     await directory.create(recursive: true);
   }
 }
+
+ProcessedDirectory processDirectory(Directory dir, String topDir) {
+  ProcessedDirectory procDir = ProcessedDirectory();
+  for (final entity in dir.listSync()) {
+    if (entity is Directory) {
+      processDirectory(entity, topDir);
+    } else if (entity is File) {
+      final file = entity;
+      String path = file.path;
+      path = path.substring(topDir.length).replaceAll('\\', '/');
+
+      if (path.startsWith('/')) path = path.substring(1);
+
+      procDir.lengths[path] = file.lengthSync();
+      procDir.fileStreams[path] = file.openRead();
+    }
+  }
+
+  return procDir;
+}

lib/functions/s5.dart

@@ -1,16 +1,21 @@
 import 'package:dcli/dcli.dart';
 import 'package:hive/hive.dart';
+import 'package:http_parser/http_parser.dart';
 import 'package:path/path.dart';
 import 'package:s5_deploy/definitons/logging.dart';
 import 'package:s5/s5.dart';
+import 'dart:convert';
+import 'dart:io';
+import 'package:http/http.dart' as http;
+import 'package:s5_deploy/functions/filesystem.dart';
 
-void initS5(String nodeURL, String dbPath, String logPath) async {
+Future<S5> initS5(String nodeURL, String dbPath, String logPath) async {
   final nowInMilliseconds = DateTime.now().millisecondsSinceEpoch;
   final lastEightDigits = nowInMilliseconds
       .toString()
       .substring(nowInMilliseconds.toString().length - 8);
   Hive.init(dbPath);
-  final s5 = await S5.create(
+  final S5 s5 = await S5.create(
       logger: FileLogger(file: join(logPath, 'log-$lastEightDigits.txt')));
   if (!s5.hasIdentity) {
     final seed = s5.generateSeedPhrase();
@@ -28,4 +33,64 @@ void initS5(String nodeURL, String dbPath, String logPath) async {
       nodeURL,
     );
   }
+  return s5;
 }
+
+// Future<CID> uploadDirectory(
+//   Map<String, Stream<List<int>>> fileStreams,
+//   Map<String, int> lengths,
+//   String name, {
+//   List<String>? tryFiles,
+//   Map<String, String>? errorPages,
+//   required Function lookupMimeType,
+// }) async {
+//   final params = {
+//     'name': name,
+//   };
+
+//   if (tryFiles != null) {
+//     params['tryfiles'] = json.encode(tryFiles);
+//   }
+//   if (errorPages != null) {
+//     params['errorpages'] = json.encode(errorPages);
+//   }
+
+//   final uc = storageServiceConfigs.first;
+
+//   var uri = uc.getAPIUrl('/s5/upload/directory').replace(
+//         queryParameters: params,
+//       );
+
+//   var request = http.MultipartRequest("POST", uri);
+
+//   request.headers.addAll(uc.headers);
+
+//   for (final filename in fileStreams.keys) {
+//     var stream = http.ByteStream(fileStreams[filename]!);
+
+//     final mimeType = lookupMimeType(filename);
+
+//     var multipartFile = http.MultipartFile(
+//       filename,
+//       stream,
+//       lengths[filename]!,
+//       filename: filename,
+//       contentType: mimeType == null ? null : MediaType.parse(mimeType),
+//     );
+
+//     request.files.add(multipartFile);
+//   }
+
+//   final response = await HttpClient.send(request);
+
+//   if (response.statusCode != 200) {
+//     throw Exception('HTTP ${response.statusCode}');
+//   }
+
+//   final res = await response.stream.transform(utf8.decoder).join();
+
+//   final resData = json.decode(res);
+
+//   if (resData['cid'] == null) throw Exception('Directory upload failed');
+//   return CID.decode(resData['cid']);
+// }

lib/s5_deploy.dart

@@ -3,7 +3,9 @@ import 'dart:io';
 import 'package:args/args.dart';
 import 'package:cli_spin/cli_spin.dart';
 import 'package:dcli/dcli.dart';
+import 'package:lib5/node.dart';
 import 'package:path/path.dart';
+import 'package:s5/s5.dart';
 import 'package:s5_deploy/definitons/constants.dart';
 import 'package:s5_deploy/functions/cli.dart';
 import 'package:s5_deploy/functions/filesystem.dart';
@@ -35,7 +37,7 @@ void s5Deploy(List<String> args) async {
   var versionCheck = results['version'] as bool;
   if (versionCheck) {
     print("Version: $s5Version");
-    exit(1);
+    exit(0);
   }
 
   // -h || --help || malformed path
@@ -45,14 +47,14 @@ void s5Deploy(List<String> args) async {
       print(red('You must pass the name of the file/directory to upload.'));
     }
     printUsage(topParser);
-    exit(1);
+    exit(2);
   }
 
   // begin spinner
   CliSpin spinner = spinStart("Setting things up...");
 
   // --reset
-  var resetCheck = results['reset'] as bool;
+  bool resetCheck = results['reset'] as bool;
   if (resetCheck) {
     await Directory(dbPath).delete(recursive: true);
   }
@@ -62,8 +64,32 @@ void s5Deploy(List<String> args) async {
   // init s5
   spinner = spinStart("Initializing S5...");
   String nodeURL = results['node'] as String;
-  initS5(nodeURL, dbPath, logPath);
+  final S5 s5 = await initS5(nodeURL, dbPath, logPath);
+  spinner.success();
+
+  // scan directory
+  spinner = spinStart("Scanning ${results.arguments.first}");
+  if (!(Directory(results.arguments.first).existsSync())) {
+    spinner.fail();
+    print(red("Directory doesn't exist, scan failed."));
+    exit(1);
+  }
+  ProcessedDirectory procDir = processDirectory(
+      Directory(results.arguments.first), results.arguments.first);
+
+  if (procDir == ProcessedDirectory()) {
+    spinner.fail();
+    print(red("Directory empty, scan failed."));
+  } else {
+    spinner.success();
+  }
+
+  // now upload to S5 & set registry
+  spinner = spinStart("Uploading to S5...");
+  print(s5.hasIdentity);
+  print((s5.api as S5NodeAPIWithIdentity).accountConfigs);
   spinner.success();
 
-  exit(1);
+  // And it's over folks
+  exit(0);
 }

pubspec.lock

@@ -319,7 +319,7 @@ packages:
     source: hosted
     version: "3.2.1"
   http_parser:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: http_parser
       sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"

pubspec.yaml

@@ -14,6 +14,7 @@ dependencies:
   dcli: ^4.0.1-beta.4
   hive: ^2.2.3
   http: ^1.2.1
+  http_parser: ^4.0.2
   lib5: ^0.2.0
   lib5_crypto_implementation_dart: ^0.2.0
   path: ^1.9.0