Version 1.2.4: fixes, new "Re-download" UI option

[nikiroo-utils.git] / src / be / nikiroo / fanfix / Library.java

diff --git a/src/be/nikiroo/fanfix/Library.java b/src/be/nikiroo/fanfix/Library.java
index cae2d7dc781990aa4bf8be024d2e53099a9b4582..4db3868b5928701ecda2a53e6f522294aee00cc9 100644 (file)
--- a/src/be/nikiroo/fanfix/Library.java
+++ b/src/be/nikiroo/fanfix/Library.java
@@ -4,6 +4,7 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -17,6 +18,7 @@ import be.nikiroo.fanfix.output.BasicOutput.OutputType;
 import be.nikiroo.fanfix.supported.BasicSupport;
 import be.nikiroo.fanfix.supported.BasicSupport.SupportType;
 import be.nikiroo.fanfix.supported.InfoReader;
+import be.nikiroo.utils.IOUtils;
 import be.nikiroo.utils.Progress;
 
 /**
@@ -89,6 +91,7 @@ public class Library {
                        }
                }
 
+               Collections.sort(list);
                return list;
        }
 
@@ -322,13 +325,23 @@ public class Library {
 
                if (file != null) {
                        if (file.delete()) {
-                               String newExt = getOutputType(meta).getDefaultExtension(false);
+                               String readerExt = getOutputType(meta)
+                                               .getDefaultExtension(true);
+                               String fileExt = getOutputType(meta).getDefaultExtension(false);
 
                                String path = file.getAbsolutePath();
+                               if (readerExt != null && !readerExt.equals(fileExt)) {
+                                       path = path
+                                                       .substring(0, path.length() - readerExt.length())
+                                                       + fileExt;
+                                       file = new File(path);
+                                       IOUtils.deltree(file);
+                               }
+
                                File infoFile = new File(path + ".info");
                                if (!infoFile.exists()) {
                                        infoFile = new File(path.substring(0, path.length()
-                                                       - newExt.length())
+                                                       - fileExt.length())
                                                        + ".info");
                                }
                                infoFile.delete();
@@ -339,7 +352,7 @@ public class Library {
                                File coverFile = new File(path + coverExt);
                                if (!coverFile.exists()) {
                                        coverFile = new File(path.substring(0, path.length()
-                                                       - newExt.length()));
+                                                       - fileExt.length()));
                                }
                                coverFile.delete();