X-Git-Url: http://git.nikiroo.be/?p=gofetch.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fgofetch%2FFetcher.java;fp=src%2Fbe%2Fnikiroo%2Fgofetch%2FFetcher.java;h=cb77f657beb706dbf9e1fefc48cfc567e01d090a;hp=6c86c136266b53f8c79e0d73cc3626fd7b9da495;hb=c715ea028a2b9865b1b5a619b7cf7553a89aa90d;hpb=183f2d47fade089593b5fa49a55cf3f946197827 diff --git a/src/be/nikiroo/gofetch/Fetcher.java b/src/be/nikiroo/gofetch/Fetcher.java index 6c86c13..cb77f65 100644 --- a/src/be/nikiroo/gofetch/Fetcher.java +++ b/src/be/nikiroo/gofetch/Fetcher.java @@ -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 gopherLines = new ArrayList(); List htmlLines = new ArrayList(); + 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(); @@ -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 lines, File varDir, String basename, String ext, int page) throws IOException { File file = new File(varDir, basename + (page > 0 ? "_" + page : "")