4 changed files with 108 additions and 163 deletions
--- a/web/repertory/lib/constants.dart
+++ b/web/repertory/lib/constants.dart
@ -1,9 +1,8 @@
-const addMountTitle = 'New Mount Settings';
-const appTitle = 'Repertory Management Portal';
+const String addMountTitle = 'New Mount Settings';
+const String appTitle = 'Repertory Management Portal';
 const databaseTypeList = ['rocksdb', 'sqlite'];
 const downloadTypeList = ['default', 'direct', 'ring_buffer'];
 const eventLevelList = ['critical', 'error', 'warn', 'info', 'debug', 'trace'];
-const padding = 15.0;
 const protocolTypeList = ['http', 'https'];
 const providerTypeList = ['Encrypt', 'Remote', 'S3', 'Sia'];
 const ringBufferSizeList = ['128', '256', '512', '1024', '2048'];
--- a/web/repertory/lib/helpers.dart
+++ b/web/repertory/lib/helpers.dart
@ -1,60 +1,32 @@
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
-import 'package:repertory/constants.dart' as constants;

 typedef Validator = bool Function(String);

-// ignore: prefer_function_declarations_over_variables
-final Validator noRestrictedChars = (value) {
-  return [
-        '!',
-        '"',
-        '\$',
-        '&',
-        "'",
-        '(',
-        ')',
-        '*',
-        ';',
-        '<',
-        '>',
-        '?',
-        '[',
-        ']',
-        '`',
-        '{',
-        '}',
-        '|',
-      ].firstWhereOrNull((char) => value.contains(char)) ==
-      null;
-};
-
-// ignore: prefer_function_declarations_over_variables
-final Validator notEmptyValidator = (value) => value.isNotEmpty;
-
-// ignore: prefer_function_declarations_over_variables
-final Validator portIsValid = (value) {
-  int? intValue = int.tryParse(value);
-  if (intValue == null) {
-    return false;
-  }
-
-  return (intValue > 0 && intValue < 65536);
-};
-
-// ignore: prefer_function_declarations_over_variables
-final Validator trimNotEmptyValidator = (value) => value.trim().isNotEmpty;
-
-createUriValidator<Validator>({host, port}) {
-  return (value) =>
-      Uri.tryParse('http://${host ?? value}:${port ?? value}/') != null;
+bool containsRestrictedChar(String value) {
+  const invalidChars = [
+    '!',
+    '"',
+    '\$',
+    '&',
+    '\'',
+    '(',
+    ')',
+    '*',
+    ';',
+    '<',
+    '>',
+    '?',
+    '[',
+    ']',
+    '`',
+    '{',
+    '}',
+    '|',
+  ];
+  return invalidChars.firstWhereOrNull((char) => value.contains(char)) != null;
 }

-createHostNameOrIpValidators() => <Validator>[
-  trimNotEmptyValidator,
-  createUriValidator(port: 9000),
-];
-
 Map<String, dynamic> createDefaultSettings(String mountType) {
  switch (mountType) {
    case 'Encrypt':
@ -108,49 +80,49 @@ String getBaseUri() {
 List<Validator> getSettingValidators(String settingPath) {
  switch (settingPath) {
    case 'ApiAuth':
-      return [notEmptyValidator];
-    case 'DatabaseType':
-      return [(value) => constants.databaseTypeList.contains(value)];
-    case 'PreferredDownloadType':
-      return [(value) => constants.downloadTypeList.contains(value)];
-    case 'EventLevel':
-      return [(value) => constants.eventLevelList.contains(value)];
+      return [(value) => value.isNotEmpty];
    case 'EncryptConfig.EncryptionToken':
-      return [notEmptyValidator];
+      return [(value) => value.isNotEmpty];
    case 'EncryptConfig.Path':
-      return [trimNotEmptyValidator, noRestrictedChars];
+      return [
+        (value) => value.trim().isNotEmpty,
+        (value) => !containsRestrictedChar(value),
+      ];
    case 'HostConfig.ApiPassword':
-      return [notEmptyValidator];
+      return [(value) => value.isNotEmpty];
    case 'HostConfig.ApiPort':
-      return [portIsValid];
+      return [
+        (value) {
+          int? intValue = int.tryParse(value);
+          if (intValue == null) {
+            return false;
+          }
+
+          return (intValue > 0 && intValue < 65536);
+        },
+        (value) => Uri.tryParse('http://localhost:$value/') != null,
+      ];
    case 'HostConfig.HostNameOrIp':
-      return createHostNameOrIpValidators();
+      return [
+        (value) => value.trim().isNotEmpty,
+        (value) => Uri.tryParse('http://$value:9000/') != null,
+      ];
    case 'HostConfig.Protocol':
-      return [(value) => constants.protocolTypeList.contains(value)];
-    case 'RemoteConfig.ApiPort':
-      return [notEmptyValidator, portIsValid];
+      return [(value) => value == "http" || value == "https"];
    case 'RemoteConfig.EncryptionToken':
-      return [notEmptyValidator];
-    case 'RemoteConfig.HostNameOrIp':
-      return createHostNameOrIpValidators();
-    case 'RemoteMount.ApiPort':
-      return [notEmptyValidator, portIsValid];
+      return [(value) => value.isNotEmpty];
    case 'RemoteMount.EncryptionToken':
-      return [notEmptyValidator];
-    case 'RemoteMount.HostNameOrIp':
-      return createHostNameOrIpValidators();
-    case 'RingBufferFileSize':
-      return [(value) => constants.ringBufferSizeList.contains(value)];
+      return [(value) => value.isNotEmpty];
    case 'S3Config.AccessKey':
-      return [trimNotEmptyValidator];
+      return [(value) => value.trim().isNotEmpty];
    case 'S3Config.Bucket':
-      return [trimNotEmptyValidator];
+      return [(value) => value.trim().isNotEmpty];
    case 'S3Config.SecretKey':
-      return [trimNotEmptyValidator];
+      return [(value) => value.trim().isNotEmpty];
    case 'S3Config.URL':
-      return [trimNotEmptyValidator, (value) => Uri.tryParse(value) != null];
+      return [(value) => Uri.tryParse(value) != null];
    case 'SiaConfig.Bucket':
-      return [trimNotEmptyValidator];
+      return [(value) => value.trim().isNotEmpty];
  }

  return [];
@ -174,19 +146,18 @@ bool validateSettings(
  String? rootKey,
 }) {
  settings.forEach((key, value) {
-    final settingKey = rootKey == null ? key : '$rootKey.$key';
+    final checkKey = rootKey == null ? key : '$rootKey.$key';
    if (value is Map) {
      validateSettings(
        value as Map<String, dynamic>,
        failed,
-        rootKey: settingKey,
+        rootKey: checkKey,
      );
    } else {
-      for (var validator in getSettingValidators(settingKey)) {
-        if (validator(value.toString())) {
-          continue;
+      for (var validator in getSettingValidators(checkKey)) {
+        if (!validator(value.toString())) {
+          failed.add(checkKey);
        }
-        failed.add(settingKey);
      }
    }
  });
--- a/web/repertory/lib/screens/add_mount_screen.dart
+++ b/web/repertory/lib/screens/add_mount_screen.dart
@ -1,8 +1,7 @@
-import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
-import 'package:repertory/constants.dart' as constants;
+import 'package:repertory/constants.dart';
 import 'package:repertory/helpers.dart';
 import 'package:repertory/models/mount.dart';
 import 'package:repertory/models/mount_list.dart';
@ -18,6 +17,8 @@ class AddMountScreen extends StatefulWidget {
 }

 class _AddMountScreenState extends State<AddMountScreen> {
+  static const _padding = 15.0;
+
  Mount? _mount;
  final _mountNameController = TextEditingController();
  String _mountType = "";
@ -49,7 +50,7 @@ class _AddMountScreenState extends State<AddMountScreen> {
        ],
      ),
      body: Padding(
-        padding: const EdgeInsets.all(constants.padding),
+        padding: const EdgeInsets.all(_padding),
        child: Column(
          crossAxisAlignment: CrossAxisAlignment.start,
          mainAxisAlignment: MainAxisAlignment.start,
@ -57,44 +58,43 @@ class _AddMountScreenState extends State<AddMountScreen> {
          children: [
            Card(
              child: Padding(
-                padding: const EdgeInsets.all(constants.padding),
+                padding: const EdgeInsets.all(_padding),
                child: Row(
                  crossAxisAlignment: CrossAxisAlignment.start,
                  mainAxisAlignment: MainAxisAlignment.start,
                  mainAxisSize: MainAxisSize.min,
                  children: [
                    const Text('Provider Type'),
-                    const SizedBox(width: constants.padding),
+                    const SizedBox(width: _padding),
                    DropdownButton<String>(
                      value: _mountType,
                      onChanged: (mountType) => _handleChange(mountType ?? ''),
                      items:
-                          constants.providerTypeList
-                              .map<DropdownMenuItem<String>>((item) {
-                                return DropdownMenuItem<String>(
-                                  value: item,
-                                  child: Text(item),
-                                );
-                              })
-                              .toList(),
+                          providerTypeList.map<DropdownMenuItem<String>>((
+                            item,
+                          ) {
+                            return DropdownMenuItem<String>(
+                              value: item,
+                              child: Text(item),
+                            );
+                          }).toList(),
                    ),
                  ],
                ),
              ),
            ),
-            if (_mountType.isNotEmpty)
-              const SizedBox(height: constants.padding),
+            if (_mountType.isNotEmpty) const SizedBox(height: _padding),
            if (_mountType.isNotEmpty)
              Card(
                child: Padding(
-                  padding: const EdgeInsets.all(constants.padding),
+                  padding: const EdgeInsets.all(_padding),
                  child: Column(
                    crossAxisAlignment: CrossAxisAlignment.start,
                    mainAxisAlignment: MainAxisAlignment.start,
                    mainAxisSize: MainAxisSize.min,
                    children: [
                      const Text('Configuration Name'),
-                      const SizedBox(width: constants.padding),
+                      const SizedBox(width: _padding),
                      TextField(
                        autofocus: true,
                        controller: _mountNameController,
@ -112,7 +112,7 @@ class _AddMountScreenState extends State<AddMountScreen> {
              Expanded(
                child: Card(
                  child: Padding(
-                    padding: const EdgeInsets.all(constants.padding),
+                    padding: const EdgeInsets.all(_padding),
                    child: MountSettingsWidget(
                      isAdd: true,
                      mount: _mount!,
@ -123,60 +123,33 @@ class _AddMountScreenState extends State<AddMountScreen> {
                ),
              ),
            if (_mount != null)
-              Builder(
-                builder: (context) {
-                  return ElevatedButton.icon(
-                    onPressed: () {
-                      final mountList = Provider.of<MountList>(
-                        context,
-                        listen: false,
-                      );
-
-                      List<String> failed = [];
-                      if (!validateSettings(_settings[_mountType]!, failed)) {
-                        for (var key in failed) {
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            SnackBar(
-                              content: Text(
-                                "'$key' is not valid",
-                                textAlign: TextAlign.center,
-                              ),
-                            ),
-                          );
-                        }
-                        return;
-                      }
-
-                      final existingMount = mountList.items.firstWhereOrNull(
-                        (item) =>
-                            item.name.toLowerCase() ==
-                            _mountNameController.text.toLowerCase(),
-                      );
-
-                      if (existingMount != null) {
-                        ScaffoldMessenger.of(context).showSnackBar(
-                          SnackBar(
-                            content: Text(
-                              "'${_mountNameController.text}' already exists",
-                              textAlign: TextAlign.center,
-                            ),
+              ElevatedButton.icon(
+                onPressed: () {
+                  List<String> failed = [];
+                  if (!validateSettings(_settings[_mountType]!, failed)) {
+                    for (var key in failed) {
+                      ScaffoldMessenger.of(context).showSnackBar(
+                        SnackBar(
+                          content: Text(
+                            "'$key' is not valid",
+                            textAlign: TextAlign.center,
                          ),
-                        );
-                        return;
-                      }
-
-                      mountList.add(
-                        _mountType,
-                        _mountNameController.text,
-                        _settings[_mountType]!,
+                        ),
                      );
+                    }
+                    return;
+                  }

-                      Navigator.pop(context);
-                    },
-                    label: const Text('Add'),
-                    icon: Icon(Icons.add),
+                  Provider.of<MountList>(context, listen: false).add(
+                    _mountType,
+                    _mountNameController.text,
+                    _settings[_mountType]!,
                  );
+
+                  Navigator.pop(context);
                },
+                label: const Text('Add'),
+                icon: Icon(Icons.add),
              ),
          ],
        ),
--- a/web/repertory/lib/widgets/mount_settings.dart
+++ b/web/repertory/lib/widgets/mount_settings.dart
@ -1,7 +1,7 @@
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:repertory/constants.dart' as constants;
+import 'package:repertory/constants.dart';
 import 'package:repertory/helpers.dart' show Validator, getSettingValidators;
 import 'package:repertory/models/mount.dart';
 import 'package:settings_ui/settings_ui.dart';
@ -26,6 +26,8 @@ class MountSettingsWidget extends StatefulWidget {
 }

 class _MountSettingsWidgetState extends State<MountSettingsWidget> {
+  static const _padding = 15.0;
+
  void _addBooleanSetting(list, root, key, value, isAdvanced) {
    if (!isAdvanced || widget.showAdvanced) {
      list.add(
@ -262,7 +264,7 @@ class _MountSettingsWidgetState extends State<MountSettingsWidget> {
                        obscuringCharacter: '*',
                        onChanged: (value) => updatedValue1 = value,
                      ),
-                      const SizedBox(height: constants.padding),
+                      const SizedBox(height: _padding),
                      TextField(
                        autofocus: false,
                        controller: TextEditingController(text: updatedValue2),
@ -407,7 +409,7 @@ class _MountSettingsWidgetState extends State<MountSettingsWidget> {
              widget.settings,
              key,
              value,
-              constants.databaseTypeList,
+              databaseTypeList,
              Icons.dataset,
              true,
            );
@ -454,7 +456,7 @@ class _MountSettingsWidgetState extends State<MountSettingsWidget> {
              widget.settings,
              key,
              value,
-              constants.eventLevelList,
+              eventLevelList,
              Icons.event,
              false,
            );
@ -526,7 +528,7 @@ class _MountSettingsWidgetState extends State<MountSettingsWidget> {
              widget.settings,
              key,
              value,
-              constants.downloadTypeList,
+              downloadTypeList,
              Icons.download,
              false,
            );
@ -551,7 +553,7 @@ class _MountSettingsWidgetState extends State<MountSettingsWidget> {
              widget.settings,
              key,
              value,
-              constants.ringBufferSizeList,
+              ringBufferSizeList,
              512,
              Icons.animation,
              false,
@ -731,7 +733,7 @@ class _MountSettingsWidgetState extends State<MountSettingsWidget> {
              widget.settings[key],
              subKey,
              subValue,
-              constants.protocolTypeList,
+              protocolTypeList,
              Icons.http,
              true,
            );