From bdb44afa17b1fc5a9a742d0c54152727ea27a53b Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Thu, 5 Mar 2020 17:00:05 -0600 Subject: [PATCH] Update for new e621 release (and dodge mandatory blacklist via json api) --- lib/profiles/e621.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/profiles/e621.sh b/lib/profiles/e621.sh index 98f0ae5..5ef22cb 100644 --- a/lib/profiles/e621.sh +++ b/lib/profiles/e621.sh @@ -1,18 +1,18 @@ e621_can_handle() { local url="${1}" - echo "${url}" | grep -qi 'e621.net/post/show/[0-9]*' || return 1 + echo "${url}" | grep -qi 'e621.net/post\(s\|/show\)/[0-9]*' || return 1 taggery_id_filter=e621_id_filter - taggery_fmturl="https://e621.net/post/show/%s" + taggery_fmturl="https://e621.net/posts/%s.json" taggery_image_url_filter=e621_image_url_filter taggery_image_tags_filter=e621_image_tags_filter taggery_user_agent="MyBrowse/1.1 (GS/OS 6.0.6; AppleIIgs)" } e621_id_filter() { - sed -e 's#^.*/post/show/\([0-9]\+\)\($\|/.*$\)#\1#' + sed -e 's#^.*/post\(s\|/show\)/\([0-9]\+\)\($\|/.*$\)#\2#' } e621_image_url_filter() { - sed -e '/>DownloadDownload.*$//' + jq -r '.post.file | [ .md5, .ext ] | join(".")' | sed -e 's#^\(..\)\(..\).*$#https://static1.e621.net/data/\1/\2/&#' } e621_image_tags_filter() { - sed -e 's/<\/li>/&\n/g' | sed -e '/id="tag-sidebar"/,/<\/ul>/!d; /class="tag-type-/!d; s/\([^?]\)<\/a>.*$/\1/; s/^.*>//; s/ /_/g' + jq -r 'reduce .post.tags[] as $tag ([]; . + $tag) | .[]' } -- 2.45.0