Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions docs/commands.md
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,8 @@ Available subcommands:
Create a versioned snapshot of your app

Usage: discloud snapshot create [arguments]
-h, --help Print this usage information.
--app (mandatory)
-h, --help Print this usage information.
--app
```

#### snapshot download
Expand All @@ -405,10 +405,10 @@ Usage: discloud snapshot create [arguments]
Download a versioned snapshot of your app

Usage: discloud snapshot download [arguments]
-h, --help Print this usage information.
--app (mandatory)
--version Snapshot version in YYYYMMDD-HHMMSS format
-d, --dir Specifies the destination path for downloading backups. The destination path will be considered a directory.
-h, --help Print this usage information.
--app
--version Snapshot version in YYYYMMDD-HHMMSS format
-d, --dir Specifies the destination path for downloading backups. The destination path will be considered a directory.
```

#### snapshot info
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/app/apt/install.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ final class AppAptInstallCommand extends Command<void> {
@override
Future<void> run() async {
final appId = argResults!.requiredOptionOrRest("app");
final apts = argResults!.requiredMultiOptionOrRest("apt", ["app"]);
final apts = argResults!.requiredMultiOptionOrRest("apt", const ["app"]);

if (apts.isEmpty) usageException("Apt option cannot be empty");

Expand Down
2 changes: 1 addition & 1 deletion lib/commands/app/apt/uninstall.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ final class AppAptUninstallCommand extends Command<void> {
@override
Future<void> run() async {
final appId = argResults!.requiredOptionOrRest("app");
final apts = argResults!.requiredMultiOptionOrRest("apt", ["app"]);
final apts = argResults!.requiredMultiOptionOrRest("apt", const ["app"]);

if (apts.isEmpty) usageException("Apt option cannot be empty");

Expand Down
2 changes: 1 addition & 1 deletion lib/commands/app/backup.dart
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ final class AppBackupCommand extends Command<void> with Disposable {

Future<void> _handleSingle(Map<dynamic, dynamic> data, ISpin spinner) async {
if (data["url"] case final String url) {
if (argResults!.optionOrRest("dir", ["app"]) case final dir?) {
if (argResults!.optionOrRest("dir", const ["app"]) case final dir?) {
final Uri uri = .parse(url);

return _download(dir: dir, spinner: spinner, uri: uri);
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/app/logs.dart
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ final class AppLogsCommand extends Command<void> {
@override
Future<void> run() async {
final appId = argResults!.optionOrRest("app") ?? "all";
final out = argResults!.optionOrRest("out", ["app"]);
final out = argResults!.optionOrRest("out", const ["app"]);

final spinner = context.printer.spin();

Expand Down
2 changes: 1 addition & 1 deletion lib/commands/app/mod/add.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ final class AppModAddCommand extends Command<void> {
@override
Future<void> run() async {
final appId = argResults!.requiredOptionOrRest("app");
final modId = argResults!.requiredOptionOrRest("mod", ["app"]);
final modId = argResults!.requiredOptionOrRest("mod", const ["app"]);
final perms = argResults!.multiOption("perms");

final spinner = context.printer.spin(text: "Adding app MOD...");
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/app/mod/delete.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ final class AppModDeleteCommand extends Command<void> {
@override
Future<void> run() async {
final appId = argResults!.requiredOptionOrRest("app");
final modId = argResults!.requiredOptionOrRest("mod", ["app"]);
final modId = argResults!.requiredOptionOrRest("mod", const ["app"]);

final spinner = context.printer.spin(text: "Deleting app MOD...");

Expand Down
2 changes: 1 addition & 1 deletion lib/commands/app/mod/edit.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ final class AppModEditCommand extends Command<void> {
@override
Future<void> run() async {
final appId = argResults!.requiredOptionOrRest("app");
final modId = argResults!.requiredOptionOrRest("mod", ["app"]);
final modId = argResults!.requiredOptionOrRest("mod", const ["app"]);
final perms = argResults!.multiOption("perms");

final spinner = context.printer.spin(text: "Editing app MOD...");
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/app/ram.dart
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ final class AppRamCommand extends Command<void> {
Future<void> run() async {
final appId = argResults!.requiredOptionOrRest("app");
final ramMB = max(
argResults!.requiredIntOptionOrRest("amount", ["app"]),
argResults!.requiredIntOptionOrRest("amount", const ["app"]),
DiscloudRamMinByType.lowest.value,
);

Expand Down
2 changes: 1 addition & 1 deletion lib/commands/domain/create.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ final class CustomdomainCreateCommand extends Command<void> {
@override
Future<void> run() async {
final domain = argResults!.requiredOptionOrRest("id");
final subdomain = argResults!.requiredOptionOrRest("app", ["id"]);
final subdomain = argResults!.requiredOptionOrRest("app", const ["id"]);

final spinner = context.printer.spin(text: "Creating $domain...");

Expand Down
2 changes: 1 addition & 1 deletion lib/commands/domain/edit.dart
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ final class CustomdomainEditCommand extends Command<void> with Disposable {
@override
Future<void> run() async {
final domain = argResults!.requiredOptionOrRest("id");
final subdomain = argResults!.requiredOptionOrRest("app", ["id"]);
final subdomain = argResults!.requiredOptionOrRest("app", const ["id"]);

final spinner = context.printer.spin(text: "Editting $domain...");

Expand Down
3 changes: 2 additions & 1 deletion lib/commands/init.dart
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ class _InitArgs {
final ArgResults? _argResults;

bool _flag(String name) => _argResults?.flag(name) ?? false;
List<String> _multiOption(String n) => _argResults?.multiOption(n) ?? [];
List<String> _multiOption(String n) =>
_argResults?.multiOption(n) ?? const [];
String? _option(String name) => _argResults?.option(name);

bool get force => _flag("force");
Expand Down
4 changes: 2 additions & 2 deletions lib/commands/snapshot/create.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import "package:discloud/utils/messages.dart";

final class SnapshotCreateCommand extends Command<void> {
SnapshotCreateCommand() {
argParser.addOption("app", mandatory: true);
argParser.addOption("app");
}

@override
Expand All @@ -19,7 +19,7 @@ final class SnapshotCreateCommand extends Command<void> {

@override
Future<void> run() async {
final String appId = argResults!.option("app")!;
final String appId = argResults!.requiredOptionOrRest("app");

final spinner = context.printer.spin(text: "Creating snapshot...");

Expand Down
9 changes: 6 additions & 3 deletions lib/commands/snapshot/download.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import "package:path/path.dart" hide context;
final class SnapshotDownloadCommand extends Command<void> with Disposable {
SnapshotDownloadCommand() {
argParser
..addOption("app", mandatory: true)
..addOption("app")
..addOption("version", help: "Snapshot version in YYYYMMDD-HHMMSS format")
..addOption(
"dir",
Expand All @@ -41,7 +41,7 @@ final class SnapshotDownloadCommand extends Command<void> with Disposable {

@override
Future<void> run() async {
final String appId = argResults!.option("app")!;
final String appId = argResults!.requiredOptionOrRest("app");

final spinner = context.printer.spin();

Expand All @@ -64,7 +64,10 @@ final class SnapshotDownloadCommand extends Command<void> with Disposable {
String appId, {
required ISpin spinner,
}) async {
if (argResults?.option("version") case final String v) return v;
if (argResults?.optionOrRest("version", const ["app"])
case final String version) {
return version;
}

spinner.text = "Retrieving snapshot...";

Expand Down
2 changes: 1 addition & 1 deletion lib/commands/snapshot/info.dart
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ final class SnapshotInfoCommand extends Command<void> {

@override
Future<void> run() {
return switch (argResults?.option("app")) {
return switch (argResults?.optionOrRest("app")) {
final String appId => _runSingle(appId),
_ => _runMulti(),
};
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/team/backup.dart
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ final class TeamBackupCommand extends Command<void> with Disposable {

Future<void> _handleSingle(Map<dynamic, dynamic> data, ISpin spinner) async {
if (data["url"] case final String url) {
if (argResults!.optionOrRest("dir", ["app"]) case final dir?) {
if (argResults!.optionOrRest("dir", const ["app"]) case final dir?) {
final Uri uri = .parse(url);

return _download(dir: dir, spinner: spinner, uri: uri);
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/team/logs.dart
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ final class TeamLogsCommand extends Command<void> {
@override
Future<void> run() async {
final appId = argResults!.optionOrRest("app") ?? "all";
final out = argResults!.optionOrRest("out", ["app"]);
final out = argResults!.optionOrRest("out", const ["app"]);

final spinner = context.printer.spin();

Expand Down
2 changes: 1 addition & 1 deletion lib/commands/team/ram.dart
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ final class TeamRamCommand extends Command<void> {
Future<void> run() async {
final appId = argResults!.requiredOptionOrRest("app");
final ramMB = max(
argResults!.requiredIntOptionOrRest("amount", ["app"]),
argResults!.requiredIntOptionOrRest("amount", const ["app"]),
DiscloudRamMinByType.lowest.value,
);

Expand Down
2 changes: 1 addition & 1 deletion lib/utils/ascii_table.dart
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ String listToAsciiTable(
final first = list.first;
if (first is! Map) {
return tabular([
["#", "value"],
const ["#", "value"],
for (int i = 0; i < list.length; i++) [i + 1, list[i]],
]);
}
Expand Down