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
Add test files
[fanfix.git]
/
src
/
be
/
nikiroo
/
fanfix
/
supported
/
Text.java
diff --git
a/src/be/nikiroo/fanfix/supported/Text.java
b/src/be/nikiroo/fanfix/supported/Text.java
index 67156956ee14d1389197d02b888b02b1f4a34336..25d7899a61ef1caf7f042053499b28dc87530fa3 100644
(file)
--- a/
src/be/nikiroo/fanfix/supported/Text.java
+++ b/
src/be/nikiroo/fanfix/supported/Text.java
@@
-1,6
+1,5
@@
package be.nikiroo.fanfix.supported;
package be.nikiroo.fanfix.supported;
-import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@
-14,6
+13,7
@@
import java.util.Scanner;
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;
+import be.nikiroo.utils.Image;
import be.nikiroo.utils.Progress;
/**
import be.nikiroo.utils.Progress;
/**
@@
-28,12
+28,12
@@
import be.nikiroo.utils.Progress;
* number</li>
* <li>A description of the story must be given as chapter number 0</li>
* <li>A cover may be present, with the same filename but a PNG, JPEG or JPG
* number</li>
* <li>A description of the story must be given as chapter number 0</li>
* <li>A cover may be present, with the same filename but a PNG, JPEG or JPG
- * extension</li
<
+ * extension</li
>
* </ul>
*
* @author niki
*/
* </ul>
*
* @author niki
*/
-class Text extends BasicSupport {
+class Text extends BasicSupport
_Deprecated
{
@Override
protected boolean isHtml() {
return false;
@Override
protected boolean isHtml() {
return false;
@@
-57,7
+57,7
@@
class Text extends BasicSupport {
meta.setPublisher("");
meta.setUuid(source.toString());
meta.setLuid("");
meta.setPublisher("");
meta.setUuid(source.toString());
meta.setLuid("");
- meta.setLang(getLang(
source,
reset(in))); // default is EN
+ meta.setLang(getLang(reset(in))); // default is EN
meta.setSubject(getSubject(source));
meta.setType(getType().toString());
meta.setImageDocument(false);
meta.setSubject(getSubject(source));
meta.setType(getType().toString());
meta.setImageDocument(false);
@@
-77,7
+77,7
@@
class Text extends BasicSupport {
}
}
- private String getLang(
URL source, InputStream in) throws IOException
{
+ private String getLang(
InputStream in)
{
@SuppressWarnings("resource")
Scanner scan = new Scanner(in, "UTF-8");
scan.useDelimiter("\\n");
@SuppressWarnings("resource")
Scanner scan = new Scanner(in, "UTF-8");
scan.useDelimiter("\\n");
@@
-103,14
+103,14
@@
class Text extends BasicSupport {
return lang;
}
return lang;
}
- private String getTitle(InputStream in)
throws IOException
{
+ private String getTitle(InputStream in) {
@SuppressWarnings("resource")
Scanner scan = new Scanner(in, "UTF-8");
scan.useDelimiter("\\n");
return scan.next();
}
@SuppressWarnings("resource")
Scanner scan = new Scanner(in, "UTF-8");
scan.useDelimiter("\\n");
return scan.next();
}
- private String getAuthor(InputStream in)
throws IOException
{
+ private String getAuthor(InputStream in) {
@SuppressWarnings("resource")
Scanner scan = new Scanner(in, "UTF-8");
scan.useDelimiter("\\n");
@SuppressWarnings("resource")
Scanner scan = new Scanner(in, "UTF-8");
scan.useDelimiter("\\n");
@@
-123,10
+123,10
@@
class Text extends BasicSupport {
author = authorDate.substring(0, pos);
}
author = authorDate.substring(0, pos);
}
- return fixAuthor(author);
+ return
BasicSupportHelper.
fixAuthor(author);
}
}
- private String getDate(InputStream in)
throws IOException
{
+ private String getDate(InputStream in) {
@SuppressWarnings("resource")
Scanner scan = new Scanner(in, "UTF-8");
scan.useDelimiter("\\n");
@SuppressWarnings("resource")
Scanner scan = new Scanner(in, "UTF-8");
scan.useDelimiter("\\n");
@@
-151,12
+151,12
@@
class Text extends BasicSupport {
return getChapterContent(source, in, 0, null);
}
return getChapterContent(source, in, 0, null);
}
- private
BufferedImage getCover(URL source) throws IOException
{
+ private
Image getCover(URL source)
{
String path;
try {
path = new File(source.toURI()).getPath();
} catch (URISyntaxException e) {
String path;
try {
path = new File(source.toURI()).getPath();
} catch (URISyntaxException e) {
- Instance.
syser
r(e);
+ Instance.
getTraceHandler().erro
r(e);
path = null;
}
path = null;
}
@@
-188,14
+188,17
@@
class Text extends BasicSupport {
final URL value = source;
final String key = chapName;
chaps.add(new Entry<String, URL>() {
final URL value = source;
final String key = chapName;
chaps.add(new Entry<String, URL>() {
+ @Override
public URL setValue(URL value) {
return null;
}
public URL setValue(URL value) {
return null;
}
+ @Override
public URL getValue() {
return value;
}
public URL getValue() {
return value;
}
+ @Override
public String getKey() {
return key;
}
public String getKey() {
return key;
}
@@
-239,7
+242,7
@@
class Text extends BasicSupport {
file = new File(url.toURI());
file = new File(file.getPath() + ".info");
} catch (URISyntaxException e) {
file = new File(url.toURI());
file = new File(file.getPath() + ".info");
} catch (URISyntaxException e) {
- Instance.
syser
r(e);
+ Instance.
getTraceHandler().erro
r(e);
file = null;
}
file = null;
}