Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Multifile support in Sauce. #2171

Browse Source
This commit is contained in:
ccd0 2019-07-15 22:38:44 -07:00
parent 125448c8fb
commit 6ca5b28cd5
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/Images/Sauce.coffee
View File

@ -43,14 +43,14 @@ Sauce =
return null
parts
createSauceLink: (link, post) ->
ext = post.file.url.match(/[^.]*$/)[0]
createSauceLink: (link, post, file) ->
ext = file.url.match(/[^.]*$/)[0]
parts = {}
$.extend parts, link
return null unless !parts['boards'] or post.board.ID in parts['boards'].split ','
return null unless !parts['types'] or ext in parts['types'].split ','
return null unless !parts['regexp'] or (matches = post.file.name.match parts['regexp'])
return null unless !parts['regexp'] or (matches = file.name.match parts['regexp'])
missing = []
for key in ['url', 'text']
@ -59,7 +59,7 @@ Sauce =
return orig unless matches
type = matches[parameter[1..]] or ''
else
type = Sauce.formatters[parameter] post, ext
type = Sauce.formatters[parameter] post, file, ext
if not type?
missing.push parameter
return ''
@ -69,7 +69,7 @@ Sauce =
type = encodeURIComponent type
type
if post.board.ID is 'f' and missing.length and !missing.filter((x) -> !/^.?MD5$/.test(x)).length
if g.SITE.areMD5sDeferred?(post.board) and missing.length and !missing.filter((x) -> !/^.?MD5$/.test(x)).length
a = Sauce.link.cloneNode false
a.dataset.skip = '1'
return a
@ -83,32 +83,36 @@ Sauce =
a
node: ->
return if @isClone or !@file
return if @isClone
for file in @files
Sauce.file @, file
return
file: (post, file) ->
nodes = []
skipped = []
for link in Sauce.links
if (node = Sauce.createSauceLink link, @)
if (node = Sauce.createSauceLink link, post, file)
nodes.push $.tn(' '), node
skipped.push [link, node] if node.dataset.skip
$.add @file.text, nodes
$.add file.text, nodes
if skipped.length
observer = new MutationObserver =>
if @file.text.dataset.md5
for [link, node] in skipped when (node2 = Sauce.createSauceLink link, @)
observer = new MutationObserver ->
if file.text.dataset.md5
for [link, node] in skipped when (node2 = Sauce.createSauceLink link, post, file)
$.replace node, node2
observer.disconnect()
observer.observe @file.text, {attributes: true}
observer.observe file.text, {attributes: true}
formatters:
TURL: (post) -> post.file.thumbURL
URL: (post) -> post.file.url
IMG: (post, ext) -> if ext in ['gif', 'jpg', 'png'] then post.file.url else post.file.thumbURL
MD5: (post) -> post.file.MD5
sMD5: (post) -> post.file.MD5?.replace /[+/=]/g, (c) -> ({'+': '-', '/': '_', '=': ''})[c]
hMD5: (post) -> if post.file.MD5 then ("0#{c.charCodeAt(0).toString(16)}"[-2..] for c in atob post.file.MD5).join('')
TURL: (post, file) -> file.thumbURL
URL: (post, file) -> file.url
IMG: (post, file, ext) -> if ext in ['gif', 'jpg', 'png'] then file.url else file.thumbURL
MD5: (post, file) -> file.MD5
sMD5: (post, file) -> file.MD5?.replace /[+/=]/g, (c) -> ({'+': '-', '/': '_', '=': ''})[c]
hMD5: (post, file) -> if file.MD5 then ("0#{c.charCodeAt(0).toString(16)}"[-2..] for c in atob file.MD5).join('')
board: (post) -> post.board.ID
name: (post) -> post.file.name
name: (post, file) -> file.name
'%': -> '%'
semi: -> ';'

1
src/site/SW.yotsuba.coffee
View File

@ -15,6 +15,7 @@ SW.yotsuba =
"#{location.protocol}//#{ImageHost.thumbHost()}/#{boardID}/#{filename}"
isPrunedByAge: ({boardID}) -> boardID is 'f'
areMD5sDeferred: ({boardID}) -> boardID is 'f'
selectors:
board: '.board'