Merge branch 'okolobaxa:master' into master

DataParser.cs

@@ -31,15 +31,9 @@ public static async ValueTask<PageData> GetPageData(ArchiveRecord record)
  {
  var body = await client.GetStringAsync(urlVariant);
 
- var pageCount = GetPageCount(body);
- if (pageCount == 0)
- {
- continue;
- }
+ var pageUrls = GetPageUrls(body);
 
- var pageUrls = GetPageUrls(body, pageCount);
-
- return new PageData(pageUrls.ToArray(), pageCount, urlVariant);
+ return new PageData(pageUrls, pageUrls.Count, urlVariant);
  }
  catch (HttpRequestException)
  {
@@ -71,9 +65,9 @@ from urlVariant in urlVariants
  return combinations.ToArray();
  }
 
- private static IReadOnlyCollection<string> GetPageUrls(string body, int pageCount)
+ private static IReadOnlyCollection<string> GetPageUrls(string body)
  {
- var urls = new List<string>(pageCount);
+ var urls = new List<string>();
  const string token = "data-original=\"";
 
  var position = 0;

Program.cs

@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Reflection;
 using System.Threading.Tasks;
@@ -135,7 +137,7 @@ record = record with { End = pageData.PageCount };
  {
  for (int i = record.Start; i <= record.End; i++)
  {
- var url = $"https://cgamos.ru{pageData.PageUrls[i - 1]}";
+ var url = $"https://cgamos.ru{pageData.PageUrls.ElementAt(i - 1)}";
 
  var pbar = mainProgressBar.Spawn(100, $"Скачивание {url}", progressBarOptions);
 
@@ -178,11 +180,11 @@ private static string GetFileName(string url)
  // '/images/MB_LS/01-0203-0745-000184/00000004.jpg' -> '0004.jpg'
  var index = url.LastIndexOf('/');
 
- return url.Substring(index + 5).Replace(".JPG", ".jpg");
+ return url.Substring(index + 5).ToLowerInvariant();
  }
  }
 
- internal record ArchiveRecord(string Fond, string Opis, string Delo, short Start = 1, short? End = null);
+ internal record ArchiveRecord(string Fond, string Opis, string Delo, int Start = 1, int? End = null);
 
- internal record PageData(string[] PageUrls, short PageCount, string PageMainUrl);
+ internal record PageData(IReadOnlyCollection<string> PageUrls, int PageCount, string PageMainUrl);
 }

README.md

@@ -6,8 +6,8 @@
 
 ### Запуск
 Скачиваем программу
-* Windows https://github.com/okolobaxa/cgamos-downloader/releases/download/v1.7/cgamos-windows.zip
-* MacOS https://github.com/okolobaxa/cgamos-downloader/releases/download/v1.7/cgamos-macos.zip
+* Windows 8 и выше https://github.com/okolobaxa/cgamos-downloader/releases/download/v1.8/cgamos.1.8.win-x64.zip
+* MacOS https://github.com/okolobaxa/cgamos-downloader/releases/download/v1.8/cgamos.1.8.osx-x64.tar.gz
 
 Запустите файл cgamos и следуйте инструкциям.