git://git.nikiroo.be
/
nikiroo-utils.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
920af1c
)
do not report story name as progress name
author
Niki Roo
<niki@nikiroo.be>
Thu, 30 Apr 2020 21:12:18 +0000
(23:12 +0200)
committer
Niki Roo
<niki@nikiroo.be>
Thu, 30 Apr 2020 21:12:18 +0000
(23:12 +0200)
library/BasicLibrary.java
patch
|
blob
|
blame
|
history
library/LocalLibrary.java
patch
|
blob
|
blame
|
history
supported/BasicSupport.java
patch
|
blob
|
blame
|
history
supported/BasicSupport_Deprecated.java
patch
|
blob
|
blame
|
history
supported/Cbz.java
patch
|
blob
|
blame
|
history
diff --git
a/library/BasicLibrary.java
b/library/BasicLibrary.java
index 82f3fa28a0f53c6c94671e86ef491670f871145c..d435f8d7ec7fd3e2f09242339eefb9ff6fa74d93 100644
(file)
--- a/
library/BasicLibrary.java
+++ b/
library/BasicLibrary.java
@@
-587,7
+587,6
@@
abstract public class BasicLibrary {
}
Story story = save(support.process(pgProcess), pgSave);
}
Story story = save(support.process(pgProcess), pgSave);
- pg.setName(story.getMeta().getTitle());
pg.done();
return story.getMeta();
pg.done();
return story.getMeta();
diff --git
a/library/LocalLibrary.java
b/library/LocalLibrary.java
index aec89721753252783a6b3f9c3468e4afd4b7f9d1..6720972682939785226de86a201ef2c4c4c7d68f 100644
(file)
--- a/
library/LocalLibrary.java
+++ b/
library/LocalLibrary.java
@@
-718,10
+718,6
@@
public class LocalLibrary extends BasicLibrary {
}
for (File infoFileOrSubdir : infoFilesAndSubdirs) {
}
for (File infoFileOrSubdir : infoFilesAndSubdirs) {
- if (pgFiles != null) {
- pgFiles.setName(infoFileOrSubdir.getName());
- }
-
if (infoFileOrSubdir.isDirectory()) {
addToStories(stories, null, infoFileOrSubdir);
} else {
if (infoFileOrSubdir.isDirectory()) {
addToStories(stories, null, infoFileOrSubdir);
} else {
diff --git
a/supported/BasicSupport.java
b/supported/BasicSupport.java
index 7dbd1365aa1970f2b08000420728f85b65e7c1a8..35a6ac353be34fe8c52607fdb9f963d895c2603b 100644
(file)
--- a/
supported/BasicSupport.java
+++ b/
supported/BasicSupport.java
@@
-347,8
+347,6
@@
public abstract class BasicSupport {
pgMeta.done(); // 10%
pg.put("meta", story.getMeta());
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<Chapter>());
Progress pgGetChapters = new Progress();
pg.addProgress(pgGetChapters, 10);
story.setChapters(new ArrayList<Chapter>());
@@
-394,7
+392,6
@@
public abstract class BasicSupport {
pgChaps.done();
}
pgChaps.done();
}
- pg.setName(story.getMeta().getTitle());
pg.done();
return story;
pg.done();
return story;
diff --git
a/supported/BasicSupport_Deprecated.java
b/supported/BasicSupport_Deprecated.java
index 98b74db5d0567f9d415b6da23a3d849a79faa8ed..47cb7a2c94ed2b965e865e398638d683a8967898 100644
(file)
--- 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%
}
pgMeta.setProgress(pgMeta.getMax()); // 10%
}
- pg.setName("Retrieving " + story.getMeta().getTitle());
-
setCurrentReferer(url);
Progress pgGetChapters = new Progress();
setCurrentReferer(url);
Progress pgGetChapters = new Progress();
diff --git
a/supported/Cbz.java
b/supported/Cbz.java
index cf6033523a05cbb509ebab2052c2d285cfdffd4d..a6188ec55085467b1306f5a9ac91e0083bdf014d 100644
(file)
--- a/
supported/Cbz.java
+++ b/
supported/Cbz.java
@@
-73,8
+73,6
@@
class Cbz extends Epub {
pgMeta.done(); // 10%
pgMeta.done(); // 10%
- pg.setName(meta.getTitle());
-
File tmpDir = Instance.getInstance().getTempFiles().createTempDir("info-text");
String basename = null;
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();
pg.done();
-
return story;
}
return story;
}