Merge pull request #281 from xMohnad/mmrchms-maintenance

Mmrchms maintenance

dart/manga/multisrc/mmrcms/mmrcms.dart

@@ -5,38 +5,30 @@ class MMRCMS extends MProvider {
   MMRCMS({required this.source});
 
   MSource source;
-
+  static final Set<String> latestTitles = <String>{};
   final Client client = Client();
 
+  MManga mangaFromElement(MElement element) {
+    final anchor = element.selectFirst(".media-heading a, .manga-heading a");
+    final link = anchor?.getHref;
+
+    return MManga()
+      ..name = anchor?.text
+      ..imageUrl = guessCover(link, url: element.selectFirst("img")?.getSrc)
+      ..link = link;
+  }
+
   @override
   Future<MPages> getPopular(int page) async {
-    final res =
+    final res = (await client.get(
-        (await client.get(
       Uri.parse(
         "${source.baseUrl}/filterList?page=$page&sortBy=views&asc=false",
       ),
     )).body;
-
+    final document = parseHtml(res);
-    List<MManga> mangaList = [];
+    final mangaList = <MManga>[];
-    final urls = xpath(res, '//*[ @class="chart-title"]/@href');
+    for (final el in document.select("div.chapter-container, div.media")) {
-    final names = xpath(res, '//*[ @class="chart-title"]/text()');
+      final manga = mangaFromElement(el);
-    List<String> images = [];
-    for (var url in urls) {
-      String slug = substringAfterLast(url, '/');
-      if (source.name == "Manga-FR") {
-        images.add("${source.baseUrl}/uploads/manga/${slug}.jpg");
-      } else {
-        images.add(
-          "${source.baseUrl}/uploads/manga/${slug}/cover/cover_250x350.jpg",
-        );
-      }
-    }
-
-    for (var i = 0; i < names.length; i++) {
-      MManga manga = MManga();
-      manga.name = names[i];
-      manga.imageUrl = images[i];
-      manga.link = urls[i];
       mangaList.add(manga);
     }
 
@@ -45,33 +37,23 @@ class MMRCMS extends MProvider {
 
   @override
   Future<MPages> getLatestUpdates(int page) async {
-    final res =
+    if (page == 1) latestTitles.clear();
-        (await client.get(
+
+    final res = (await client.get(
       Uri.parse("${source.baseUrl}/latest-release?page=$page"),
     )).body;
 
-    List<MManga> mangaList = [];
+    final document = parseHtml(res);
-    final urls = xpath(res, '//*[@class="manga-item"]/h3/a/@href');
+    final mangaList = <MManga>[];
-    final names = xpath(res, '//*[@class="manga-item"]/h3/a/text()');
-    List<String> images = [];
-    for (var url in urls) {
-      String slug = substringAfterLast(url, '/');
-      if (source.name == "Manga-FR") {
-        images.add("${source.baseUrl}/uploads/manga/${slug}.jpg");
-      } else {
-        images.add(
-          "${source.baseUrl}/uploads/manga/${slug}/cover/cover_250x350.jpg",
-        );
-      }
-    }
 
-    for (var i = 0; i < names.length; i++) {
+    for (var el in document.select("div.mangalist div.manga-item")) {
-      MManga manga = MManga();
+      final manga = mangaFromElement(el);
-      manga.name = names[i];
+      final link = manga.link;
-      manga.imageUrl = images[i];
+
-      manga.link = urls[i];
+      if (link != null && latestTitles.add(link)) {
         mangaList.add(manga);
       }
+    }
 
     return MPages(mangaList, true);
   }
@@ -120,35 +102,21 @@ class MMRCMS extends MProvider {
         String data = da["data"];
         if (source.name == 'Scan VF') {
           urls.add('${source.baseUrl}/$data');
-        } else if (source.name == 'Manga-FR') {
-          urls.add('${source.baseUrl}/lecture-en-ligne/$data');
         } else {
           urls.add('${source.baseUrl}/manga/$data');
         }
         names.add(value);
-        if (source.name == "Manga-FR") {
-          images.add("${source.baseUrl}/uploads/manga/$data.jpg");
-        } else {
         images.add(
           "${source.baseUrl}/uploads/manga/$data/cover/cover_250x350.jpg",
         );
       }
-      }
     } else {
       urls = xpath(res, '//div/div/div/a/@href');
       names = xpath(res, '//div/div/div/a/text()');
-      for (var url in urls) {
+      for (var mangaUrl in urls) {
-        String slug = substringAfterLast(url, '/');
+        images.add(guessCover(mangaUrl));
-        if (source.name == "Manga-FR") {
-          images.add("${source.baseUrl}/uploads/manga/${slug}.jpg");
-        } else {
-          images.add(
-            "${source.baseUrl}/uploads/manga/${slug}/cover/cover_250x350.jpg",
-          );
       }
     }
-    }
-
     for (var i = 0; i < names.length; i++) {
       MManga manga = MManga();
       manga.name = names[i];
@@ -162,93 +130,87 @@ class MMRCMS extends MProvider {
 
   @override
   Future<MManga> getDetail(String url) async {
-    final statusList = [
-      {
-        "complete": 1,
-        "complet": 1,
-        "completo": 1,
-        "zakończone": 1,
-        "concluído": 1,
-        "مكتملة": 1,
-        "ongoing": 0,
-        "en cours": 0,
-        "em lançamento": 0,
-        "prace w toku": 0,
-        "ativo": 0,
-        "مستمرة": 0,
-        "em andamento": 0,
-      },
-    ];
-    MManga manga = MManga();
     final res = (await client.get(Uri.parse(url))).body;
+    final document = parseHtml(res);
+    final manga = MManga();
 
-    final author = xpath(
+    // Title
-      res,
+    final mangaTitle = document
-      '//*[@class="dl-horizontal"]/dt[contains(text(), "Auteur(s)") or contains(text(), "Author(s)") or contains(text(), "Autor(es)") or contains(text(), "Yazar(lar) or contains(text(), "Mangaka(lar)")]//following-sibling::dd[1]/text()',
+        .selectFirst(".panel-heading, .listmanga-header, .widget-title")
-    );
+        ?.text;
-    if (author.isNotEmpty) {
+    manga.name = mangaTitle;
-      manga.author = author.first;
-    }
-    final status = xpath(
-      res,
-      '//*[@class="dl-horizontal"]/dt[contains(text(), "Statut") or contains(text(), "Status") or contains(text(), "Estado") or contains(text(), "Durum")]/following-sibling::dd[1]/text()',
-    );
-    if (status.isNotEmpty) {
-      manga.status = parseStatus(status.first, statusList);
-    }
 
-    final description = xpath(
+    // Cover
-      res,
+    manga.imageUrl = guessCover(
-      '//*[@class="well" or @class="manga well"]/p/text()',
+      url,
-    );
+      url: document.selectFirst(".row img.img-responsive")?.getSrc,
-    if (description.isNotEmpty) {
-      manga.description = description.first;
-    }
-
-    manga.genre = xpath(
-      res,
-      '//*[@class="dl-horizontal"]/dt[contains(text(), "Categories") or contains(text(), "Categorias") or contains(text(), "Categorías") or contains(text(), "Catégories") or contains(text(), "Kategoriler" or contains(text(), "Kategorie") or contains(text(), "Kategori") or contains(text(), "Tagi"))]/following-sibling::dd[1]/text()',
     );
 
-    var chapUrls = xpath(res, '//*[@class="chapter-title-rtl"]/a/@href');
+    // Description
-    var chaptersNames = xpath(res, '//*[@class="chapter-title-rtl"]/a/text()');
+    manga.description = extractDescription(document);
-    var chaptersDates = xpath(
-      res,
-      '//*[@class="date-chapter-title-rtl"]/text()',
-    );
 
-    var dateUploads = parseDates(
+    document.select('.panel-body h3, .row .dl-horizontal dt').forEach((
-      chaptersDates,
+      element,
-      source.dateFormat,
+    ) {
-      source.dateFormatLocale,
+      final label = _getOwnText(
-    );
+        element,
+      ).toLowerCase().replaceFirst(RegExp(r' :$'), '');
 
+      final valueElement = element.selectFirst('div.text');
+      if (valueElement.text == null)
+        final valueElement = element.nextElementSibling;
+
+      _assignMangaInfo(manga, label, valueElement);
+    });
+
+    // Chapters
     List<MChapter>? chaptersList = [];
-    for (var i = 0; i < chaptersNames.length; i++) {
+    for (var ch in document.select("ul.chapters > li:not(.btn)")) {
-      MChapter chapter = MChapter();
+      chaptersList.add(chapterFromElement(ch, mangaTitle));
-      chapter.name = chaptersNames[i];
-      chapter.url = chapUrls[i];
-      chapter.dateUpload = dateUploads[i];
-      chaptersList.add(chapter);
     }
     manga.chapters = chaptersList;
+
     return manga;
   }
 
+  MChapter chapterFromElement(MElement element, String mangaTitle) {
+    final chapter = MChapter();
+
+    final titleWrapper = element.selectFirst(".chapter-title-rtl");
+    final anchor = titleWrapper?.selectFirst("a");
+
+    if (anchor != null) {
+      chapter.url = anchor.getHref ?? '';
+      chapter.name = cleanChapterName(titleWrapper.text, mangaTitle);
+
+      final dateElement = element.selectFirst(".date-chapter-title-rtl");
+
+      if (dateElement != null && dateElement.text.isNotEmpty) {
+        chapter.dateUpload = parseDates(
+          [dateElement.text],
+          source.dateFormat,
+          source.dateFormatLocale,
+        )[0];
+      } else {
+        chapter.dateUpload = DateTime.now().millisecondsSinceEpoch.toString();
+      }
+    }
+
+    return chapter;
+  }
+
   @override
   Future<List<String>> getPageList(String url) async {
-    final res = (await client.get(Uri.parse(url))).body;
+    final response = await client.get(Uri.parse(url));
+    final document = parseHtml(response.body);
 
     List<String> pagesUrl = [];
-    final pages = xpath(
+    for (var img in document.select('#all img.img-responsive[data-src]')) {
-      res,
+      String? src = img.attr('data-src');
-      '//*[@id="all"]/img[@class="img-responsive"]/@data-src',
+      if (src.startsWith('//')) {
-    );
+        pagesUrl.add('https:${src}');
-    for (var page in pages) {
-      if (page.startsWith('//')) {
-        pagesUrl.add(page.replaceAll('//', 'https://'));
       } else {
-        pagesUrl.add(page);
+        pagesUrl.add(src);
       }
     }
 
@@ -339,6 +301,152 @@ class MMRCMS extends MProvider {
     }
     return "?";
   }
+
+  String guessCover(String mangaUrl, {String? url}) {
+    if (url == null || url?.endsWith("no-image.png")) {
+      String slug = substringAfterLast(mangaUrl, '/');
+      return "${source.baseUrl}/uploads/manga/${slug}/cover/cover_250x350.jpg";
+    } else if (url?.startsWith(source.baseUrl)) {
+      return url;
+    } else {
+      return Uri.parse(source.baseUrl).resolve(url).toString();
+    }
+  }
+
+  String extractDescription(MDocument document) {
+    final container = document.selectFirst(".row .well");
+    if (container == null) return "";
+
+    String text = container.text;
+
+    container.select("h5").forEach((element) {
+      text = text.replaceAll(element.text, "");
+    });
+
+    return text.replaceAll(RegExp(r'\n{3,}'), '\n\n').trim();
+  }
+
+  String _getOwnText(MElement element) {
+    final text = element.text;
+    final childrenText = element.children.map((e) => e.text).join();
+    return text.replaceFirst(childrenText, '').trim();
+  }
+
+  void _assignMangaInfo(MManga manga, String label, MElement valueElement) {
+    if (_detailAuthor.contains(label)) {
+      manga.author = valueElement.text;
+    } else if (_detailArtist.contains(label)) {
+      manga.artist = valueElement.text;
+    } else if (_detailGenre.contains(label)) {
+      manga.genre = valueElement?.select("a").map((e) => e.text).toList;
+    } else if (_detailStatus.contains(label)) {
+      manga.status = parseStatus(valueElement.text, statusList);
+    }
+  }
+
+  String cleanChapterName(String name, String mangaTitle) {
+    const chapterString = "Chapter";
+    const chapterNamePrefix = "";
+
+    try {
+      final initialName = name.replaceFirst(
+        '$chapterNamePrefix$mangaTitle',
+        chapterString,
+      );
+
+      final parts = initialName.split(':');
+
+      if (parts.isEmpty) return name;
+
+      final firstPart = parts[0].trim();
+      if (parts.length == 1) return firstPart;
+
+      final secondPart = parts.sublist(1).join(':').trim();
+
+      return firstPart == secondPart ? firstPart : "$firstPart: $secondPart";
+    } catch (e) {
+      return name;
+    }
+  }
+
+  const _detailAuthor = {
+    'author(s)',
+    'autor(es)',
+    'auteur(s)',
+    '著作',
+    'yazar(lar)',
+    'mangaka(lar)',
+    'pengarang/penulis',
+    'pengarang',
+    'penulis',
+    'autor',
+    'المؤلف',
+    'перевод',
+    'autor/autorzy',
+  };
+
+  const _detailArtist = {
+    'artist(s)',
+    'artiste(s)',
+    'sanatçi(lar)',
+    'artista(s)',
+    'artist(s)/ilustrator',
+    'الرسام',
+    'seniman',
+    'rysownik/rysownicy',
+    'artista',
+  };
+
+  const _detailGenre = {
+    'categories',
+    'categorías',
+    'catégories',
+    'ジャンル',
+    'kategoriler',
+    'categorias',
+    'kategorie',
+    'التصنيفات',
+    'жанр',
+    'kategori',
+    'tagi',
+    'género',
+  };
+
+  const _detailStatus = {
+    'status',
+    'statut',
+    'estado',
+    '状態',
+    'durum',
+    'الحالة',
+    'статус',
+  };
+
+  const statusList = [
+    {
+      // Ongoing Statuses (0)
+      'ongoing': 0,
+      'مستمرة': 0,
+      'en cours': 0,
+      'em lançamento': 0,
+      'prace w toku': 0,
+      'ativo': 0,
+      'em andamento': 0,
+      'activo': 0,
+
+      // Complete Statuses (1)
+      'complete': 1,
+      'مكتملة': 1,
+      'complet': 1,
+      'completo': 1,
+      'zakończone': 1,
+      'concluído': 1,
+      'finalizado': 1,
+
+      // Dropped Statuses (3)
+      'dropped': 3,
+    },
+  ];
 }
 
 MMRCMS main(MSource source) {

dart/manga/multisrc/mmrcms/sources.dart

@@ -1,12 +1,7 @@
 import '../../../../model/source.dart';
 import 'src/scanvf/scanvf.dart';
-import 'src/komikid/komikid.dart';
-import 'src/mangaid/mangaid.dart';
-import 'src/jpmangas/jpmangas.dart';
 import 'src/onma/onma.dart';
 import 'src/readcomicsonline/readcomicsonline.dart';
-import 'src/lelscanvf/lelscanvf.dart';
-import 'src/mangafr/mangafr.dart';
 
 const mmrcmsVersion = "0.0.7";
 const mmrcmsSourceCodeUrl =
@@ -17,20 +12,10 @@ List<Source> _mmrcmsSourcesList =
     [
           //Scan VF (FR)
           scanvfSource,
-          //Komikid (ID)
-          komikidSource,
-          //MangaID (ID)
-          mangaidSource,
-          //Jpmangas (FR)
-          jpmangasSource,
           //مانجا اون لاين (AR)
           onmaSource,
           //Read Comics Online (EN)
           readcomicsonlineSource,
-          //Lelscan-VF (FR)
-          lelscanvfSource,
-          //Manga-FR (FR)
-          mangafrSource,
         ]
         .map(
           (e) =>

dart/manga/multisrc/mmrcms/src/jpmangas/jpmangas.dart

@@ -1,15 +0,0 @@
-import '../../../../../../model/source.dart';
-
-Source get jpmangasSource => _jpmangasSource;
-
-Source _jpmangasSource = Source(
-  name: "Jpmangas",
-  baseUrl: "https://jpmangas.cc",
-  lang: "fr",
-
-  typeSource: "mmrcms",
-  iconUrl:
-      "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/dart/manga/multisrc/mmrcms/src/jpmangas/icon.png",
-  dateFormat: "d MMM. yyyy",
-  dateFormatLocale: "en_us",
-);

dart/manga/multisrc/mmrcms/src/komikid/komikid.dart

@@ -1,15 +0,0 @@
-import '../../../../../../model/source.dart';
-
-Source get komikidSource => _komikidSource;
-
-Source _komikidSource = Source(
-  name: "Komikid",
-  baseUrl: "https://www.komikid.com",
-  lang: "id",
-
-  typeSource: "mmrcms",
-  iconUrl:
-      "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/dart/manga/multisrc/mmrcms/src/komikid/icon.png",
-  dateFormat: "d MMM. yyyy",
-  dateFormatLocale: "en_us",
-);

dart/manga/multisrc/mmrcms/src/lelscanvf/lelscanvf.dart

@@ -1,15 +0,0 @@
-import '../../../../../../model/source.dart';
-
-Source get lelscanvfSource => _lelscanvfSource;
-
-Source _lelscanvfSource = Source(
-  name: "Lelscan-VF",
-  baseUrl: "https://www.lelscanvf.cc/",
-  lang: "fr",
-
-  typeSource: "mmrcms",
-  iconUrl:
-      "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/dart/manga/multisrc/mmrcms/src/lelscanvf/icon.png",
-  dateFormat: "d MMM. yyyy",
-  dateFormatLocale: "en_us",
-);

dart/manga/multisrc/mmrcms/src/mangafr/mangafr.dart

@@ -1,15 +0,0 @@
-import '../../../../../../model/source.dart';
-
-Source get mangafrSource => _mangafrSource;
-
-Source _mangafrSource = Source(
-  name: "Manga-FR",
-  baseUrl: "https://manga-fr.me",
-  lang: "fr",
-
-  typeSource: "mmrcms",
-  iconUrl:
-      "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/dart/manga/multisrc/mmrcms/src/mangafr/icon.png",
-  dateFormat: "d MMM. yyyy",
-  dateFormatLocale: "en_us",
-);

dart/manga/multisrc/mmrcms/src/mangaid/mangaid.dart

@@ -1,15 +0,0 @@
-import '../../../../../../model/source.dart';
-
-Source get mangaidSource => _mangaidSource;
-
-Source _mangaidSource = Source(
-  name: "MangaID",
-  baseUrl: "https://mangaid.click",
-  lang: "id",
-
-  typeSource: "mmrcms",
-  iconUrl:
-      "https://raw.githubusercontent.com/kodjodevf/mangayomi-extensions/$branchName/dart/manga/multisrc/mmrcms/src/mangaid/icon.png",
-  dateFormat: "d MMM. yyyy",
-  dateFormatLocale: "en_us",
-);