X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fgofetch%2FFetcher.java;h=5f81edabcb887cdb9e211c558331bab8a78339ec;hb=136ab80122a17caa0720116d6d2552521239fbb3;hp=e53bfaf3c41d72bd566dd47ef9ec9fdd40b9d015;hpb=202173602397b0793542c7a90f9d86013e153067;p=gofetch.git

diff --git a/src/be/nikiroo/gofetch/Fetcher.java b/src/be/nikiroo/gofetch/Fetcher.java
index e53bfaf..5f81eda 100644
--- a/src/be/nikiroo/gofetch/Fetcher.java
+++ b/src/be/nikiroo/gofetch/Fetcher.java
@@ -93,8 +93,8 @@ public class Fetcher {
 			}
 			ref = "../" + ref + "/index.html";
 
-			htmlBuilder.append(getLink(support.getDescription(), 
-					ref, true, true));
+			htmlBuilder.append(getLink(support.getDescription(), ref, true,
+					true));
 		}
 
 		File gopherCache = new File(dir, preselector);
@@ -188,28 +188,23 @@ public class Fetcher {
 		List<String> gopherLines = new ArrayList<String>();
 		List<String> htmlLines = new ArrayList<String>();
 		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),
-						true, 
-						false));
-					
-					htmlLines.add(getLink("More", 
-						"index_" 
-							+ (page + 1)
-							+ ".html",
-						true, 
-						true));
+					gopherLines.add(getLink("More", support.getSelector()
+							+ "gophermap_" + (page + 1), true, false));
+
+					htmlLines.add(getLink("More", "index_" + (page + 1)
+							+ ".html", true, true));
 				}
 
 				write(gopherLines, varDir, "gophermap", "", page);
@@ -237,13 +232,18 @@ public class Fetcher {
 	}
 
 	/**
+	 * 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
+	 *            menu (gophermap, i) mode -- not used in html mode
 	 * @param html
-	 * @return
+	 *            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) {