X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FHtml.java;h=f66032bfce20032f784b6df0ab4b51ce7883fce7;hb=86d49dbc7c3eca665b7823b5de49bb73a31c7722;hp=036479d21758797c403bbf17686222880832f157;hpb=c330535057e64f195ee0d6e3955f3a65731e39a2;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/supported/Html.java b/src/be/nikiroo/fanfix/supported/Html.java
index 036479d..f66032b 100644
--- a/src/be/nikiroo/fanfix/supported/Html.java
+++ b/src/be/nikiroo/fanfix/supported/Html.java
@@ -1,17 +1,12 @@
 package be.nikiroo.fanfix.supported;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.util.List;
-import java.util.Map.Entry;
 
-import be.nikiroo.fanfix.data.MetaData;
-import be.nikiroo.utils.MarkableFileInputStream;
+import be.nikiroo.fanfix.Instance;
 
 /**
  * Support class for HTML files created with this program (as we need some
@@ -20,8 +15,6 @@ import be.nikiroo.utils.MarkableFileInputStream;
  * @author niki
  */
 class Html extends InfoText {
-	private URL fakeSource;
-
 	@Override
 	public String getSourceName() {
 		return "html";
@@ -29,55 +22,42 @@ class Html extends InfoText {
 
 	@Override
 	protected boolean supports(URL url) {
-		if (url.getPath().toLowerCase()
-				.endsWith(File.separatorChar + "index.html")) {
-			try {
-				File file = new File(url.toURI()).getParentFile();
-				return super.supports(file.toURI().toURL());
-			} catch (URISyntaxException e) {
-			} catch (MalformedURLException e) {
+		try {
+			File file = new File(url.toURI());
+			if (file.getName().equals("index.html")) {
+				file = file.getParentFile();
 			}
+
+			file = new File(file, file.getName());
+
+			return super.supports(file.toURI().toURL());
+		} catch (URISyntaxException e) {
+		} catch (MalformedURLException e) {
 		}
 
 		return false;
 	}
 
 	@Override
-	protected MetaData getMeta(URL source, InputStream in) throws IOException {
-		return super.getMeta(fakeSource, in);
-	}
+	public URL getCanonicalUrl(URL source) {
 
-	@Override
-	protected String getDesc(URL source, InputStream in) throws IOException {
-		return super.getDesc(fakeSource, in);
-	}
-
-	@Override
-	protected List<Entry<String, URL>> getChapters(URL source, InputStream in)
-			throws IOException {
-		return super.getChapters(fakeSource, in);
-	}
+		try {
+			File fakeFile = new File(source.toURI());
+			if (fakeFile.getName().equals("index.html")) { // "story/index.html"
+				fakeFile = new File(fakeFile.getParent()); // -> "story/"
+			}
 
-	@Override
-	protected String getChapterContent(URL source, InputStream in, int number)
-			throws IOException {
-		return super.getChapterContent(fakeSource, in, number);
-	}
+			if (fakeFile.isDirectory()) { // "story/"
+				fakeFile = new File(fakeFile, fakeFile.getName() + ".txt"); // "story/story.txt"
+			}
 
-	@Override
-	protected InputStream openInput(URL source) throws IOException {
-		try {
-			File fakeFile = new File(source.toURI()); // "story/index.html"
-			fakeFile = new File(fakeFile.getParent()); // "story"
-			fakeFile = new File(fakeFile, fakeFile.getName()); // "story/story"
-			fakeSource = fakeFile.toURI().toURL();
-			return new MarkableFileInputStream(new FileInputStream(fakeFile));
-		} catch (URISyntaxException e) {
-			throw new IOException(
-					"file not supported (maybe not created with this program or corrupt)",
-					e);
-		} catch (MalformedURLException e) {
-			throw new IOException("file not supported (bad URL)", e);
+			return fakeFile.toURI().toURL();
+		} catch (Exception e) {
+			Instance.getTraceHandler().error(
+					new IOException("Cannot find the right URL for " + source,
+							e));
 		}
+
+		return source;
 	}
 }