X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FText.java;h=fb4a0ad2a7d97c73dcbe37a025df58a0e8f931c4;hb=656139845c36feb3d3c68ec78978b8d80b315a1b;hp=79ee85187abadde363ed1c4fc93c98508f1e2973;hpb=16a81ef7656c5c692fb831927e75edde25dd77a0;p=nikiroo-utils.git
diff --git a/src/be/nikiroo/fanfix/supported/Text.java b/src/be/nikiroo/fanfix/supported/Text.java
index 79ee851..fb4a0ad 100644
--- a/src/be/nikiroo/fanfix/supported/Text.java
+++ b/src/be/nikiroo/fanfix/supported/Text.java
@@ -28,12 +28,12 @@ import be.nikiroo.utils.Progress;
* number
*
A description of the story must be given as chapter number 0
* A cover may be present, with the same filename but a PNG, JPEG or JPG
- * extension
*
*
* @author niki
*/
-class Text extends BasicSupport {
+class Text extends BasicSupport_Deprecated {
@Override
protected boolean isHtml() {
return false;
@@ -123,7 +123,7 @@ class Text extends BasicSupport {
author = authorDate.substring(0, pos);
}
- return fixAuthor(author);
+ return BasicSupportHelper.fixAuthor(author);
}
private String getDate(InputStream in) {
@@ -236,20 +236,55 @@ class Text extends BasicSupport {
@Override
protected boolean supports(URL url) {
+ return supports(url, false);
+ }
+
+ /**
+ * Check if we supports this {@link URL}, that is, if the info file can be
+ * found OR not found.
+ *
+ * @param url
+ * the {@link URL} to check
+ * @param info
+ * TRUE to require the info file, FALSE to forbid the info file
+ *
+ * @return TRUE if it is supported
+ */
+ protected boolean supports(URL url, boolean info) {
+ boolean infoPresent = false;
if ("file".equals(url.getProtocol())) {
File file;
try {
file = new File(url.toURI());
+ file = assureNoTxt(file);
file = new File(file.getPath() + ".info");
} catch (URISyntaxException e) {
Instance.getTraceHandler().error(e);
file = null;
}
- return file == null || !file.exists();
+ infoPresent = (file != null && file.exists());
}
- return false;
+ return infoPresent == info;
+ }
+
+ /**
+ * Remove the ".txt" extension if it is present.
+ *
+ * @param file
+ * the file to process
+ *
+ * @return the same file or a copy of it without the ".txt" extension if it
+ * was present
+ */
+ protected File assureNoTxt(File file) {
+ if (file.getName().endsWith(".txt")) {
+ file = new File(file.getPath().substring(0,
+ file.getPath().length() - 4));
+ }
+
+ return file;
}
/**