Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update MangaPlus connector #7175

Closed
wants to merge 1 commit into from
Closed

Update MangaPlus connector #7175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions src/web/mjs/connectors/ShueishaMangaPlus.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default class ShueishaMangaPlus extends Publus {

async _getMangaFromURI(uri) {
let id = uri.pathname.match(/\/(\d+)$/)[1];
uri = new URL('/api/title_detail', this.apiURL);
uri = new URL('/api/title_detailV3', this.apiURL);
uri.searchParams.set('title_id', id);
let request = new Request(uri, this.requestOptions);
let data = await this.fetchPROTO(request, this.protoTypes, this.rootType);
Expand All @@ -33,31 +33,32 @@ export default class ShueishaMangaPlus extends Publus {
}

async _getMangas() {
let request = new Request(new URL('/api/title_list/all', this.apiURL), this.requestOptions);
let request = new Request(new URL('/api/title_list/allV2', this.apiURL), this.requestOptions);
let data = await this.fetchPROTO(request, this.protoTypes, this.rootType);
return data.success.allTitlesView.titles.map(manga => {
return data.success.allTitlesViewV2.allTitlesGroup.flatMap(mangaGroup => mangaGroup.titles.map(manga => {
return {
id: manga.titleId,
title: `${manga.name} ${this._getLanguage(manga.language)}`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you should update language array

image

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i hate pictures of text (but i still love your PR), episode 65536:
0: '[en]', 1: '[es]', 2: '[fr]', 3: '[id]', 4: '[pt-br]', 5: '[ru]', 6: '[th]', 7: '[de]', 8: '[unk]', 9: '[vi]'
PS: what is this unk lang? i don't see it on shueisha manga list....

Copy link
Contributor

@MikeZeDev MikeZeDev Jul 31, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasnt able to find the language for 8. But since we have a 9 we ought to have a 8 .

};
});
}));
}

async _getChapters(manga) {
let uri = new URL('/api/title_detail', this.apiURL);
let uri = new URL('/api/title_detailV3', this.apiURL);
uri.searchParams.set('title_id', manga.id);
let request = new Request(uri, this.requestOptions);
let data = await this.fetchPROTO(request, this.protoTypes, this.rootType);
return [
...data.success.titleDetailView.firstChapterList || [],
...data.success.titleDetailView.lastChapterList || []
return data.success.titleDetailView.chapterListGroup.flatMap(chapterGroup => [
...chapterGroup.firstChapterList || [],
...chapterGroup.midChapterList || [],
...chapterGroup.lastChapterList || []
].map(chapter => {
return {
id: chapter.chapterId,
title: chapter.subTitle || chapter.name,
language: ''
};
}).reverse();
})).reverse();
}

async _getPages(chapter) {
Expand Down
59 changes: 58 additions & 1 deletion src/web/mjs/connectors/ShueishaMangaPlus.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Based on: https://mangaplus.shueisha.co.jp/js/app.a3091b24.js

package MangaPlus;
syntax = "proto3";
//syntax = "proto3";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any reason why you removed this?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for the record, i kept it uncommented, it still works without any error or warning in console...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. Just remove the comment then. Its like that in other proto files afaik, Better keep things similar.


message AdNetworkList {
repeated AdNetwork adNetworks = 1;
Expand Down Expand Up @@ -193,6 +193,28 @@ message AllTitlesView {
repeated Title titles = 1;
}

message Tag {
optional string tag = 1;
optional string slug = 2;
}

message Label {
optional int32 label = 1;
optional string description = 2;
}

message AllTitlesGroup {
optional string theTitle = 1;
repeated Title titles = 2;
repeated Tag tags = 3;
repeated Label labels = 4;
optional uint32 nextChapterStartTimestamp = 5;
}

message AllTitlesViewV2 {
repeated AllTitlesGroup allTitlesGroup = 1;
}

message CommentListView {
repeated Comment comments = 1;
optional bool ifSetUserName = 2;
Expand Down Expand Up @@ -274,6 +296,22 @@ message SubscribedTitlesView {
}

message TitleDetailView {
// message PublisherItem {
// TODO
// }
message ChapterGroup {
optional string chapterNumbers = 1;
repeated Chapter firstChapterList = 2;
repeated Chapter midChapterList = 3;
repeated Chapter lastChapterList = 4;
}
// message TitleLanguages {
// TODO
// }
// message TitleLabels {
// TODO
// }

optional Title title = 1;
optional string titleImageUrl = 2;
optional string overview = 3;
Expand All @@ -292,6 +330,24 @@ message TitleDetailView {
optional int32 rating = 16;
optional bool chaptersDescending = 17;
optional uint32 numberOfViews = 18;
// repeated PublisherItem publisherItems = 19;
repeated Banner titleBanners = 20;
// optional UserTickets userTickets = 21;
repeated Chapter ticketChapterList = 22;
repeated Title ticketTitleList = 23;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have the feeling than many of those are useless for our code. I think they can be omited, and protobuf will just skip them

https://github.com/manga-download/hakuneko/blob/51faa0238acf24d654d01293ea6763eaa1b073ce/src/web/mjs/connectors/ShueishaMangaPlus.proto

optional bool hasChaptersBetween = 24;
optional Banner publisherBanner = 25;
optional AdNetworkList advertisement = 26;
// repeated TitleLanguages titleLanguages = 27;
repeated ChapterGroup chapterListGroup = 28;
// optional FreeViewDialogue freeViewDialogue = 29;
optional string regionCode = 30;
repeated Tag tags = 31;
// optional TitleLabels titleLabels = 32;
// optional Subscription subscription = 33;
optional Label label = 34;
optional bool isFirstTimeFree = 35;
// optional MetaInfo metaInfo = 36;
}

message TitleRankingView {
Expand Down Expand Up @@ -332,6 +388,7 @@ message SuccessResult {
optional ServiceAnnouncementsView serviceAnnouncementsView = 15;
optional InitialView initialView = 16;
optional FeedbackView feedbackView = 17;
optional AllTitlesViewV2 allTitlesViewV2 = 25;
}

message WebHomeView {
Expand Down
Loading