From cfdaf6052ddc5ca44cf19f1f6d9f154cc8443024 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Wed, 20 May 2020 14:12:34 +0200 Subject: [PATCH] code cleanup / jdoc --- src/be/nikiroo/fanfix/data/MetaData.java | 111 ++++++++++++++---- src/be/nikiroo/fanfix/library/Template.java | 9 -- .../fanfix/supported/BasicSupport.java | 5 + .../supported/BasicSupport_Deprecated.java | 5 + src/be/nikiroo/fanfix/supported/E621.java | 3 - src/be/nikiroo/fanfix/supported/EHentai.java | 3 - .../nikiroo/fanfix/supported/Fanfiction.java | 3 - .../nikiroo/fanfix/supported/Fimfiction.java | 3 - .../fanfix/supported/FimfictionApi.java | 3 - src/be/nikiroo/fanfix/supported/MangaHub.java | 3 - src/be/nikiroo/fanfix/supported/MangaLel.java | 3 - src/be/nikiroo/fanfix/supported/Text.java | 3 - src/be/nikiroo/fanfix/supported/YiffStar.java | 3 - 13 files changed, 98 insertions(+), 59 deletions(-) diff --git a/src/be/nikiroo/fanfix/data/MetaData.java b/src/be/nikiroo/fanfix/data/MetaData.java index 2e34ef98..1c6ad428 100644 --- a/src/be/nikiroo/fanfix/data/MetaData.java +++ b/src/be/nikiroo/fanfix/data/MetaData.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import be.nikiroo.fanfix.supported.SupportType; import be.nikiroo.utils.Image; import be.nikiroo.utils.StringUtils; @@ -85,7 +86,7 @@ public class MetaData implements Cloneable, Comparable, Serializable { } /** - * The story publication date. + * The story publication date, we try to use "YYYY-mm-dd" when possible. * * @return the date */ @@ -94,7 +95,7 @@ public class MetaData implements Cloneable, Comparable, Serializable { } /** - * The story publication date. + * The story publication date, we try to use "YYYY-mm-dd" when possible. * * @param date * the date to set @@ -152,7 +153,7 @@ public class MetaData implements Cloneable, Comparable, Serializable { } /** - * The cover image of the story if any (can be NULL). + * The cover image of the story, if any (can be NULL). *

* The cover is not fetched until the story is. * @@ -163,7 +164,7 @@ public class MetaData implements Cloneable, Comparable, Serializable { } /** - * The cover image of the story if any (can be NULL). + * The cover image of the story, if any (can be NULL). *

* The cover is not fetched until the story is. * @@ -175,7 +176,7 @@ public class MetaData implements Cloneable, Comparable, Serializable { } /** - * The subject of the story (or instance, if it is a fanfiction, what is the + * The subject of the story (for instance, if it is a fanfiction, what is the * original work; if it is a technical text, what is the technical * subject...). * @@ -198,7 +199,11 @@ public class MetaData implements Cloneable, Comparable, Serializable { } /** - * The source of this story (which online library it was downloaded from). + * The source of this story -- a very user-visible piece of data. + *

+ * It is initialised with the same value as {@link MetaData#getPublisher()}, + * but the user is allowed to change it into any value -- this is a sort of + * 'category'. * * @return the source */ @@ -207,7 +212,11 @@ public class MetaData implements Cloneable, Comparable, Serializable { } /** - * The source of this story (which online library it was downloaded from). + * The source of this story -- a very user-visible piece of data. + *

+ * It is initialised with the same value as {@link MetaData#getPublisher()}, + * but the user is allowed to change it into any value -- this is a sort of + * 'category'. * * @param source * the source to set @@ -255,7 +264,14 @@ public class MetaData implements Cloneable, Comparable, Serializable { } /** - * A unique value representing the story in the local library. + * A unique value representing the story in the local library (usually a + * numerical value 0-padded with a minimum size of 3; but this is subject to + * change and you can also obviously have more than 1000 stories -- + * a luid may potentially be anything else, including non-numeric + * characters). + *

+ * A NULL or empty luid represents an incomplete, corrupted or fake + * {@link Story}. * * @return the luid */ @@ -264,7 +280,14 @@ public class MetaData implements Cloneable, Comparable, Serializable { } /** - * A unique value representing the story in the local library. + * A unique value representing the story in the local library (usually a + * numerical value 0-padded with a minimum size of 3; but this is subject to + * change and you can also obviously have more than 1000 stories -- + * a luid may potentially be anything else, including non-numeric + * characters). + *

+ * A NULL or empty luid represents an incomplete, corrupted or fake + * {@link Story}. * * @param luid * the luid to set @@ -293,7 +316,15 @@ public class MetaData implements Cloneable, Comparable, Serializable { } /** - * The story publisher (other the same as the source). + * The story publisher -- which is also the user representation of the + * output type this {@link Story} is in (see {@link SupportType}). + *

+ * It allows you to know where the {@link Story} comes from, and is not + * supposed to change. + *

+ * It's the user representation of the enum + * ({@link SupportType#getSourceName()}, not + * {@link SupportType#toString()}). * * @return the publisher */ @@ -302,7 +333,15 @@ public class MetaData implements Cloneable, Comparable, Serializable { } /** - * The story publisher (other the same as the source). + * The story publisher -- which is also the user representation of the + * output type this {@link Story} is in (see {@link SupportType}). + *

+ * It allows you to know where the {@link Story} comes from, and is not + * supposed to change. + *

+ * It's the user representation of the enum + * ({@link SupportType#getSourceName()}, not + * {@link SupportType#toString()}). * * @param publisher * the publisher to set @@ -312,7 +351,14 @@ public class MetaData implements Cloneable, Comparable, Serializable { } /** - * The output type this {@link Story} is in. + * The output type this {@link Story} is in (see {@link SupportType}). + *

+ * It allows you to know where the {@link Story} comes from, and is not + * supposed to change. + *

+ * It's the direct representation of the enum + * ({@link SupportType#toString()}, not + * {@link SupportType#getSourceName()}). * * @return the type the type */ @@ -321,7 +367,14 @@ public class MetaData implements Cloneable, Comparable, Serializable { } /** - * The output type this {@link Story} is in. + * The output type this {@link Story} is in (see {@link SupportType}). + *

+ * It allows you to know where the {@link Story} comes from, and is not + * supposed to change. + *

+ * It's the direct representation of the enum + * ({@link SupportType#toString()}, not + * {@link SupportType#getSourceName()}). * * @param type * the new type to set @@ -332,6 +385,10 @@ public class MetaData implements Cloneable, Comparable, Serializable { /** * Document catering mostly to image files. + *

+ * I.E., this is a comics or a manga, not a textual story with actual words. + *

+ * In image documents, all the paragraphs are supposed to be images. * * @return the imageDocument state */ @@ -341,6 +398,10 @@ public class MetaData implements Cloneable, Comparable, Serializable { /** * Document catering mostly to image files. + *

+ * I.E., this is a comics or a manga, not a textual story with actual words. + *

+ * In image documents, all the paragraphs are supposed to be images. * * @param imageDocument * the imageDocument state to set @@ -350,45 +411,49 @@ public class MetaData implements Cloneable, Comparable, Serializable { } /** - * The number of words in the related {@link Story}. + * The number of words (or images if this is an image document -- see + * {@link MetaData#isImageDocument()}) in the related {@link Story}. * - * @return the number of words + * @return the number of words/images */ public long getWords() { return words; } /** - * The number of words in the related {@link Story}. + * The number of words (or images if this is an image document -- see + * {@link MetaData#isImageDocument()}) in the related {@link Story}. * * @param words - * the number of words to set + * the number of words/images to set */ public void setWords(long words) { this.words = words; } /** - * The (Fanfix) {@link Story} creation date. + * The (Fanfix) {@link Story} creation date, i.e., when the {@link Story} + * was fetched via Fanfix. * - * @return the creationDate + * @return the creation date */ public String getCreationDate() { return creationDate; } /** - * The (Fanfix) {@link Story} creation date. + * The (Fanfix) {@link Story} creation date, i.e., when the {@link Story} + * was fetched via Fanfix. * * @param creationDate - * the creationDate to set + * the creation date to set */ public void setCreationDate(String creationDate) { this.creationDate = creationDate; } /** - * The cover in this {@link MetaData} object is "fake", in the sens that it + * The cover in this {@link MetaData} object is "fake", in the sense that it * comes from the actual content images. * * @return TRUE for a fake cover @@ -398,7 +463,7 @@ public class MetaData implements Cloneable, Comparable, Serializable { } /** - * The cover in this {@link MetaData} object is "fake", in the sens that it + * The cover in this {@link MetaData} object is "fake", in the sense that it * comes from the actual content images * * @param fakeCover diff --git a/src/be/nikiroo/fanfix/library/Template.java b/src/be/nikiroo/fanfix/library/Template.java index 2dfbacfe..3536d5f1 100644 --- a/src/be/nikiroo/fanfix/library/Template.java +++ b/src/be/nikiroo/fanfix/library/Template.java @@ -66,15 +66,6 @@ public class Template { } InputStream in = IOUtils.openResource(location, name); - - InputStream stream; - - stream = IOUtils.openResource(location, name); - System.out.println("SOURCE = ((" + IOUtils.readSmallStream(stream) + "))"); - stream=new ReplaceInputStream(IOUtils.openResource(location, name), from, to); - System.out.println("RESULT = ((" + IOUtils.readSmallStream(stream) + "))"); - - return new ReplaceInputStream(in, from, to); } diff --git a/src/be/nikiroo/fanfix/supported/BasicSupport.java b/src/be/nikiroo/fanfix/supported/BasicSupport.java index 56a3bb80..bcfcca1b 100644 --- a/src/be/nikiroo/fanfix/supported/BasicSupport.java +++ b/src/be/nikiroo/fanfix/supported/BasicSupport.java @@ -272,7 +272,12 @@ public abstract class BasicSupport { pg.setProgress(30); Story story = new Story(); + MetaData meta = getMeta(); + meta.setType(getType().toString()); + meta.setSource(getType().getSourceName()); + meta.setPublisher(getType().getSourceName()); + if (meta.getCreationDate() == null || meta.getCreationDate().trim().isEmpty()) { meta.setCreationDate(bsHelper diff --git a/src/be/nikiroo/fanfix/supported/BasicSupport_Deprecated.java b/src/be/nikiroo/fanfix/supported/BasicSupport_Deprecated.java index 40ff3fc0..9aac6d5c 100644 --- a/src/be/nikiroo/fanfix/supported/BasicSupport_Deprecated.java +++ b/src/be/nikiroo/fanfix/supported/BasicSupport_Deprecated.java @@ -203,7 +203,12 @@ public abstract class BasicSupport_Deprecated extends BasicSupport { pg.setProgress(30); Story story = new Story(); + MetaData meta = getMeta(url, getInput()); + meta.setType(getType().toString()); + meta.setSource(getType().getSourceName()); + meta.setPublisher(getType().getSourceName()); + if (meta.getCreationDate() == null || meta.getCreationDate().trim().isEmpty()) { meta.setCreationDate(bsHelper.formatDate( diff --git a/src/be/nikiroo/fanfix/supported/E621.java b/src/be/nikiroo/fanfix/supported/E621.java index a5660179..f3a7238e 100644 --- a/src/be/nikiroo/fanfix/supported/E621.java +++ b/src/be/nikiroo/fanfix/supported/E621.java @@ -62,14 +62,11 @@ class E621 extends BasicSupport { meta.setAuthor(getAuthor()); meta.setDate(bsHelper.formatDate(getDate())); meta.setTags(getTags()); - meta.setSource(getType().getSourceName()); meta.setUrl(getSource().toString()); - meta.setPublisher(getType().getSourceName()); meta.setUuid(getSource().toString()); meta.setLuid(""); meta.setLang("en"); meta.setSubject("Furry"); - meta.setType(getType().toString()); meta.setImageDocument(true); meta.setCover(getCover()); meta.setFakeCover(true); diff --git a/src/be/nikiroo/fanfix/supported/EHentai.java b/src/be/nikiroo/fanfix/supported/EHentai.java index 3c734329..399ce913 100644 --- a/src/be/nikiroo/fanfix/supported/EHentai.java +++ b/src/be/nikiroo/fanfix/supported/EHentai.java @@ -34,14 +34,11 @@ class EHentai extends BasicSupport_Deprecated { meta.setAuthor(getAuthor(reset(in))); meta.setDate(getDate(reset(in))); meta.setTags(getTags(reset(in))); - meta.setSource(getType().getSourceName()); meta.setUrl(source.toString()); - meta.setPublisher(getType().getSourceName()); meta.setUuid(source.toString()); meta.setLuid(""); meta.setLang(getLang(reset(in))); meta.setSubject("Hentai"); - meta.setType(getType().toString()); meta.setImageDocument(true); meta.setCover(getCover(source, reset(in))); meta.setFakeCover(true); diff --git a/src/be/nikiroo/fanfix/supported/Fanfiction.java b/src/be/nikiroo/fanfix/supported/Fanfiction.java index 16b44f80..060705ca 100644 --- a/src/be/nikiroo/fanfix/supported/Fanfiction.java +++ b/src/be/nikiroo/fanfix/supported/Fanfiction.java @@ -40,14 +40,11 @@ class Fanfiction extends BasicSupport_Deprecated { meta.setAuthor(getAuthor(reset(in))); meta.setDate(getDate(reset(in))); meta.setTags(getTags(reset(in))); - meta.setSource(getType().getSourceName()); meta.setUrl(source.toString()); - meta.setPublisher(getType().getSourceName()); meta.setUuid(source.toString()); meta.setLuid(""); meta.setLang("en"); // TODO find language of book meta.setSubject(getSubject(reset(in))); - meta.setType(getType().toString()); meta.setImageDocument(false); meta.setCover(getCover(source, reset(in))); diff --git a/src/be/nikiroo/fanfix/supported/Fimfiction.java b/src/be/nikiroo/fanfix/supported/Fimfiction.java index 77267c11..b5df2618 100644 --- a/src/be/nikiroo/fanfix/supported/Fimfiction.java +++ b/src/be/nikiroo/fanfix/supported/Fimfiction.java @@ -38,14 +38,11 @@ class Fimfiction extends BasicSupport_Deprecated { meta.setAuthor(getAuthor(reset(in))); meta.setDate(getDate(reset(in))); meta.setTags(getTags(reset(in))); - meta.setSource(getType().getSourceName()); meta.setUrl(source.toString()); - meta.setPublisher(getType().getSourceName()); meta.setUuid(source.toString()); meta.setLuid(""); meta.setLang("en"); meta.setSubject("MLP"); - meta.setType(getType().toString()); meta.setImageDocument(false); meta.setCover(getCover(reset(in))); diff --git a/src/be/nikiroo/fanfix/supported/FimfictionApi.java b/src/be/nikiroo/fanfix/supported/FimfictionApi.java index e6dd6118..cdb13214 100644 --- a/src/be/nikiroo/fanfix/supported/FimfictionApi.java +++ b/src/be/nikiroo/fanfix/supported/FimfictionApi.java @@ -127,14 +127,11 @@ class FimfictionApi extends BasicSupport { meta.setDate(bsHelper.formatDate( getKeyJson(json, 0, "type", "story", "date_published"))); meta.setTags(getTags()); - meta.setSource(getType().getSourceName()); meta.setUrl(getSource().toString()); - meta.setPublisher(getType().getSourceName()); meta.setUuid(getSource().toString()); meta.setLuid(""); meta.setLang("en"); meta.setSubject("MLP"); - meta.setType(getType().toString()); meta.setImageDocument(false); String coverImageLink = getKeyJson(json, 0, "type", "story", diff --git a/src/be/nikiroo/fanfix/supported/MangaHub.java b/src/be/nikiroo/fanfix/supported/MangaHub.java index 706a5911..7ba12b97 100644 --- a/src/be/nikiroo/fanfix/supported/MangaHub.java +++ b/src/be/nikiroo/fanfix/supported/MangaHub.java @@ -39,14 +39,11 @@ class MangaHub extends BasicSupport { meta.setDate(""); meta.setAuthor(getAuthor()); meta.setTags(getTags()); - meta.setSource(getType().getSourceName()); meta.setUrl(getSource().toString()); - meta.setPublisher(getType().getSourceName()); meta.setUuid(getSource().toString()); meta.setLuid(""); meta.setLang("en"); meta.setSubject("manga"); - meta.setType(getType().toString()); meta.setImageDocument(true); meta.setCover(getCover()); diff --git a/src/be/nikiroo/fanfix/supported/MangaLel.java b/src/be/nikiroo/fanfix/supported/MangaLel.java index 5910a371..47efad85 100644 --- a/src/be/nikiroo/fanfix/supported/MangaLel.java +++ b/src/be/nikiroo/fanfix/supported/MangaLel.java @@ -34,14 +34,11 @@ class MangaLel extends BasicSupport { meta.setAuthor(getAuthor()); meta.setDate(bsHelper.formatDate(getDate())); meta.setTags(getTags()); - meta.setSource(getType().getSourceName()); meta.setUrl(getSource().toString()); - meta.setPublisher(getType().getSourceName()); meta.setUuid(getSource().toString()); meta.setLuid(""); meta.setLang("fr"); meta.setSubject("manga"); - meta.setType(getType().toString()); meta.setImageDocument(true); meta.setCover(getCover()); diff --git a/src/be/nikiroo/fanfix/supported/Text.java b/src/be/nikiroo/fanfix/supported/Text.java index 71e30c32..252aca04 100644 --- a/src/be/nikiroo/fanfix/supported/Text.java +++ b/src/be/nikiroo/fanfix/supported/Text.java @@ -85,14 +85,11 @@ class Text extends BasicSupport { meta.setAuthor(getAuthor()); meta.setDate(bsHelper.formatDate(getDate())); meta.setTags(new ArrayList()); - meta.setSource(getType().getSourceName()); meta.setUrl(getSourceFile().toURI().toURL().toString()); - meta.setPublisher(""); meta.setUuid(getSourceFile().toString()); meta.setLuid(""); meta.setLang(getLang()); // default is EN meta.setSubject(getSourceFile().getParentFile().getName()); - meta.setType(getType().toString()); meta.setImageDocument(false); meta.setCover(getCover(getSourceFile())); diff --git a/src/be/nikiroo/fanfix/supported/YiffStar.java b/src/be/nikiroo/fanfix/supported/YiffStar.java index 6974e9ae..498b7d9a 100644 --- a/src/be/nikiroo/fanfix/supported/YiffStar.java +++ b/src/be/nikiroo/fanfix/supported/YiffStar.java @@ -34,14 +34,11 @@ class YiffStar extends BasicSupport_Deprecated { meta.setAuthor(getAuthor(reset(in))); meta.setDate(""); meta.setTags(getTags(reset(in))); - meta.setSource(getType().getSourceName()); meta.setUrl(source.toString()); - meta.setPublisher(getType().getSourceName()); meta.setUuid(source.toString()); meta.setLuid(""); meta.setLang("en"); meta.setSubject("Furry"); - meta.setType(getType().toString()); meta.setImageDocument(false); meta.setCover(getCover(source, reset(in))); -- 2.27.0