From 1ab7ff0acbc00ddcf6b27a3bebd1e351fdbe96a2 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Fri, 7 Sep 2018 09:09:58 +0200 Subject: [PATCH] Fix bug due to 'id'-handling change --- src/be/nikiroo/gofetch/support/BasicSupport.java | 8 ++++++-- src/be/nikiroo/gofetch/support/LWN.java | 7 +------ src/be/nikiroo/gofetch/support/Phoronix.java | 3 --- src/be/nikiroo/gofetch/support/Slashdot.java | 4 ---- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/be/nikiroo/gofetch/support/BasicSupport.java b/src/be/nikiroo/gofetch/support/BasicSupport.java index 80fe5d2..9728523 100644 --- a/src/be/nikiroo/gofetch/support/BasicSupport.java +++ b/src/be/nikiroo/gofetch/support/BasicSupport.java @@ -32,7 +32,7 @@ import be.nikiroo.utils.StringUtils; */ public abstract class BasicSupport { /** The downloader to use for all websites. */ - protected static Downloader downloader = new Downloader("gofetcher"); + static protected Downloader downloader = new Downloader("gofetcher"); static private String preselector; @@ -106,7 +106,11 @@ public abstract class BasicSupport { continue; } - if (id.isEmpty()) { + if (!id.isEmpty()) { + while (id.length() < 10) { + id = "0" + id; + } + } else { id = date.replace(":", "_").replace("+", "_"); } diff --git a/src/be/nikiroo/gofetch/support/LWN.java b/src/be/nikiroo/gofetch/support/LWN.java index eac12e5..144fdc9 100644 --- a/src/be/nikiroo/gofetch/support/LWN.java +++ b/src/be/nikiroo/gofetch/support/LWN.java @@ -53,12 +53,7 @@ public class LWN extends BasicSupport { @Override protected String getArticleId(Document doc, Element article) { - String id = getArticleIntUrl(doc, article).replaceAll("[^0-9]", ""); - while (id.length() < 10) { - id = "0" + id; - } - - return id; + return getArticleIntUrl(doc, article).replaceAll("[^0-9]", ""); } @Override diff --git a/src/be/nikiroo/gofetch/support/Phoronix.java b/src/be/nikiroo/gofetch/support/Phoronix.java index 5338cd6..8f257fb 100644 --- a/src/be/nikiroo/gofetch/support/Phoronix.java +++ b/src/be/nikiroo/gofetch/support/Phoronix.java @@ -45,9 +45,6 @@ class Phoronix extends BasicSupport { id = id.substring(pos + 1); } - while (id.length() < 10) { - id = "0" + id; - } return id; } } diff --git a/src/be/nikiroo/gofetch/support/Slashdot.java b/src/be/nikiroo/gofetch/support/Slashdot.java index 6fb51a6..43ce13d 100644 --- a/src/be/nikiroo/gofetch/support/Slashdot.java +++ b/src/be/nikiroo/gofetch/support/Slashdot.java @@ -45,10 +45,6 @@ public class Slashdot extends BasicSupport { id = id.substring("title-".length()); } - while (id.length() < 10) { - id = "0" + id; - } - return id; } -- 2.27.0