X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FMain.java;h=b989c68a1a3b648f4f96c47398b602ebd6e2814d;hb=d649ced99f929e1fcf2421a2357f5fdb8d2fcfe1;hp=09635da1e20243482401c5da545378ee97243489;hpb=bee7dffea9ef8d3312eee90993a9faaeac6c1127;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java
index 09635da..b989c68 100644
--- a/src/be/nikiroo/fanfix/Main.java
+++ b/src/be/nikiroo/fanfix/Main.java
@@ -14,8 +14,8 @@ import be.nikiroo.fanfix.reader.BasicReader;
import be.nikiroo.fanfix.reader.BasicReader.ReaderType;
import be.nikiroo.fanfix.supported.BasicSupport;
import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
+import be.nikiroo.utils.Progress;
import be.nikiroo.utils.ui.UIUtils;
-import be.nikiroo.utils.ui.Progress;
/**
* Main program entry point.
@@ -35,8 +35,8 @@ public class Main {
*
NOUTF: if set to 1 or 'true', the program will prefer non-unicode
* {@link String}s when possible
* CONFIG_DIR: a path where to look for the .properties files
- * before taking the included ones; they will also be saved/updated into
- * this path when the program starts
+ * before taking the usual ones; they will also be saved/updated into this
+ * path when the program starts
* DEBUG: if set to 1 or 'true', the program will override the DEBUG_ERR
* configuration value with 'true'
*
@@ -229,34 +229,6 @@ public class Main {
}
}
- /**
- * Return an {@link URL} from this {@link String}, be it a file path or an
- * actual {@link URL}.
- *
- * @param sourceString
- * the source
- *
- * @return the corresponding {@link URL}
- *
- * @throws MalformedURLException
- * if this is neither a file nor a conventional {@link URL}
- */
- private static URL getUrl(String sourceString) throws MalformedURLException {
- if (sourceString == null || sourceString.isEmpty()) {
- throw new MalformedURLException("Empty url");
- }
-
- URL source = null;
- try {
- source = new URL(sourceString);
- } catch (MalformedURLException e) {
- File sourceFile = new File(sourceString);
- source = sourceFile.toURI().toURL();
- }
-
- return source;
- }
-
/**
* Import the given resource into the {@link Library}.
*
@@ -269,7 +241,8 @@ public class Main {
*/
public static int imprt(String urlString, Progress pg) {
try {
- Story story = Instance.getLibrary().imprt(getUrl(urlString), pg);
+ Story story = Instance.getLibrary().imprt(
+ BasicReader.getUrl(urlString), pg);
System.out.println(story.getMeta().getLuid() + ": \""
+ story.getMeta().getTitle() + "\" imported.");
} catch (IOException e) {
@@ -349,7 +322,7 @@ public class Main {
if (library) {
reader.setStory(story, null);
} else {
- reader.setStory(getUrl(story), null);
+ reader.setStory(BasicReader.getUrl(story), null);
}
if (chapString != null) {
@@ -394,7 +367,7 @@ public class Main {
String sourceName = urlString;
try {
- URL source = getUrl(urlString);
+ URL source = BasicReader.getUrl(urlString);
sourceName = source.toString();
if (source.toString().startsWith("file://")) {
sourceName = sourceName.substring("file://".length());
@@ -483,7 +456,7 @@ public class Main {
for (OutputType type : OutputType.values()) {
builder.append(trans(StringId.ERR_SYNTAX_TYPE, type.toString(),
- type.getDesc()));
+ type.getDesc(true)));
builder.append('\n');
}