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
add json lib
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
fanfix
/
supported
/
BasicSupportHelper.java
diff --git
a/src/be/nikiroo/fanfix/supported/BasicSupportHelper.java
b/src/be/nikiroo/fanfix/supported/BasicSupportHelper.java
index 652506762ff6b9cc5aa13f19836d40d04e16bd42..b5c7bb9cdee9ccaf96c1de6c38eeb4aaa76a9537 100644
(file)
--- a/
src/be/nikiroo/fanfix/supported/BasicSupportHelper.java
+++ b/
src/be/nikiroo/fanfix/supported/BasicSupportHelper.java
@@
-16,7
+16,7
@@
import be.nikiroo.utils.Image;
*
* @author niki
*/
*
* @author niki
*/
-class BasicSupportHelper {
+
public
class BasicSupportHelper {
/**
* Get the default cover related to this subject (see <tt>.info</tt> files).
*
/**
* Get the default cover related to this subject (see <tt>.info</tt> files).
*
@@
-25,11
+25,10
@@
class BasicSupportHelper {
*
* @return the cover if any, or NULL
*/
*
* @return the cover if any, or NULL
*/
- public static Image getDefaultCover(String subject) {
- if (subject != null && !subject.isEmpty()
- && Instance.getCoverDir() != null) {
+ public Image getDefaultCover(String subject) {
+ if (subject != null && !subject.isEmpty() && Instance.getInstance().getCoverDir() != null) {
try {
try {
- File fileCover = new File(Instance.getCoverDir(), subject);
+ File fileCover = new File(Instance.get
Instance().get
CoverDir(), subject);
return getImage(null, fileCover.toURI().toURL(), subject);
} catch (MalformedURLException e) {
}
return getImage(null, fileCover.toURI().toURL(), subject);
} catch (MalformedURLException e) {
}
@@
-48,7
+47,7
@@
class BasicSupportHelper {
*
* @return the extensions
*/
*
* @return the extensions
*/
- public
static
String[] getImageExt(boolean emptyAllowed) {
+ public String[] getImageExt(boolean emptyAllowed) {
if (emptyAllowed) {
return new String[] { "", ".png", ".jpg", ".jpeg", ".gif", ".bmp" };
}
if (emptyAllowed) {
return new String[] { "", ".png", ".jpg", ".jpeg", ".gif", ".bmp" };
}
@@
-61,16
+60,17
@@
class BasicSupportHelper {
* refresh the cache with it if it is.
*
* @param support
* refresh the cache with it if it is.
*
* @param support
- * the linked {@link BasicSupport}
+ * the linked {@link BasicSupport}
(can be NULL)
* @param source
* @param source
- * the story source
+ * the source of the story (for image lookup in the same path if
+ * the source is a file, can be NULL)
* @param line
* the resource to check
*
* @return the image if found, or NULL
*
*/
* @param line
* the resource to check
*
* @return the image if found, or NULL
*
*/
- public
static
Image getImage(BasicSupport support, URL source, String line) {
+ public Image getImage(BasicSupport support, URL source, String line) {
URL url = getImageUrl(support, source, line);
if (url != null) {
if ("file".equals(url.getProtocol())) {
URL url = getImageUrl(support, source, line);
if (url != null) {
if ("file".equals(url.getProtocol())) {
@@
-80,7
+80,7
@@
class BasicSupportHelper {
}
InputStream in = null;
try {
}
InputStream in = null;
try {
- in = Instance.getCache().open(url, support, true);
+ in = Instance.get
Instance().get
Cache().open(url, support, true);
return new Image(in);
} catch (IOException e) {
} finally {
return new Image(in);
} catch (IOException e) {
} finally {
@@
-101,16
+101,17
@@
class BasicSupportHelper {
* refresh the cache with it if it is.
*
* @param support
* refresh the cache with it if it is.
*
* @param support
- * the linked {@link BasicSupport}
+ * the linked {@link BasicSupport}
(can be NULL)
* @param source
* @param source
- * the story source
+ * the source of the story (for image lookup in the same path if
+ * the source is a file, can be NULL)
* @param line
* the resource to check
*
* @return the image URL if found, or NULL
*
*/
* @param line
* the resource to check
*
* @return the image URL if found, or NULL
*
*/
- public
static
URL getImageUrl(BasicSupport support, URL source, String line) {
+ public URL getImageUrl(BasicSupport support, URL source, String line) {
URL url = null;
if (line != null) {
URL url = null;
if (line != null) {
@@
-154,8
+155,7
@@
class BasicSupportHelper {
// try for URLs
try {
for (String ext : getImageExt(true)) {
// try for URLs
try {
for (String ext : getImageExt(true)) {
- if (Instance.getCache()
- .check(new URL(line + ext), true)) {
+ if (Instance.getInstance().getCache().check(new URL(line + ext), true)) {
url = new URL(line + ext);
break;
}
url = new URL(line + ext);
break;
}
@@
-166,7
+166,7
@@
class BasicSupportHelper {
for (String ext : getImageExt(true)) {
try {
url = new URL(line + ext);
for (String ext : getImageExt(true)) {
try {
url = new URL(line + ext);
- Instance.getCache().refresh(url, support, true);
+ Instance.get
Instance().get
Cache().refresh(url, support, true);
break;
} catch (IOException e) {
// no image with this ext
break;
} catch (IOException e) {
// no image with this ext
@@
-182,7
+182,7
@@
class BasicSupportHelper {
// refresh the cached file
if (url != null) {
try {
// refresh the cached file
if (url != null) {
try {
- Instance.getCache().refresh(url, support, true);
+ Instance.get
Instance().get
Cache().refresh(url, support, true);
} catch (IOException e) {
// woops, broken image
url = null;
} catch (IOException e) {
// woops, broken image
url = null;
@@
-201,10
+201,10
@@
class BasicSupportHelper {
*
* @return the author without prefixes
*/
*
* @return the author without prefixes
*/
- public
static
String fixAuthor(String author) {
+ public String fixAuthor(String author) {
if (author != null) {
for (String suffix : new String[] { " ", ":" }) {
if (author != null) {
for (String suffix : new String[] { " ", ":" }) {
- for (String byString : Instance.get
Config().getList(Config.
BYS)) {
+ for (String byString : Instance.get
Instance().getConfig().getList(Config.CONF_
BYS)) {
byString += suffix;
if (author.toUpperCase().startsWith(byString.toUpperCase())) {
author = author.substring(byString.length()).trim();
byString += suffix;
if (author.toUpperCase().startsWith(byString.toUpperCase())) {
author = author.substring(byString.length()).trim();