From 986dc9fed99301b1759aeb481c1b01afda5a39bf Mon Sep 17 00:00:00 2001 From: KoalaBear Date: Sat, 6 Nov 2021 23:05:08 +0100 Subject: [PATCH] - Add support for /cheems/GDIndex, /cheems/goindex-extended --- src/OpenDirectoryDownloader/DirectoryParser.cs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/OpenDirectoryDownloader/DirectoryParser.cs b/src/OpenDirectoryDownloader/DirectoryParser.cs index f83b9018..1d0c5f80 100644 --- a/src/OpenDirectoryDownloader/DirectoryParser.cs +++ b/src/OpenDirectoryDownloader/DirectoryParser.cs @@ -76,11 +76,6 @@ public static async Task ParseHtml(WebDirectory webDirectory, stri return await GoIndexParser.ParseIndex(httpClient, webDirectory); } - if (htmlDocument.QuerySelector("script[src*=\"gdindex\" i]") != null) - { - return await GdIndexParser.ParseIndex(httpClient, webDirectory, html); - } - if (htmlDocument.QuerySelector("script[src*=\"Bhadoo-Drive-Index\" i]") != null || htmlDocument.QuerySelector("script[src*=\"/AjmalShajahan97/goindex\" i]") != null || htmlDocument.QuerySelector("script[src*=\"/LeeluPradhan/G-Index\" i]") != null || @@ -91,7 +86,9 @@ public static async Task ParseHtml(WebDirectory webDirectory, stri htmlDocument.QuerySelector("script[src*=\"/RemixDev/goindex\" i]") != null || htmlDocument.QuerySelector("script[src*=\"/Virusia/Fia-Terminal\" i]") != null || htmlDocument.QuerySelector("script[src*=\"/sawankumar/Google-Drive-Index-III\" i]") != null || - htmlDocument.QuerySelector("script[src*=\"/goIndex-theme-nexmoe\" i]") != null) + htmlDocument.QuerySelector("script[src*=\"/goIndex-theme-nexmoe\" i]") != null || + htmlDocument.QuerySelector("script[src*=\"/cheems/GDIndex\" i]") != null || + htmlDocument.QuerySelector("script[src*=\"/cheems/goindex-extended\" i]") != null) { return await BhadooIndexParser.ParseIndex(htmlDocument, httpClient, webDirectory); } @@ -108,7 +105,12 @@ public static async Task ParseHtml(WebDirectory webDirectory, stri return await GoIndexParser.ParseIndex(httpClient, webDirectory); } - htmlDocument.QuerySelectorAll("#sidebar").ToList().ForEach(e => e.Remove()); + if (htmlDocument.QuerySelector("script[src*=\"gdindex\" i]") != null) + { + return await GdIndexParser.ParseIndex(httpClient, webDirectory, html); + } + + htmlDocument.QuerySelectorAll("#sidebar").ToList().ForEach(e => e.Remove()); htmlDocument.QuerySelectorAll("nav").ToList().ForEach(e => e.Remove()); // The order of the checks is very important!