X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Ftodesbaum%2Fjsite%2Fmain%2FCLI.java;h=df08244cc6f821617d290fae209fcb1aab1a69b1;hb=364353eaf23d55c9302d4f736c685d6b9fa59dcb;hp=9f0b2db3cb35226f24ecfdc056b37af2461717a6;hpb=a0cf8264e9d97aeaefa3f6322d32f9b4b87f7559;p=jSite.git diff --git a/src/main/java/de/todesbaum/jsite/main/CLI.java b/src/main/java/de/todesbaum/jsite/main/CLI.java index 9f0b2db..df08244 100644 --- a/src/main/java/de/todesbaum/jsite/main/CLI.java +++ b/src/main/java/de/todesbaum/jsite/main/CLI.java @@ -1,5 +1,5 @@ /* - * jSite - CLI.java - Copyright © 2006–2012 David Roden + * jSite - CLI.java - Copyright © 2006–2014 David Roden * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,6 +27,7 @@ import de.todesbaum.jsite.application.InsertListener; import de.todesbaum.jsite.application.Node; import de.todesbaum.jsite.application.Project; import de.todesbaum.jsite.application.ProjectInserter; +import de.todesbaum.jsite.main.JarFileLocator.DefaultJarFileLocator; /** * Command-line interface for jSite. @@ -89,7 +90,7 @@ public class CLI implements InsertListener { } } - ConfigurationLocator configurationLocator = new ConfigurationLocator(); + ConfigurationLocator configurationLocator = new ConfigurationLocator(new DefaultJarFileLocator(getClass().getClassLoader())); if (configFile != null) { configurationLocator.setCustomLocation(configFile); } @@ -104,6 +105,7 @@ public class CLI implements InsertListener { freenetInterface.setNode(node); projectInserter.setFreenetInterface(freenetInterface); + projectInserter.setPriority(configuration.getPriority()); Project currentProject = null; for (String argument : args) { @@ -271,6 +273,9 @@ public class CLI implements InsertListener { */ @Override public void projectInsertProgress(Project project, int succeeded, int failed, int fatal, int total, boolean finalized) { + if (total == 0) { + return; + } outputWriter.println("Progress: " + succeeded + " done, " + failed + " failed, " + fatal + " fatal, " + total + " total" + (finalized ? " (finalized)" : "") + ", " + ((succeeded + failed + fatal) * 100 / total) + "%"); }