X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fgofetch%2FFetcher.java;h=bd5a4543fda92a92da61d665205fb5744364b217;hb=e570bb42dfb90f4c31429069ac7095514ff3ee2f;hp=920b48af504db25f0f61e946c48ce27d931bea99;hpb=029feaedb06a22016a2c20df90d6d57d2e5e3b55;p=gofetch.git
diff --git a/src/be/nikiroo/gofetch/Fetcher.java b/src/be/nikiroo/gofetch/Fetcher.java
index 920b48a..bd5a454 100644
--- a/src/be/nikiroo/gofetch/Fetcher.java
+++ b/src/be/nikiroo/gofetch/Fetcher.java
@@ -42,8 +42,8 @@ public class Fetcher {
* the sub directory and (pre-)selector to use for the resources
* (will have an impact on the files' content)
* @param type
- * the type of news to get (or the special keyword ALL to get all
- * of the supported sources)
+ * the type of news to get (or NULL to get all of the supported
+ * sources)
* @param maxStories
* the maximum number of stories to show on the resume page
* @param hostname
@@ -81,7 +81,12 @@ public class Fetcher {
BasicSupport support = BasicSupport.getSupport(type);
if (type == this.type || this.type == null) {
- list(support);
+ try {
+ list(support);
+ } catch (Exception e) {
+ new Exception("Failed to process support: " + type, e)
+ .printStackTrace();
+ }
}
gopherBuilder.append(getLink(support.getDescription(),
@@ -93,7 +98,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 +193,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);
@@ -228,17 +237,22 @@ public class Fetcher {
}
/**
+ * Create a link.
*
* @param name
+ * the link name (what the user will see)
* @param ref
- * @param index
- * this link is in an index (and link to a NON index)
+ * the actual link reference (the target)
+ * @param menu
+ * 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 index, boolean html) {
+ private String getLink(String name, String ref, boolean menu, boolean html) {
if (!html) {
- return new StringBuilder().append((index ? "0" : "1") + name)
+ return new StringBuilder().append((menu ? "1" : "0") + name)
.append("\t").append(ref) //
.append("\t").append(hostname) //
.append("\t").append(Integer.toString(port)) //