From 550e0bef93d664e8323b5ec68675035ed379e261 Mon Sep 17 00:00:00 2001 From: user Date: Mon, 28 Feb 2022 20:43:06 +0100 Subject: [PATCH 1/2] nijie: fix pattern for new image URL. --- app/logical/source/url/nijie.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/logical/source/url/nijie.rb b/app/logical/source/url/nijie.rb index 05ad6370d..d3e88c85b 100644 --- a/app/logical/source/url/nijie.rb +++ b/app/logical/source/url/nijie.rb @@ -75,7 +75,7 @@ class Source::URL::Nijie < Source::URL @user_id = params[:id] # https://pic.nijie.net/07/nijie/17/95/728995/illust/0_0_403fdd541191110c_c25585.jpg - in _, "nijie_picture", /^\d{2}$/, "nijie", /^\d{2}$/, /^\d{2}$/, user_id, "illust", _ if image_url? + in _, /^\d{2}$/, "nijie", /^\d{2}$/, /^\d{2}$/, user_id, "illust", _ if image_url? @user_id = user_id # https://pic01.nijie.info/nijie_picture/diff/main/218856_0_236014_20170620101329.png (page: http://nijie.info/view.php?id=218856) From 2600dcdbfa75cc58ea8ef24e5f2d402b904ba84e Mon Sep 17 00:00:00 2001 From: user Date: Mon, 28 Feb 2022 20:59:48 +0100 Subject: [PATCH 2/2] nijie: extract post ID from new image URL. --- app/logical/source/url/nijie.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/logical/source/url/nijie.rb b/app/logical/source/url/nijie.rb index d3e88c85b..153d28c75 100644 --- a/app/logical/source/url/nijie.rb +++ b/app/logical/source/url/nijie.rb @@ -11,6 +11,7 @@ # * https://pic.nijie.net/03/nijie_picture/236014_20170620101426_0.png (page: https://www.nijie.info/view.php?id=218856) # # * https://pic.nijie.net/07/nijie/17/95/728995/illust/0_0_403fdd541191110c_c25585.jpg +# * https://pic.nijie.net/06/nijie/17/14/236014/illust/218856_1_7646cf57f6f1c695_f2ed81.png (page: https://nijie.info/view.php?id=218856) # # Unhandled: # @@ -75,8 +76,10 @@ class Source::URL::Nijie < Source::URL @user_id = params[:id] # https://pic.nijie.net/07/nijie/17/95/728995/illust/0_0_403fdd541191110c_c25585.jpg + # https://pic.nijie.net/06/nijie/17/14/236014/illust/218856_1_7646cf57f6f1c695_f2ed81.png in _, /^\d{2}$/, "nijie", /^\d{2}$/, /^\d{2}$/, user_id, "illust", _ if image_url? @user_id = user_id + parse_filename # https://pic01.nijie.info/nijie_picture/diff/main/218856_0_236014_20170620101329.png (page: http://nijie.info/view.php?id=218856) # https://pic01.nijie.info/nijie_picture/diff/main/218856_1_236014_20170620101330.png @@ -116,6 +119,11 @@ class Source::URL::Nijie < Source::URL in /^\d+$/ => work_id, /^\d+$/ => user_id, /^\d{14}$/ => timestamp, /^\d+$/ @work_id, @user_id = work_id, user_id + # 0_0_403fdd541191110c_c25585.jpg + # 218856_1_7646cf57f6f1c695_f2ed81.png + in /^\d+$/ => work_id, /^\d+$/, /^\h+$/, /^\h+$/ + @work_id = work_id if work_id.to_i != 0 + else end end