Compare commits

..

5 Commits

Author SHA1 Message Date
9841c3f29c refactor
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
2025-03-24 11:59:06 -05:00
b72baf2c65 fix 2025-03-24 11:53:03 -05:00
6244a587db fix 2025-03-24 11:50:52 -05:00
cd41e026ee return available drive letters on windows 2025-03-24 11:35:36 -05:00
10829fc9d9 return available drive letters on windows 2025-03-24 11:23:36 -05:00
4 changed files with 118 additions and 29 deletions

View File

@ -74,6 +74,8 @@ private:
[[nodiscard]] auto data_directory_exists(provider_type prov,
std::string_view name) const -> bool;
void handle_get_available_locations(httplib::Response &res) const;
void handle_get_mount(const httplib::Request &req,
httplib::Response &res) const;

View File

@ -168,6 +168,10 @@ handlers::handlers(mgmt_app_config *config, httplib::Server *server)
: http_error_codes::internal_error;
});
server->Get("/api/v1/locations", [this](auto && /* req */, auto &&res) {
handle_get_available_locations(res);
});
server->Get("/api/v1/mount",
[this](auto &&req, auto &&res) { handle_get_mount(req, res); });
@ -294,6 +298,35 @@ auto handlers::data_directory_exists(provider_type prov,
return ret;
}
void handlers::handle_get_available_locations(httplib::Response &res) const {
#if defined(_WIN32)
constexpr const std::array<std::string_view, 26U> letters{
"A:", "B:", "C:", "D:", "E:", "F:", "G:", "H:", "I:",
"J:", "K:", "L:", "M:", "N:", "O:", "P:", "Q:", "R:",
"S:", "T:", "U:", "V:", "W:", "X:", "Y:", "Z:",
};
auto available = std::accumulate(
letters.begin(), letters.end(), std::vector<std::string_view>(),
[](auto &&vec, auto &&letter) -> std::vector<std::string_view> {
if (utils::file::directory{utils::path::combine(letter, {"\\"})}
.exists()) {
return vec;
}
vec.emplace_back(letter);
return vec;
});
res.set_content(nlohmann::json(available).dump(), "application/json");
#else // !defined(_WIN32)
res.set_content(nlohmann::json(std::vector<std::string_view>()).dump(),
"application/json");
#endif // defined(_WIN32)
res.status = http_error_codes::ok;
}
void handlers::handle_get_mount(const httplib::Request &req,
httplib::Response &res) const {
REPERTORY_USES_FUNCTION_NAME();

View File

@ -101,6 +101,32 @@ class Mount with ChangeNotifier {
}
}
Future<List<String>> getAvailableLocations() async {
try {
final auth = await _auth.createAuth();
final response = await http.get(
Uri.parse(
Uri.encodeFull('${getBaseUri()}/api/v1/locations?auth=$auth'),
),
);
if (response.statusCode == 401) {
_auth.logoff();
return <String>[];
}
if (response.statusCode != 200) {
return <String>[];
}
return (jsonDecode(response.body) as List).cast<String>();
} catch (e) {
debugPrint('$e');
}
return <String>[];
}
Future<String?> getMountLocation() async {
try {
final auth = await _auth.createAuth();

View File

@ -149,39 +149,67 @@ class _MountWidgetState extends State<MountWidget> {
return location;
}
final available = await mount.getAvailableLocations();
String? currentLocation;
return await showDialog(
context: context,
builder: (context) {
return AlertDialog(
actions: [
TextButton(
child: const Text('Cancel'),
onPressed: () => Navigator.of(context).pop(null),
),
TextButton(
child: const Text('OK'),
onPressed: () {
final result = getSettingValidators('Path').firstWhereOrNull(
(validator) => !validator(currentLocation ?? ''),
);
if (result != null) {
return displayErrorMessage(
context,
"Mount location is not valid",
);
}
Navigator.of(context).pop(currentLocation);
},
),
],
content: TextField(
autofocus: true,
controller: TextEditingController(text: currentLocation),
inputFormatters: [FilteringTextInputFormatter.deny(RegExp(r'\s'))],
onChanged: (value) => currentLocation = value,
),
title: const Text('Set Mount Location'),
return StatefulBuilder(
builder: (context, setState) {
return AlertDialog(
actions: [
TextButton(
child: const Text('Cancel'),
onPressed: () => Navigator.of(context).pop(null),
),
TextButton(
child: const Text('OK'),
onPressed: () {
final result = getSettingValidators(
'Path',
).firstWhereOrNull(
(validator) => !validator(currentLocation ?? ''),
);
if (result != null) {
return displayErrorMessage(
context,
"Mount location is not valid",
);
}
Navigator.of(context).pop(currentLocation);
},
),
],
content:
available.isEmpty
? TextField(
autofocus: true,
controller: TextEditingController(
text: currentLocation,
),
inputFormatters: [
FilteringTextInputFormatter.deny(RegExp(r'\s')),
],
onChanged:
(value) => setState(() => currentLocation = value),
)
: DropdownButton<String>(
hint: const Text("Select drive"),
value: currentLocation,
onChanged:
(value) => setState(() => currentLocation = value),
items:
available.map<DropdownMenuItem<String>>((item) {
return DropdownMenuItem<String>(
value: item,
child: Text(item),
);
}).toList(),
),
title: const Text('Set Mount Location'),
);
},
);
},
);