Skip to content

Commit 445e332

Browse files
committed
extended Status/Type enums
1 parent 3d57f45 commit 445e332

7 files changed

Lines changed: 53 additions & 6 deletions

File tree

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/**
2+
* Copyright (C) 2018 Joscha Düringer
3+
*
4+
* This program is free software: you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation, either version 3 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* This program is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License
15+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
16+
*/
17+
package net.beardbot.myanimelist.model.adapter;
18+
19+
import javax.xml.bind.annotation.adapters.XmlAdapter;
20+
21+
public class MarkdownAndHtmlRemovalAdapter extends XmlAdapter<String, String> {
22+
@Override
23+
public String unmarshal(String v) throws Exception {
24+
return format(v);
25+
}
26+
27+
@Override
28+
public String marshal(String v) throws Exception {
29+
return v;
30+
}
31+
32+
private static String format(String v){
33+
return v
34+
.replaceAll("<.*?>","")
35+
.replaceAll("\\[.*?]","");
36+
}
37+
}

src/main/java/net/beardbot/myanimelist/model/anime/AnimeListSeriesType.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ public enum AnimeListSeriesType {
2323
@XmlEnumValue("2") OVA("2"),
2424
@XmlEnumValue("3") MOVIE("3"),
2525
@XmlEnumValue("4") SPECIAL("4"),
26-
@XmlEnumValue("5") ONA("5");
26+
@XmlEnumValue("5") ONA("5"),
27+
@XmlEnumValue("6") MUSIC("6");
2728

2829
private String value;
2930

src/main/java/net/beardbot/myanimelist/model/anime/AnimeType.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ public enum AnimeType {
2323
@XmlEnumValue("OVA") OVA("OVA"),
2424
@XmlEnumValue("Movie") MOVIE("Movie"),
2525
@XmlEnumValue("Special") SPECIAL("Special"),
26-
@XmlEnumValue("ONA") ONA("ONA");
26+
@XmlEnumValue("ONA") ONA("ONA"),
27+
@XmlEnumValue("Music") MUSIC("Music");
2728

2829
private String value;
2930

src/main/java/net/beardbot/myanimelist/model/manga/MangaListSeriesStatus.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
@XmlEnum
2525
public enum MangaListSeriesStatus {
2626
@XmlEnumValue("1") PUBLISHING("1"),
27-
@XmlEnumValue("2") FINISHED("2");
27+
@XmlEnumValue("2") FINISHED("2"),
28+
@XmlEnumValue("3") NOT_YET_PUBLISHED("3");
2829

2930
private String value;
3031

src/main/java/net/beardbot/myanimelist/model/manga/MangaListSeriesType.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@
2121
public enum MangaListSeriesType {
2222
@XmlEnumValue("1") MANGA("1"),
2323
@XmlEnumValue("2") NOVEL("2"),
24-
@XmlEnumValue("3") MANHWA("3");
24+
@XmlEnumValue("3") ONE_SHOT("3"),
25+
@XmlEnumValue("4") DOUJINSHI("4"),
26+
@XmlEnumValue("5") MANHWA("5"),
27+
@XmlEnumValue("6") MANHUA("6");
2528

2629
private String value;
2730

src/main/java/net/beardbot/myanimelist/model/manga/MangaStatus.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
@XmlEnum
2525
public enum MangaStatus {
2626
@XmlEnumValue("Publishing") PUBLISHING("Publishing"),
27-
@XmlEnumValue("Finished") FINISHED("Finished");
27+
@XmlEnumValue("Finished") FINISHED("Finished"),
28+
@XmlEnumValue("Not yet published") NOT_YET_PUBLISHED("Not yet published");
2829

2930
private String value;
3031

src/main/java/net/beardbot/myanimelist/model/manga/MangaType.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@
2020

2121
public enum MangaType {
2222
@XmlEnumValue("Manga") MANGA("Manga"),
23+
@XmlEnumValue("Novel") NOVEL("Novel"),
24+
@XmlEnumValue("One-shot") ONE_SHOT("One-shot"),
25+
@XmlEnumValue("Doujinshi") DOUJINSHI("Doujinshi"),
2326
@XmlEnumValue("Manhwa") MANHWA("Manhwa"),
24-
@XmlEnumValue("Novel") NOVEL("Novel");
27+
@XmlEnumValue("Manhua") MANHUA("Manhua");
2528

2629
private String value;
2730

0 commit comments

Comments
 (0)