From 6fc4d3ec44273d264904693d7dba91f17e6285a2 Mon Sep 17 00:00:00 2001 From: nonamethanks Date: Wed, 3 Jun 2020 10:39:31 +0200 Subject: [PATCH] Nicoseiga: Add support for drm-served manga --- app/logical/nico_seiga_api_client.rb | 5 ++++- app/logical/sources/strategies/nico_seiga.rb | 9 ++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/logical/nico_seiga_api_client.rb b/app/logical/nico_seiga_api_client.rb index 4290dae96..d75aaade3 100644 --- a/app/logical/nico_seiga_api_client.rb +++ b/app/logical/nico_seiga_api_client.rb @@ -12,7 +12,10 @@ class NicoSeigaApiClient [api_response["id"]] elsif @work_type == "manga" manga_api_response.map do |x| - x["meta"]["source_url"].match(%r{/thumb/(\d+)\w}i).captures[0] + case x["meta"]["source_url"] + when %r{/thumb/(\d+)\w}i then Regexp.last_match(1) + when %r{nicoseiga\.cdn\.nimg\.jp/drm/image/\w+/(\d+)\w}i then Regexp.last_match(1) + end end end end diff --git a/app/logical/sources/strategies/nico_seiga.rb b/app/logical/sources/strategies/nico_seiga.rb index 385dd37f2..714763d3e 100644 --- a/app/logical/sources/strategies/nico_seiga.rb +++ b/app/logical/sources/strategies/nico_seiga.rb @@ -84,15 +84,10 @@ module Sources end def preview_urls - if manga_id.present? - image_urls.map do |img| - id = image_id_from_url(img) - "https://lohas.nicoseiga.jp/thumb/#{id}p" - end - elsif illust_id.present? + if illust_id.present? ["https://lohas.nicoseiga.jp/thumb/#{illust_id}i"] else - [] + image_urls end end