Skip to content

Commit

Permalink
Deploying to gh-pages from @ 21937e1 🚀
Browse files Browse the repository at this point in the history
  • Loading branch information
milesoc committed Jun 18, 2024
1 parent 2a4f109 commit 5d44bb8
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 13 deletions.
18 changes: 12 additions & 6 deletions personal-changes/MangaDex/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3470,7 +3470,7 @@ class MangaDex {
if (json.data === undefined) {
throw new Error(`Failed to parse json results for section ${section.section.title}`);
}
section.section.items = await this.appendCoverArt((0, MangaDexParser_1.parseChapterListToManga)(json.data, [], this), MangaDexSettings_1.getHomepageThumbnail);
section.section.items = await this.appendCoverArt((0, MangaDexParser_1.parseChapterListToManga)(json.data, this), MangaDexSettings_1.getHomepageThumbnail);
sectionCallback(section.section);
}
else {
Expand Down Expand Up @@ -3558,14 +3558,15 @@ class MangaDex {
metadata: { offset: offset + 100, collectedIds }
});
}
async appendCoverArt(sourceMangaAsync, thumbnailSelector) {
async appendCoverArt(sourceMangaAsync, thumbnailSelector, offset = 0) {
return sourceMangaAsync.then((sourceManga) => {
const request = App.createRequest({
url: new MangaDexHelper_1.URLBuilder(this.MANGADEX_API)
.addPathComponent('cover')
.addQueryParameter('manga', sourceManga.map((manga) => manga.mangaId))
.addQueryParameter('includes', ['manga'])
.addQueryParameter('limit', 100)
.addQueryParameter('offset', offset)
.addQueryParameter('order', { volume: 'asc' })
.buildUrl(),
method: 'GET'
Expand All @@ -3576,6 +3577,14 @@ class MangaDex {
return sourceManga;
}
const json = (typeof response.data === 'string') ? JSON.parse(response.data) : response.data;
const total = Number(json.total);
const limit = Number(json.limit);
const offset = Number(json.offset);
if (total > limit + offset) {
return (0, MangaDexParser_1.addFileNamesToManga)(sourceManga, json.data, this, thumbnailSelector).then((manga) => {
return this.appendCoverArt(Promise.resolve(manga), thumbnailSelector, offset + limit);
});
}
return (0, MangaDexParser_1.addFileNamesToManga)(sourceManga, json.data, this, thumbnailSelector);
});
});
Expand Down Expand Up @@ -4037,12 +4046,9 @@ const parseMangaList = async (object, source, thumbnailSelector) => {
return results;
};
exports.parseMangaList = parseMangaList;
const parseChapterListToManga = async (chapters, alreadyFound, source) => {
const parseChapterListToManga = async (chapters, source) => {
const results = [];
const discoveredManga = new Set();
// for (const foundId of alreadyFound) {
// discoveredManga.add(foundId)
// }
for (const chapter of chapters) {
const mangaRelationship = chapter.relationships.filter((x) => x.type == 'manga')[0];
if (mangaRelationship === undefined) {
Expand Down
18 changes: 12 additions & 6 deletions personal-changes/MangaDex/source.js
Original file line number Diff line number Diff line change
Expand Up @@ -3470,7 +3470,7 @@ class MangaDex {
if (json.data === undefined) {
throw new Error(`Failed to parse json results for section ${section.section.title}`);
}
section.section.items = await this.appendCoverArt((0, MangaDexParser_1.parseChapterListToManga)(json.data, [], this), MangaDexSettings_1.getHomepageThumbnail);
section.section.items = await this.appendCoverArt((0, MangaDexParser_1.parseChapterListToManga)(json.data, this), MangaDexSettings_1.getHomepageThumbnail);
sectionCallback(section.section);
}
else {
Expand Down Expand Up @@ -3558,14 +3558,15 @@ class MangaDex {
metadata: { offset: offset + 100, collectedIds }
});
}
async appendCoverArt(sourceMangaAsync, thumbnailSelector) {
async appendCoverArt(sourceMangaAsync, thumbnailSelector, offset = 0) {
return sourceMangaAsync.then((sourceManga) => {
const request = App.createRequest({
url: new MangaDexHelper_1.URLBuilder(this.MANGADEX_API)
.addPathComponent('cover')
.addQueryParameter('manga', sourceManga.map((manga) => manga.mangaId))
.addQueryParameter('includes', ['manga'])
.addQueryParameter('limit', 100)
.addQueryParameter('offset', offset)
.addQueryParameter('order', { volume: 'asc' })
.buildUrl(),
method: 'GET'
Expand All @@ -3576,6 +3577,14 @@ class MangaDex {
return sourceManga;
}
const json = (typeof response.data === 'string') ? JSON.parse(response.data) : response.data;
const total = Number(json.total);
const limit = Number(json.limit);
const offset = Number(json.offset);
if (total > limit + offset) {
return (0, MangaDexParser_1.addFileNamesToManga)(sourceManga, json.data, this, thumbnailSelector).then((manga) => {
return this.appendCoverArt(Promise.resolve(manga), thumbnailSelector, offset + limit);
});
}
return (0, MangaDexParser_1.addFileNamesToManga)(sourceManga, json.data, this, thumbnailSelector);
});
});
Expand Down Expand Up @@ -4037,12 +4046,9 @@ const parseMangaList = async (object, source, thumbnailSelector) => {
return results;
};
exports.parseMangaList = parseMangaList;
const parseChapterListToManga = async (chapters, alreadyFound, source) => {
const parseChapterListToManga = async (chapters, source) => {
const results = [];
const discoveredManga = new Set();
// for (const foundId of alreadyFound) {
// discoveredManga.add(foundId)
// }
for (const chapter of chapters) {
const mangaRelationship = chapter.relationships.filter((x) => x.type == 'manga')[0];
if (mangaRelationship === undefined) {
Expand Down
2 changes: 1 addition & 1 deletion personal-changes/versioning.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"buildTime":"2024-06-18T16:12:41.156Z","sources":[{"id":"BatoTo","name":"BatoTo","author":"niclimcy","desc":"Extension that pulls manga from bato.to","website":"https://github.com/niclimcy","contentRating":"MATURE","version":"3.1.2","icon":"icon.png","tags":[{"text":"Multi Language","type":"default"}],"websiteBaseURL":"https://bato.to","intents":53},{"id":"Hentai2Read","name":"Hentai2Read","author":"EmZedH","desc":"Extension that pulls manga from hentai2read.com","website":"https://github.com/EmZedH","contentRating":"ADULT","version":"1.0.1","icon":"icon.png","tags":[{"text":"18+","type":"warning"}],"websiteBaseURL":"https://hentai2read.com","intents":5},{"id":"MangaDex","name":"MangaDex","author":"Nar1n & Netsky","desc":"Extension that pulls manga from MangaDex","website":"https://github.com/nar1n","contentRating":"EVERYONE","version":"3.0.5","icon":"icon.png","tags":[],"websiteBaseURL":"https://mangadex.org","intents":37},{"id":"MangaPlus","name":"MangaPlus","author":"Rinto-kun","desc":"Extension that pulls manga from Manga+ by Shueisha","website":"https://github.com/Rinto-kun","contentRating":"EVERYONE","version":"2.0.2","icon":"icon.png","tags":[],"websiteBaseURL":"https://mangaplus.shueisha.co.jp","intents":53},{"id":"NHentai","name":"nhentai","author":"NotMarek & Netsky","desc":"Extension which pulls content from nHentai.","website":"https://github.com/TheNetsky","contentRating":"ADULT","version":"4.0.7","icon":"icon.png","tags":[{"text":"18+","type":"warning"}],"websiteBaseURL":"https://nhentai.net","intents":53}],"builtWith":{"toolchain":"0.8.0-alpha.47","types":"0.8.0-alpha.47"}}
{"buildTime":"2024-06-18T19:13:23.098Z","sources":[{"id":"BatoTo","name":"BatoTo","author":"niclimcy","desc":"Extension that pulls manga from bato.to","website":"https://github.com/niclimcy","contentRating":"MATURE","version":"3.1.2","icon":"icon.png","tags":[{"text":"Multi Language","type":"default"}],"websiteBaseURL":"https://bato.to","intents":53},{"id":"Hentai2Read","name":"Hentai2Read","author":"EmZedH","desc":"Extension that pulls manga from hentai2read.com","website":"https://github.com/EmZedH","contentRating":"ADULT","version":"1.0.1","icon":"icon.png","tags":[{"text":"18+","type":"warning"}],"websiteBaseURL":"https://hentai2read.com","intents":5},{"id":"MangaDex","name":"MangaDex","author":"Nar1n & Netsky","desc":"Extension that pulls manga from MangaDex","website":"https://github.com/nar1n","contentRating":"EVERYONE","version":"3.0.5","icon":"icon.png","tags":[],"websiteBaseURL":"https://mangadex.org","intents":37},{"id":"MangaPlus","name":"MangaPlus","author":"Rinto-kun","desc":"Extension that pulls manga from Manga+ by Shueisha","website":"https://github.com/Rinto-kun","contentRating":"EVERYONE","version":"2.0.2","icon":"icon.png","tags":[],"websiteBaseURL":"https://mangaplus.shueisha.co.jp","intents":53},{"id":"NHentai","name":"nhentai","author":"NotMarek & Netsky","desc":"Extension which pulls content from nHentai.","website":"https://github.com/TheNetsky","contentRating":"ADULT","version":"4.0.7","icon":"icon.png","tags":[{"text":"18+","type":"warning"}],"websiteBaseURL":"https://nhentai.net","intents":53}],"builtWith":{"toolchain":"0.8.0-alpha.47","types":"0.8.0-alpha.47"}}

0 comments on commit 5d44bb8

Please sign in to comment.