X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fgofetch%2FFetcher.java;h=e53bfaf3c41d72bd566dd47ef9ec9fdd40b9d015;hb=1647310f0abec346d291df8bbb3317da5cc65144;hp=39cd544103a8b403dcb5bff5e3e055e1aa4b5af6;hpb=2f2c9a91588afcd227d34e91b6e5fb58a0ac115c;p=gofetch.git

diff --git a/src/be/nikiroo/gofetch/Fetcher.java b/src/be/nikiroo/gofetch/Fetcher.java
index 39cd544..e53bfaf 100644
--- a/src/be/nikiroo/gofetch/Fetcher.java
+++ b/src/be/nikiroo/gofetch/Fetcher.java
@@ -85,7 +85,7 @@ public class Fetcher {
 			}
 
 			gopherBuilder.append(getLink(support.getDescription(),
-					support.getSelector(), false));
+					support.getSelector(), true, false));
 
 			String ref = support.getSelector();
 			while (ref.startsWith("/")) {
@@ -93,13 +93,14 @@ public class Fetcher {
 			}
 			ref = "../" + ref + "/index.html";
 
-			htmlBuilder.append(getLink(support.getDescription(), ref, true));
+			htmlBuilder.append(getLink(support.getDescription(), 
+					ref, true, true));
 		}
 
 		File gopherCache = new File(dir, preselector);
 		gopherCache.mkdirs();
 		File htmlIndex = new File(gopherCache, "index.html");
-		gopherCache = new File(gopherCache, ".cache");
+		gopherCache = new File(gopherCache, "gophermap");
 
 		Output gopher = new Gopher(null, hostname, preselector, port);
 		Output html = new Html(null, hostname, preselector, port);
@@ -196,13 +197,22 @@ public class Fetcher {
 			boolean last = i == headers.length - 1;
 			if (enoughStories || last) {
 				if (!last) {
-					gopherLines.add(getLink("More", preselector + "/.cache_"
-							+ (page + 1), false));
-					htmlLines.add(getLink("More", "index_" + (page + 1)
-							+ ".html", 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, ".cache", "", page);
+				write(gopherLines, varDir, "gophermap", "", page);
 				write(htmlLines, varDir, "index", ".html", page);
 				gopherLines = new ArrayList<String>();
 				htmlLines = new ArrayList<String>();
@@ -226,10 +236,19 @@ public class Fetcher {
 		}
 	}
 
-	private String getLink(String name, String ref, boolean html) {
+	/**
+	 * 
+	 * @param name
+	 * @param ref
+	 * @param menu
+	 *            menu (gophermap, i) mode
+	 * @param html
+	 * @return
+	 */
+	private String getLink(String name, String ref, boolean menu, boolean html) {
 		if (!html) {
-			return new StringBuilder().append("1" + name).append("\t")
-					.append("1" + 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();