git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix creation date format
[nikiroo-utils.git]
/
supported
/
InfoReader.java
diff --git
a/supported/InfoReader.java
b/supported/InfoReader.java
index 15a4f5c4e7bc1234e45d157411fb6279eb7b9ac5..206464f45a0a2e7c989e6fa6719afa22ca61c9cb 100644
(file)
--- a/
supported/InfoReader.java
+++ b/
supported/InfoReader.java
@@
-9,8
+9,6
@@
import java.util.ArrayList;
import java.util.List;
import java.util.Scanner;
import java.util.List;
import java.util.Scanner;
-import org.jsoup.nodes.Document;
-
import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.bundles.Config;
import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.bundles.Config;
import be.nikiroo.fanfix.data.MetaData;
@@
-36,6
+34,13
@@
public class InfoReader {
MetaData meta = createMeta(infoFile.toURI().toURL(), in,
withCover);
MetaData meta = createMeta(infoFile.toURI().toURL(), in,
withCover);
+ // Some old .info files were using UUID for URL...
+ if (!hasIt(meta.getUrl()) && meta.getUuid() != null
+ && (meta.getUuid().startsWith("http://")
+ || meta.getUuid().startsWith("https://"))) {
+ meta.setUrl(meta.getUuid());
+ }
+
// Some old .info files don't have those now required fields...
// So we check if we can find the info in another way (many
// formats have a copy of the original text file)
// Some old .info files don't have those now required fields...
// So we check if we can find the info in another way (many
// formats have a copy of the original text file)
@@
-133,7
+138,7
@@
public class InfoReader {
meta.setTitle(getInfoTag(in, "TITLE"));
meta.setAuthor(getInfoTag(in, "AUTHOR"));
meta.setTitle(getInfoTag(in, "TITLE"));
meta.setAuthor(getInfoTag(in, "AUTHOR"));
- meta.setDate(
getInfoTag(in, "DATE"
));
+ meta.setDate(
bsHelper.formatDate(getInfoTag(in, "DATE")
));
meta.setTags(getInfoTagList(in, "TAGS", ","));
meta.setSource(getInfoTag(in, "SOURCE"));
meta.setUrl(getInfoTag(in, "URL"));
meta.setTags(getInfoTagList(in, "TAGS", ","));
meta.setSource(getInfoTag(in, "SOURCE"));
meta.setUrl(getInfoTag(in, "URL"));
@@
-159,7
+164,8
@@
public class InfoReader {
} catch (NumberFormatException e) {
meta.setWords(0);
}
} catch (NumberFormatException e) {
meta.setWords(0);
}
- meta.setCreationDate(getInfoTag(in, "CREATION_DATE"));
+ meta.setCreationDate(
+ bsHelper.formatDate(getInfoTag(in, "CREATION_DATE")));
meta.setFakeCover(Boolean.parseBoolean(getInfoTag(in, "FAKE_COVER")));
if (withCover && meta.getCover() == null) {
meta.setFakeCover(Boolean.parseBoolean(getInfoTag(in, "FAKE_COVER")));
if (withCover && meta.getCover() == null) {
@@
-254,11
+260,21
@@
public class InfoReader {
String value = getLine(in, key, 0);
if (value != null && !value.isEmpty()) {
value = value.trim().substring(key.length() - 1).trim();
String value = getLine(in, key, 0);
if (value != null && !value.isEmpty()) {
value = value.trim().substring(key.length() - 1).trim();
- if (value.startsWith("'") && value.endsWith("'")
- || value.startsWith("\"") && value.endsWith("\"")) {
+ if (value.length() > 1 && //
+ (value.startsWith("'") && value.endsWith("'")
+ || value.startsWith("\"")
+ && value.endsWith("\""))) {
value = value.substring(1, value.length() - 1).trim();
}
value = value.substring(1, value.length() - 1).trim();
}
+ // Some old files ended up with TITLE="'xxxxx'"
+ if ("^TITLE=".equals(key)) {
+ if (value.startsWith("'") && value.endsWith("'")
+ && value.length() > 1) {
+ value = value.substring(1, value.length() - 1).trim();
+ }
+ }
+
return value;
}
}
return value;
}
}