X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fgofetch%2FFetcher.java;h=5f81edabcb887cdb9e211c558331bab8a78339ec;hb=136ab80122a17caa0720116d6d2552521239fbb3;hp=7866fe0030acc87c73dc2775ff2fb432bf50a11a;hpb=93e09a08a68ffd69eed42ecbf95f317b518357d7;p=gofetch.git diff --git a/src/be/nikiroo/gofetch/Fetcher.java b/src/be/nikiroo/gofetch/Fetcher.java index 7866fe0..5f81eda 100644 --- a/src/be/nikiroo/gofetch/Fetcher.java +++ b/src/be/nikiroo/gofetch/Fetcher.java @@ -93,7 +93,7 @@ public class Fetcher { } ref = "../" + ref + "/index.html"; - htmlBuilder.append(getLink(support.getDescription(), ref, false, + htmlBuilder.append(getLink(support.getDescription(), ref, true, true)); } @@ -188,19 +188,23 @@ public class Fetcher { List gopherLines = new ArrayList(); List htmlLines = new ArrayList(); for (i = 0; i < headers.length; i++) { - gopherLines - .add(IOUtils.readSmallFile(new File(varDir, headers[i]))); - htmlLines.add(IOUtils.readSmallFile(new File(varDir, headers[i] - + ".html"))); + File gopherFile = new File(varDir, headers[i]); + File htmlFile = new File(varDir, headers[i] + ".html"); + + if (gopherFile.exists()) + gopherLines.add(IOUtils.readSmallFile(gopherFile)); + if (htmlFile.exists()) + htmlLines.add(IOUtils.readSmallFile(htmlFile)); boolean enoughStories = (i > 0 && i % maxStories == 0); boolean last = i == headers.length - 1; if (enoughStories || last) { if (!last) { gopherLines.add(getLink("More", support.getSelector() - + "gophermap_" + (page + 1), false, false)); + + "gophermap_" + (page + 1), true, false)); + htmlLines.add(getLink("More", "index_" + (page + 1) - + ".html", false, true)); + + ".html", true, true)); } write(gopherLines, varDir, "gophermap", "", page); @@ -227,10 +231,24 @@ public class Fetcher { } } - private String getLink(String name, String ref, boolean index, boolean html) { + /** + * Create a link. + * + * @param name + * the link name (what the user will see) + * @param ref + * the actual link reference (the target) + * @param menu + * menu (gophermap, i) mode -- not used in html mode + * @param html + * TRUE for html mode, FALSE for gopher mode + * + * @return the ready-to-use link in a {@link String} + */ + private String getLink(String name, String ref, boolean menu, boolean html) { if (!html) { - return new StringBuilder().append("1" + name).append("\t") - .append(ref) // + return new StringBuilder().append((menu ? "1" : "0") + name) + .append("\t").append(ref) // .append("\t").append(hostname) // .append("\t").append(Integer.toString(port)) // .append("\r\n").toString();