Improve progress names

diff --git a/library/BasicLibrary.java b/library/BasicLibrary.java
index c2ab12b7b735d8349b51ea1beaaeab3ca7bac8e8..7f286079ed1fe87c88f2ec798a85c26774950089 100644 (file)
--- a/library/BasicLibrary.java
+++ b/library/BasicLibrary.java
@@ -755,6 +755,7 @@ 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();


@@ -872,13 +873,18 @@ abstract public class BasicLibrary {
         */
        public synchronized Story save(Story story, String luid, Progress pg)
                        throws IOException {
         */
        public synchronized Story save(Story story, String luid, Progress pg)
                        throws IOException {

-
+               if (pg == null) {
+                       pg = new Progress();
+               }
+               

                Instance.getInstance().getTraceHandler().trace(this.getClass().getSimpleName() + ": saving story " + luid);
 
                // Do not change the original metadata, but change the original story
                MetaData meta = story.getMeta().clone();
                story.setMeta(meta);
 
                Instance.getInstance().getTraceHandler().trace(this.getClass().getSimpleName() + ": saving story " + luid);
 
                // Do not change the original metadata, but change the original story
                MetaData meta = story.getMeta().clone();
                story.setMeta(meta);
 

+               pg.setName("Saving story");
+               

                if (luid == null || luid.isEmpty()) {
                        meta.setLuid(String.format("%03d", getNextId()));
                } else {
                if (luid == null || luid.isEmpty()) {
                        meta.setLuid(String.format("%03d", getNextId()));
                } else {


@@ -896,6 +902,8 @@ abstract public class BasicLibrary {
                Instance.getInstance().getTraceHandler()
                                .trace(this.getClass().getSimpleName() + ": story saved (" + luid + ")");
 
                Instance.getInstance().getTraceHandler()
                                .trace(this.getClass().getSimpleName() + ": story saved (" + luid + ")");
 

+               pg.setName(meta.getTitle());
+               pg.done();

                return story;
        }
 
                return story;
        }
 

diff --git a/supported/BasicSupport.java b/supported/BasicSupport.java
index bc91e8b40d0688e96b8ae8698f9e252ae2fe3bec..ba2164cacac6f077ab1f4d1c97e23b9d9a56f31d 100644 (file)
--- a/supported/BasicSupport.java
+++ b/supported/BasicSupport.java
@@ -336,6 +336,8 @@ public abstract class BasicSupport {
                } else {
                        pg.setMinMax(0, 100);
                }
                } else {
                        pg.setMinMax(0, 100);
                }

+               
+               pg.setName("Initialising");

 
                pg.setProgress(1);
                Progress pgMeta = new Progress();
 
                pg.setProgress(1);
                Progress pgMeta = new Progress();


@@ -343,7 +345,7 @@ public abstract class BasicSupport {
                Story story = processMeta(true, pgMeta);
                pgMeta.done(); // 10%
 
                Story story = processMeta(true, pgMeta);
                pgMeta.done(); // 10%
 

-               pg.setName("Retrieving " + story.getMeta().getTitle());
+               pg.setName(story.getMeta().getTitle());

 
                Progress pgGetChapters = new Progress();
                pg.addProgress(pgGetChapters, 10);
 
                Progress pgGetChapters = new Progress();
                pg.addProgress(pgGetChapters, 10);


@@ -390,6 +392,7 @@ 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/Cbz.java b/supported/Cbz.java
index 76b66aba7c75fa24317eb4daca6ff75854658326..cf6033523a05cbb509ebab2052c2d285cfdffd4d 100644 (file)
--- a/supported/Cbz.java
+++ b/supported/Cbz.java
@@ -63,6 +63,8 @@ class Cbz extends Epub {
                } else {
                        pg.setMinMax(0, 100);
                }
                } else {
                        pg.setMinMax(0, 100);
                }

+               
+               pg.setName("Initialising");

 
                Progress pgMeta = new Progress();
                pg.addProgress(pgMeta, 10);
 
                Progress pgMeta = new Progress();
                pg.addProgress(pgMeta, 10);


@@ -70,6 +72,8 @@ class Cbz extends Epub {
                MetaData meta = story.getMeta();
 
                pgMeta.done(); // 10%
                MetaData meta = story.getMeta();
 
                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;


@@ -193,7 +197,9 @@ class Cbz extends Epub {
                        }
                }
 
                        }
                }
 

-               pg.setProgress(100);
+               pg.setName(meta.getTitle());
+               pg.done();
+               

                return story;
        }
 
                return story;
        }