X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2FLibrary.java;fp=src%2Fbe%2Fnikiroo%2Ffanfix%2FLibrary.java;h=eb9c9a39f3d4ae76298fd636c0e3e6ad43a962cc;hp=cae2d7dc781990aa4bf8be024d2e53099a9b4582;hb=9843a5e5c44825ac404f45ddccd6f63e554567a4;hpb=10d558d2429c984327f9e5a16933fefe5cc37314 diff --git a/src/be/nikiroo/fanfix/Library.java b/src/be/nikiroo/fanfix/Library.java index cae2d7d..eb9c9a3 100644 --- a/src/be/nikiroo/fanfix/Library.java +++ b/src/be/nikiroo/fanfix/Library.java @@ -17,6 +17,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; /** @@ -322,13 +323,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 +350,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();