Skip to content

Commit

Permalink
Small improvements.
Browse files Browse the repository at this point in the history
  • Loading branch information
nmihajlovski committed Mar 29, 2017
1 parent bcb9189 commit decbc7c
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 14 deletions.
Expand Up @@ -28,7 +28,7 @@


@Authors("Nikolche Mihajlovski") @Authors("Nikolche Mihajlovski")
@Since("5.2.5") @Since("5.2.5")
public class FileSearchResult extends RapidoidThing { public class FileSearchResult extends RapidoidThing implements Comparable<FileSearchResult> {


private final File file; private final File file;


Expand All @@ -54,4 +54,8 @@ public String relativeName() {
return relativeName; return relativeName;
} }


@Override
public int compareTo(FileSearchResult that) {
return this.absoluteName.compareTo(that.absoluteName);
}
} }
3 changes: 3 additions & 0 deletions rapidoid-commons/src/main/java/org/rapidoid/io/IO.java
Expand Up @@ -243,6 +243,9 @@ public static void save(String filename, byte[] content, int retries) {
} }


private static void writeToFile(String filename, byte[] content, boolean append, int retries) { private static void writeToFile(String filename, byte[] content, boolean append, int retries) {
U.notNull(filename, "filename");
U.notNull(content, "content");

FileOutputStream out = null; FileOutputStream out = null;
try { try {
out = new FileOutputStream(filename, append); out = new FileOutputStream(filename, append);
Expand Down
46 changes: 33 additions & 13 deletions rapidoid-platform/src/main/java/org/rapidoid/platform/Platform.java
Expand Up @@ -73,9 +73,6 @@ static void start(String[] args, @SuppressWarnings("unused") boolean defaults) {
} }


private static void printArgs(String[] args, boolean defaults) { private static void printArgs(String[] args, boolean defaults) {
// don't print the args when displaying help
if (ConfigHelp.isHelpRequested(args)) return;

if (defaults) { if (defaults) {
Log.info("No command-line arguments were specified, using the defaults:"); Log.info("No command-line arguments were specified, using the defaults:");
} else { } else {
Expand All @@ -89,6 +86,7 @@ private static void printArgs(String[] args, boolean defaults) {
} }


private static void interceptSpecialCommands(String[] args) { private static void interceptSpecialCommands(String[] args) {
ConfigHelp.processHelp(args);


String cmd = args[0]; String cmd = args[0];
String[] cmdArgs = Arr.sub(args, 1, args.length); String[] cmdArgs = Arr.sub(args, 1, args.length);
Expand All @@ -100,12 +98,6 @@ private static void interceptSpecialCommands(String[] args) {
System.exit(result); System.exit(result);
break; break;


case "benchmark":
// interpret the "benchmark" command
BenchmarkCenter.main(cmdArgs);
System.exit(0);
break;

case "password": case "password":
// interpret the "password" command // interpret the "password" command
PasswordHashTool.generatePasswordHash(cmdArgs); PasswordHashTool.generatePasswordHash(cmdArgs);
Expand All @@ -126,27 +118,55 @@ private static void startPlatformAndProcessArgs(String[] args) {
List<String> normalArgs = U.list(); List<String> normalArgs = U.list();
List<String> appRefs = U.list(); List<String> appRefs = U.list();


separateArgs(args, normalArgs, appRefs); String cmd = separateArgs(args, normalArgs, appRefs);


PreApp.args(U.arrayOf(String.class, normalArgs)); PreApp.args(U.arrayOf(String.class, normalArgs));

App.boot(); App.boot();


for (String appRef : appRefs) { for (String appRef : appRefs) {
new File(MscOpts.appsPath()).mkdirs(); new File(MscOpts.appsPath()).mkdirs();
AppDownloader.download(appRef, MscOpts.appsPath()); AppDownloader.download(appRef, MscOpts.appsPath());
MavenUtil.findAndBuildAndDeploy(MscOpts.appsPath()); MavenUtil.findAndBuildAndDeploy(MscOpts.appsPath());
} }

if (U.notEmpty(cmd)) executeCommand(cmd);
} }


private static void separateArgs(String[] args, List<String> normalArgs, List<String> appRefs) { private static void executeCommand(String cmd) {
for (String arg : args) { switch (cmd) {
case "benchmark":
benchmark();
break;
}
}

private static void benchmark() {
BenchmarkCenter.run();
System.exit(0);
}

private static String separateArgs(String[] args, List<String> normalArgs, List<String> appRefs) {
String cmd = null;

for (int i = 0; i < args.length; i++) {
String arg = args[i];

if (arg.startsWith("@")) { if (arg.startsWith("@")) {
String appRef = arg.substring(1); String appRef = arg.substring(1);
appRefs.add(appRef); appRefs.add(appRef);

} else { } else {
normalArgs.add(arg); if (i == 0 && !arg.contains("=")) {
cmd = args[0];

} else {
normalArgs.add(arg);
}
} }
} }

return cmd;
} }


private static void openInBrowser() { private static void openInBrowser() {
Expand Down

0 comments on commit decbc7c

Please sign in to comment.