From d910e8117de39dc7eaf4d7bda95c43b3123268fe Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Thu, 30 Apr 2020 23:12:18 +0200 Subject: [PATCH] do not report story name as progress name --- library/BasicLibrary.java | 1 - library/LocalLibrary.java | 4 ---- supported/BasicSupport.java | 3 --- supported/BasicSupport_Deprecated.java | 2 -- supported/Cbz.java | 4 ---- 5 files changed, 14 deletions(-) diff --git a/library/BasicLibrary.java b/library/BasicLibrary.java index 82f3fa2..d435f8d 100644 --- a/library/BasicLibrary.java +++ b/library/BasicLibrary.java @@ -587,7 +587,6 @@ abstract public class BasicLibrary { } Story story = save(support.process(pgProcess), pgSave); - pg.setName(story.getMeta().getTitle()); pg.done(); return story.getMeta(); diff --git a/library/LocalLibrary.java b/library/LocalLibrary.java index aec8972..6720972 100644 --- a/library/LocalLibrary.java +++ b/library/LocalLibrary.java @@ -718,10 +718,6 @@ public class LocalLibrary extends BasicLibrary { } for (File infoFileOrSubdir : infoFilesAndSubdirs) { - if (pgFiles != null) { - pgFiles.setName(infoFileOrSubdir.getName()); - } - if (infoFileOrSubdir.isDirectory()) { addToStories(stories, null, infoFileOrSubdir); } else { diff --git a/supported/BasicSupport.java b/supported/BasicSupport.java index 7dbd136..35a6ac3 100644 --- a/supported/BasicSupport.java +++ b/supported/BasicSupport.java @@ -347,8 +347,6 @@ public abstract class BasicSupport { pgMeta.done(); // 10% pg.put("meta", story.getMeta()); - pg.setName(story.getMeta().getTitle()); - Progress pgGetChapters = new Progress(); pg.addProgress(pgGetChapters, 10); story.setChapters(new ArrayList()); @@ -394,7 +392,6 @@ public abstract class BasicSupport { pgChaps.done(); } - pg.setName(story.getMeta().getTitle()); pg.done(); return story; diff --git a/supported/BasicSupport_Deprecated.java b/supported/BasicSupport_Deprecated.java index 98b74db..47cb7a2 100644 --- a/supported/BasicSupport_Deprecated.java +++ b/supported/BasicSupport_Deprecated.java @@ -269,8 +269,6 @@ public abstract class BasicSupport_Deprecated extends BasicSupport { pgMeta.setProgress(pgMeta.getMax()); // 10% } - pg.setName("Retrieving " + story.getMeta().getTitle()); - setCurrentReferer(url); Progress pgGetChapters = new Progress(); diff --git a/supported/Cbz.java b/supported/Cbz.java index cf60335..a6188ec 100644 --- a/supported/Cbz.java +++ b/supported/Cbz.java @@ -73,8 +73,6 @@ class Cbz extends Epub { pgMeta.done(); // 10% - pg.setName(meta.getTitle()); - File tmpDir = Instance.getInstance().getTempFiles().createTempDir("info-text"); String basename = null; @@ -197,9 +195,7 @@ class Cbz extends Epub { } } - pg.setName(meta.getTitle()); pg.done(); - return story; } -- 2.27.0