From e0009d2300fc79b592b25a74b7d4b2085c579eab Mon Sep 17 00:00:00 2001 From: ccd0 Date: Thu, 4 Apr 2019 20:26:22 -0700 Subject: [PATCH] Sauce: Update DeviantArt filename format. #2237 --- src/General/Settings.coffee | 6 ++++++ src/config/Config.coffee | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/General/Settings.coffee b/src/General/Settings.coffee index d2b64b007..535a3022e 100644 --- a/src/General/Settings.coffee +++ b/src/General/Settings.coffee @@ -477,6 +477,12 @@ Settings = [hostname, software] = line.split(' ') siteProperties[hostname] = {software} set 'siteProperties', siteProperties + if compareString < '00001.00014.00006.00006' + if data['sauces']? + set 'sauces', data['sauces'].replace( + /\/\/%\$1\.deviantart\.com\/gallery\/#\/d%\$2;regexp:\/\^\\w\+_by_\(\\w\+\)-d\(\[\\da-z\]\+\)\//g, + '//www.deviantart.com/gallery/#/d%$1%$2;regexp:/^\\w+_by_\\w+[_-]d([\\da-z]{6})\\b|^d([\\da-z]{6})-[\\da-z]{8}-/' + ) changes loadSettings: (data, cb) -> diff --git a/src/config/Config.coffee b/src/config/Config.coffee index 8b388305c..dfde1c0f3 100644 --- a/src/config/Config.coffee +++ b/src/config/Config.coffee @@ -752,7 +752,7 @@ Config = sauces: """ # Known filename formats: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=%$1;regexp:/^(\\d+)_p\\d+/ - //%$1.deviantart.com/gallery/#/d%$2;regexp:/^\\w+_by_(\\w+)-d([\\da-z]+)/ + //www.deviantart.com/gallery/#/d%$1%$2;regexp:/^\\w+_by_\\w+[_-]d([\\da-z]{6})\\b|^d([\\da-z]{6})-[\\da-z]{8}-/ //imgur.com/%$1;regexp:/^(?![a-zA-Z][a-z]{6})(?![A-Z]{7})(?!\\d{7})([\\da-zA-Z]{7})(?: \\(\\d+\\))?\\.\\w+$/ http://flickr.com/photo.gne?id=%$1;regexp:/^(\\d+)_[\\da-f]{10}(?:_\\w)*\\b/ https://www.facebook.com/photo.php?fbid=%$1;regexp:/^\\d+_(\\d+)_\\d+_[no]\\b/