git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New support: YiffStar (still no logged-in content)
[fanfix.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..6e0262b43b1c78ac58406f65807cb2399a027031 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.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;
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.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;
/**
import be.nikiroo.utils.Progress;
/**
@@
-89,6
+91,7
@@
public class Library {
}
}
}
}
+ Collections.sort(list);
return list;
}
return list;
}
@@
-322,13
+325,23
@@
public class Library {
if (file != null) {
if (file.delete()) {
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();
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()
File infoFile = new File(path + ".info");
if (!infoFile.exists()) {
infoFile = new File(path.substring(0, path.length()
- -
new
Ext.length())
+ -
file
Ext.length())
+ ".info");
}
infoFile.delete();
+ ".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()
File coverFile = new File(path + coverExt);
if (!coverFile.exists()) {
coverFile = new File(path.substring(0, path.length()
- -
new
Ext.length()));
+ -
file
Ext.length()));
}
coverFile.delete();
}
coverFile.delete();
@@
-377,7
+390,11
@@
public class Library {
* @return the target
*/
private File getFile(MetaData key) {
* @return the target
*/
private File getFile(MetaData key) {
- String title = key.getTitle().replaceAll("[^a-zA-Z0-9._+-]", "_");
+ String title = key.getTitle();
+ if (title == null) {
+ title = "";
+ }
+ title = title.replaceAll("[^a-zA-Z0-9._+-]", "_");
return new File(getDir(key), key.getLuid() + "_" + title);
}
return new File(getDir(key), key.getLuid() + "_" + title);
}