Fix remote timeot (try1) + reverse e621 /post/

[fanfix.git] / src / be / nikiroo / fanfix / library / BasicLibrary.java

diff --git a/src/be/nikiroo/fanfix/library/BasicLibrary.java b/src/be/nikiroo/fanfix/library/BasicLibrary.java
index ee7ee8d48c225994343579efec3f2f381be9eabc..129c8fb33b1fc764c18a28661c3d45216b724f21 100644 (file)
--- a/src/be/nikiroo/fanfix/library/BasicLibrary.java
+++ b/src/be/nikiroo/fanfix/library/BasicLibrary.java
@@ -398,12 +398,24 @@ abstract public class BasicLibrary {
         *             in case of I/O error
         */
        public Story imprt(URL url, Progress pg) throws IOException {
+               if (pg == null)
+                       pg = new Progress();
+
+               pg.setMinMax(0, 1000);
+               Progress pgProcess = new Progress();
+               Progress pgSave = new Progress();
+               pg.addProgress(pgProcess, 800);
+               pg.addProgress(pgSave, 200);
+
                BasicSupport support = BasicSupport.getSupport(url);
                if (support == null) {
                        throw new UnknownHostException("" + url);
                }
 
-               return save(support.process(pg), null);
+               Story story = save(support.process(pgProcess), pgSave);
+               pg.done();
+
+               return story;
        }
 
        /**
@@ -519,6 +531,9 @@ abstract public class BasicLibrary {
        public synchronized Story save(Story story, String luid, Progress pg)
                        throws IOException {
 
+               Instance.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);
@@ -537,6 +552,10 @@ abstract public class BasicLibrary {
 
                updateInfo(story.getMeta());
 
+               Instance.getTraceHandler().trace(
+                               this.getClass().getSimpleName() + ": story saved (" + luid
+                                               + ")");
+
                return story;
        }
 
@@ -550,8 +569,15 @@ abstract public class BasicLibrary {
         *             in case of I/O error
         */
        public synchronized void delete(String luid) throws IOException {
+               Instance.getTraceHandler().trace(
+                               this.getClass().getSimpleName() + ": deleting story " + luid);
+
                doDelete(luid);
                deleteInfo(luid);
+
+               Instance.getTraceHandler().trace(
+                               this.getClass().getSimpleName() + ": story deleted (" + luid
+                                               + ")");
        }
 
        /**