Merge pull request #19 from chytanka/develop

rodzyk · web-flow · commit fd0f9959f191 · 2024-08-13T15:10:08.000+03:00
Develop
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -24,6 +24,8 @@ export const REDDIT_PATH = `reddit`;
 export const READ_PATH = `read`;
 export const LIST_PATH = `list`;
 export const ZENKO_PATH = `zenko`;
+export const NHENTAI_PATH = `nhentai`;
+export const COMICK_PATH = `comick`;
 
 const routes: Routes = [
   {
@@ -58,6 +60,14 @@ const routes: Routes = [
     path: ZENKO_PATH,
     loadChildren: () => import('./zenko/zenko.module').then(m => m.ZenkoModule)
   },
+  {
+    path: NHENTAI_PATH,
+    loadChildren: () => import('./nhentai/nhentai.module').then(m => m.NhentaiModule)
+  },
+  {
+    path: COMICK_PATH,
+    loadChildren: () => import('./comick/comick.module').then(m => m.ComickModule)
+  },
   {
     matcher: urlMatcher,
     loadChildren: () => import('./link-parser/link-parser.module').then(m => m.LinkParserModule)
diff --git a/src/app/comick/comick-routing.module.ts b/src/app/comick/comick-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { ComickShellComponent } from './comick-shell/comick-shell.component';
+
+const routes: Routes = [
+  { path: '', redirectTo: '/', pathMatch: 'full' },
+  {
+    path: ':id',
+    component: ComickShellComponent
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class ComickRoutingModule { }
diff --git a/src/app/comick/comick-shell/comick-shell.component.html b/src/app/comick/comick-shell/comick-shell.component.html
@@ -0,0 +1,8 @@
+<app-common-read [episode$]="episode$" [error$]="error$" [loading$]="loading$" (refreshData)="refreshData()"
+    [playlist]="playlistService.playlist()" [playlistLink]="playlistLink()" [currentPlaylistItem]="currentPlItem()">
+
+    <p>{{lang.ph().imagesVia}}<a href="https://nhentai.net" target="_blank" rel="noopener noreferrer">Nhentai</a>
+        API.
+        {{lang.ph().thanks}}<br>{{lang.ph().detalisCopy}}</p>
+
+</app-common-read>
diff --git a/src/app/comick/comick-shell/comick-shell.component.scss b/src/app/comick/comick-shell/comick-shell.component.scss
diff --git a/src/app/comick/comick-shell/comick-shell.component.ts b/src/app/comick/comick-shell/comick-shell.component.ts
@@ -0,0 +1,39 @@
+import { Component, inject, OnDestroy } from '@angular/core';
+import { ComickService } from '../data-access/comick.service';
+import { switchMap, of } from 'rxjs';
+import { ReadBaseComponent } from '../../common/common-read';
+import { Base64 } from '../../shared/utils';
+import { COMICK_PATH } from '../../app-routing.module';
+
+@Component({
+  selector: 'app-comick-shell',
+  templateUrl: './comick-shell.component.html',
+  styleUrl: './comick-shell.component.scss'
+})
+export class ComickShellComponent extends ReadBaseComponent implements OnDestroy {
+  comick = inject(ComickService)
+
+  override episode$ = this.combineParamMapAndRefresh()
+    .pipe(this.tapStartLoading(),
+      switchMap(([params]) => {
+        const pathParam = params?.get('id');
+
+        if (!pathParam) return of(null);
+
+        const path = (Base64.isBase64(pathParam)) ? Base64.fromBase64(pathParam) : pathParam;
+
+        return (this.comick.getComposition(path)).pipe(this.catchError(), this.tapSetTitle(),
+          this.tapSaveToHistory(COMICK_PATH, path),
+          this.tapSaveToCurrentPlaylistItem(COMICK_PATH, path),
+          this.finalizeLoading());
+      })
+    );
+
+  constructor() {
+    super()
+  }
+
+  ngOnDestroy(): void {
+    this.plObserv?.unsubscribe();
+  }
+}
diff --git a/src/app/comick/comick.module.ts b/src/app/comick/comick.module.ts
@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { ComickRoutingModule } from './comick-routing.module';
+import { ComickShellComponent } from './comick-shell/comick-shell.component';
+import { CommonReadModule } from '../common/common-read';
+
+
+@NgModule({
+  declarations: [
+    ComickShellComponent
+  ],
+  imports: [
+    CommonModule,
+    ComickRoutingModule,
+    CommonReadModule
+  ]
+})
+export class ComickModule { }
diff --git a/src/app/comick/data-access/comick.service.ts b/src/app/comick/data-access/comick.service.ts
@@ -0,0 +1,42 @@
+import { HttpClient } from '@angular/common/http';
+import { inject, Injectable } from '@angular/core';
+import { Observable, map } from 'rxjs';
+import { environment } from '../../../environments/environment';
+import { CompositionEpisode } from '../../common/common-read';
+import { Base64 } from '../../shared/utils';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ComickService {
+  http: HttpClient = inject(HttpClient)
+
+  getComposition(id: string): Observable<CompositionEpisode> {
+    // environment.proxy + Base64.toBase64
+    return this.http.get<any>((environment.comickHost + id))
+      .pipe(map((data) => { return this.map(data) }))
+  }
+
+  map(data: any): CompositionEpisode {
+    const nsfw = data.matureContent;
+    const mappedResponse = {
+      title: data.chapTitle,
+      nsfw: nsfw, //['erotica', 'suggestive'].includes(data.chapter.md_comics.content_rating),
+      images: (data.chapter.md_images.map((item: any, index: number) => {
+        return {
+          src: `https://meo3.comick.pictures/${item.b2key}`,
+          height: item.h,
+          width: item.w
+        };
+      })).filter((i: any) => i.src)
+        // .map((img: any) => {
+        //   return {
+        //     src: environment.proxy + Base64.toBase64(`${img.src}`)
+        //   }
+        // })
+
+    };
+
+    return mappedResponse;
+  }
+}
diff --git a/src/app/link-parser/link-parser/link-parser.component.ts b/src/app/link-parser/link-parser/link-parser.component.ts
@@ -1,11 +1,12 @@
 import { Component, Signal, ViewChild, WritableSignal, computed, effect, inject, signal } from '@angular/core';
 import { LinkParserService } from '../data-access/link-parser.service';
-import {ZenkoLinkParser, ImgurLinkParser, JsonLinkParser, MangadexLinkParser, RedditLinkParser, TelegraphLinkParser } from '../utils';
+import {ZenkoLinkParser, ImgurLinkParser, JsonLinkParser, MangadexLinkParser, RedditLinkParser, TelegraphLinkParser, NhentaiLinkParser } from '../utils';
 import { ActivatedRoute, Router } from '@angular/router';
 import { LangService } from '../../shared/data-access/lang.service';
 import { Base64 } from '../../shared/utils';
 import { Title } from '@angular/platform-browser';
 import { LinkParserSettingsService } from '../data-access/link-parser-settings.service';
+import { ComickLinkParser } from '../utils/comick-link-parser';
 
 @Component({
   selector: 'app-link-parser',
@@ -46,6 +47,8 @@ export class LinkParserComponent {
     this.parser.parsers.push(new TelegraphLinkParser)
     this.parser.parsers.push(new RedditLinkParser)
     this.parser.parsers.push(new ZenkoLinkParser)
+    this.parser.parsers.push(new NhentaiLinkParser)
+    this.parser.parsers.push(new ComickLinkParser)
     this.parser.parsers.push(new JsonLinkParser)
   }
 
@@ -114,6 +117,8 @@ export class LinkParserComponent {
     imgur: '//imgur.com/favicon.ico',
     mangadex: '//mangadex.org/favicon.ico',
     telegraph: '//telegra.ph/favicon.ico',
+    nhentai: '//nhentai.net/favicon.ico',
+    comick: '//comick.io/favicon.ico',
     read: 'data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>🗯️</text></svg>'
   }
 
diff --git a/src/app/link-parser/ui/footer/footer.component.ts b/src/app/link-parser/ui/footer/footer.component.ts
@@ -25,7 +25,7 @@ const SOCIAL_LINKS: any[] = [
   styleUrl: './footer.component.scss'
 })
 export class FooterComponent {
-  public readonly version: string = 'v2024.7.14'
+  public readonly version: string = 'v2024.8.13'
   public lang: LangService = inject(LangService);
 
   public social: any[] = SOCIAL_LINKS;
diff --git a/src/app/link-parser/utils/comick-link-parser.ts b/src/app/link-parser/utils/comick-link-parser.ts
@@ -0,0 +1,6 @@
+import { LinkParser } from "./link-parser";
+
+export class ComickLinkParser extends LinkParser {
+    override regex = /comick\.io\/comic\/(?:[\w-]+)\/(\w+)/;
+    override site = 'comick';
+};
diff --git a/src/app/link-parser/utils/index.ts b/src/app/link-parser/utils/index.ts
@@ -4,4 +4,5 @@ export * from './mangadex-link-parser';
 export * from './json-link-parser';
 export * from './telegraph-link-parser';
 export * from './reddit-link-parser';
-export * from './zenko-link-parser';
+export * from './zenko-link-parser';
+export * from './nhentai-link-parser'
diff --git a/src/app/link-parser/utils/nhentai-link-parser.ts b/src/app/link-parser/utils/nhentai-link-parser.ts
@@ -0,0 +1,6 @@
+import { LinkParser } from "./link-parser";
+
+export class NhentaiLinkParser extends LinkParser {
+    override regex = /nhentai\.(?:net|to)\/g\/(\d+)/;
+    override site = 'nhentai';
+};
diff --git a/src/app/list/list-shell/list-shell.component.ts b/src/app/list/list-shell/list-shell.component.ts
@@ -1,8 +1,9 @@
 import { Component, EffectCleanupRegisterFn, WritableSignal, computed, effect, inject, signal } from '@angular/core';
 import { LinkParserService } from '../../link-parser/data-access/link-parser.service';
-import { ImgurLinkParser, JsonLinkParser, LinkParser, MangadexLinkParser, RedditLinkParser, TelegraphLinkParser, ZenkoLinkParser } from '../../link-parser/utils';
+import { ImgurLinkParser, JsonLinkParser, LinkParser, MangadexLinkParser, NhentaiLinkParser, RedditLinkParser, TelegraphLinkParser, ZenkoLinkParser } from '../../link-parser/utils';
 import { DomManipulationService } from '../../shared/data-access';
 import { LangService } from '../../shared/data-access/lang.service';
+import { ComickLinkParser } from '../../link-parser/utils/comick-link-parser';
 
 
 @Component({
@@ -86,6 +87,8 @@ export class ListShellComponent {
     this.parser.parsers.push(new TelegraphLinkParser)
     this.parser.parsers.push(new RedditLinkParser)
     this.parser.parsers.push(new ZenkoLinkParser)
+    this.parser.parsers.push(new NhentaiLinkParser)
+    this.parser.parsers.push(new ComickLinkParser)
     this.parser.parsers.push(new JsonLinkParser)
   }
 
diff --git a/src/app/nhentai/data-access/nhentai.service.ts b/src/app/nhentai/data-access/nhentai.service.ts
@@ -0,0 +1,41 @@
+import { HttpClient } from '@angular/common/http';
+import { inject, Injectable } from '@angular/core';
+import { Observable, map } from 'rxjs';
+import { environment } from '../../../environments/environment';
+import { CompositionEpisode } from '../../common/common-read';
+import { Base64 } from '../../shared/utils';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class NhentaiService {
+  http: HttpClient = inject(HttpClient)
+
+  getComposition(id: string): Observable<CompositionEpisode> {
+    return this.http.get<any>(environment.proxy + Base64.toBase64(environment.nhentaiHost + id))
+      .pipe(map((data) => { return this.map(data) }))
+  }
+
+  imageType = new Map<string, string>().set('p', 'png').set('j', 'jpg').set('g', 'gif')
+
+  map(data: any): CompositionEpisode {
+    const mediaId = data.media_id;
+    const mappedResponse = {
+      title: data.title.pretty,
+      nsfw: true,
+      images: (data.images.pages.map((item: any, index: number) => {
+        return {
+          src: `https://i7.nhentai.net/galleries/${mediaId}/${index + 1}.${this.imageType.get(item.t)}`,
+          height: item.h,
+          width: item.w
+        };
+      })).filter((i: any) => i.src)
+        .map((img: any) => {
+          return { src: environment.proxy + Base64.toBase64(`${img.src}`) }
+        })
+
+    };
+
+    return mappedResponse;
+  }
+}
diff --git a/src/app/nhentai/nhentai-routing.module.ts b/src/app/nhentai/nhentai-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { NhentaiShellComponent } from './nhentai-shell/nhentai-shell.component';
+
+const routes: Routes = [
+  { path: '', redirectTo: '/', pathMatch: 'full' },
+  {
+    path: ':id',
+    component: NhentaiShellComponent
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class NhentaiRoutingModule { }
diff --git a/src/app/nhentai/nhentai-shell/nhentai-shell.component.html b/src/app/nhentai/nhentai-shell/nhentai-shell.component.html
@@ -0,0 +1,8 @@
+<app-common-read [episode$]="episode$" [error$]="error$" [loading$]="loading$" (refreshData)="refreshData()"
+    [playlist]="playlistService.playlist()" [playlistLink]="playlistLink()" [currentPlaylistItem]="currentPlItem()">
+
+    <p>{{lang.ph().imagesVia}}<a href="https://nhentai.net" target="_blank" rel="noopener noreferrer">Nhentai</a>
+        API.
+        {{lang.ph().thanks}}<br>{{lang.ph().detalisCopy}}</p>
+
+</app-common-read>
diff --git a/src/app/nhentai/nhentai-shell/nhentai-shell.component.scss b/src/app/nhentai/nhentai-shell/nhentai-shell.component.scss
diff --git a/src/app/nhentai/nhentai-shell/nhentai-shell.component.ts b/src/app/nhentai/nhentai-shell/nhentai-shell.component.ts
@@ -0,0 +1,39 @@
+import { Component, inject, OnDestroy } from '@angular/core';
+import { NhentaiService } from '../data-access/nhentai.service';
+import { switchMap, of } from 'rxjs';
+import { NHENTAI_PATH } from '../../app-routing.module';
+import { Base64 } from '../../shared/utils';
+import { ReadBaseComponent } from '../../common/common-read';
+
+@Component({
+  selector: 'app-nhentai-shell',
+  templateUrl: './nhentai-shell.component.html',
+  styleUrl: './nhentai-shell.component.scss'
+})
+export class NhentaiShellComponent extends ReadBaseComponent implements OnDestroy {
+  nhentai = inject(NhentaiService)
+
+  override episode$ = this.combineParamMapAndRefresh()
+    .pipe(this.tapStartLoading(),
+      switchMap(([params]) => {
+        const pathParam = params?.get('id');
+
+        if (!pathParam) return of(null);
+
+        const path = (Base64.isBase64(pathParam)) ? Base64.fromBase64(pathParam) : pathParam;
+
+        return (this.nhentai.getComposition(path)).pipe(this.catchError(), this.tapSetTitle(),
+          this.tapSaveToHistory(NHENTAI_PATH, path),
+          this.tapSaveToCurrentPlaylistItem(NHENTAI_PATH, path),
+          this.finalizeLoading());
+      })
+    );
+
+  constructor() {
+    super()
+  }
+
+  ngOnDestroy(): void {
+    this.plObserv?.unsubscribe();
+  }
+}
diff --git a/src/app/nhentai/nhentai.module.ts b/src/app/nhentai/nhentai.module.ts
@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { NhentaiRoutingModule } from './nhentai-routing.module';
+import { NhentaiShellComponent } from './nhentai-shell/nhentai-shell.component';
+import { CommonReadModule } from '../common/common-read';
+
+
+@NgModule({
+  declarations: [
+    NhentaiShellComponent
+  ],
+  imports: [
+    CommonModule,
+    NhentaiRoutingModule,
+    CommonReadModule
+  ]
+})
+export class NhentaiModule { }
diff --git a/src/app/shared/ui/viewer/viewer.component.html b/src/app/shared/ui/viewer/viewer.component.html
@@ -29,7 +29,7 @@
                 [labelDisagree]="lang.ph().nsfwLabelDisagree" />
             }
             <figure [class]="{nsfw:episode?.nsfw, show: episode?.nsfw && showNsfw()}">
-                <img [id]="'page_'+(i+1)" [src]="img.src" [alt]="img.alt" [width]="img.width ?? 1000"
+                <img crossorigin="anonymous" [id]="'page_'+(i+1)" [src]="img.src" [alt]="img.alt" [width]="img.width ?? 1000"
                     [height]="img.height ?? 1000" [loading]="(i==0 || preLoad(i)) ? 'eager' : 'lazy'">
             </figure>
         </div>
diff --git a/src/app/zenko/data-access/zenko.service.ts b/src/app/zenko/data-access/zenko.service.ts
@@ -22,11 +22,11 @@ export class ZenkoService {
 
       publisher: {
         id: data.publisher.id as string,
-        site: data.publisher.id as string,
+        site: `https://zenko.online/teams/`+data.publisher.id as string,
         name: data.publisher.name as string,
         avatar: environment.proxy + Base64.toBase64(`https://zenko.b-cdn.net/${data.publisher.avatar}?optimizer=image&width=900&quality=90&height=auto`) as string,
         description: data.publisher.description as string,
-        links: data.publisher.links.map((l: any) => { return { link: l.link, title: l.title }; })
+        links: data.publisher.links?.map((l: any) => { return { link: l.link, title: l.title }; })
       } as unknown as CompositionPublisher,
 
       images: (data.pages.map((item: any) => {
diff --git a/src/environments/environment.development.ts b/src/environments/environment.development.ts
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
