X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fgofetch%2FFetcher.java;h=cb77f657beb706dbf9e1fefc48cfc567e01d090a;hb=c715ea028a2b9865b1b5a619b7cf7553a89aa90d;hp=258f1961e58b8746b8286f7131726d2e9de659d3;hpb=a2d8693b0474647492c745eef7ae37869defbfdf;p=gofetch.git

diff --git a/src/be/nikiroo/gofetch/Fetcher.java b/src/be/nikiroo/gofetch/Fetcher.java
index 258f196..cb77f65 100644
--- a/src/be/nikiroo/gofetch/Fetcher.java
+++ b/src/be/nikiroo/gofetch/Fetcher.java
@@ -14,7 +14,7 @@ import be.nikiroo.gofetch.output.Gopher;
 import be.nikiroo.gofetch.output.Html;
 import be.nikiroo.gofetch.output.Output;
 import be.nikiroo.gofetch.support.BasicSupport;
-import be.nikiroo.gofetch.support.BasicSupport.Type;
+import be.nikiroo.gofetch.support.Type;
 import be.nikiroo.utils.IOUtils;
 
 /**
@@ -112,18 +112,18 @@ public class Fetcher {
 
 		FileWriter writer = new FileWriter(gopherCache);
 		try {
-			writer.append(gopher.getIndexHeader());
+			writer.append(gopher.getMainIndexHeader());
 			writer.append(gopherBuilder.toString());
-			writer.append(gopher.getIndexFooter());
+			writer.append(gopher.getMainIndexFooter());
 		} finally {
 			writer.close();
 		}
 
 		try {
 			writer = new FileWriter(htmlIndex);
-			writer.append(html.getIndexHeader());
+			writer.append(html.getMainIndexHeader());
 			writer.append(htmlBuilder.toString());
-			writer.append(html.getIndexFooter());
+			writer.append(html.getMainIndexFooter());
 		} finally {
 			writer.close();
 		}
@@ -196,10 +196,12 @@ public class Fetcher {
 		headers = tmp.toArray(new String[] {});
 		//
 
-		// Write the index (with "MORE" links if needed)
+		// Write the main index (with "MORE" links if needed)
 		int page = 0;
 		List<String> gopherLines = new ArrayList<String>();
 		List<String> htmlLines = new ArrayList<String>();
+		gopherLines.add(gopher.getIndexHeader(support));
+		htmlLines.add(html.getIndexHeader(support));
 		for (i = 0; i < headers.length; i++) {
 			File gopherFile = new File(varDir, headers[i]);
 			File htmlFile = new File(varDir, headers[i] + ".html");
@@ -220,6 +222,8 @@ public class Fetcher {
 							+ ".html", true, true));
 				}
 
+				gopherLines.add(gopher.getIndexFooter(support));
+				htmlLines.add(html.getIndexFooter(support));
 				write(gopherLines, varDir, "gophermap", "", page);
 				write(htmlLines, varDir, "index", ".html", page);
 				gopherLines = new ArrayList<String>();
@@ -229,6 +233,24 @@ public class Fetcher {
 		}
 	}
 
+	/**
+	 * Write an index/gophermap file with the given link content for the
+	 * selected supported web site.
+	 * 
+	 * @param lines
+	 *            the link content (the stories and a short description)
+	 * @param varDir
+	 *            the base directory to write into
+	 * @param basename
+	 *            the base file name
+	 * @param ext
+	 *            the file extension (for instance, ".html")
+	 * @param page
+	 *            the page number (0 = main index)
+	 * 
+	 * @throws IOException
+	 *             in case of I/O errors
+	 */
 	private void write(List<String> lines, File varDir, String basename,
 			String ext, int page) throws IOException {
 		File file = new File(varDir, basename + (page > 0 ? "_" + page : "")