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

Some FileInfo refactoring. Fix FileInfo preview in options when it was disabled.

Browse Source
This commit is contained in:
Nicolas Stepien 2012-02-29 22:24:49 +01:00
parent 28923042ab
commit 9d0594312e
2 changed files with 48 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
4chan_x.user.js
View File

@ -2931,29 +2931,22 @@
FileInfo = {
init: function() {
if (g.BOARD === 'f') return;
FileInfo.ffConf = ['fileInfoR', 'fileInfoT'];
FileInfo.ffMtrs = [/%([BKlLMnNrs])/g, /%([BKlMrs])/g];
FileInfo.ffRgex = [/File:\s(<a.+<\/a>)-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+x\d+|PDF),\s<span\stitle=\"([^\"]+)\">/, /File:\s(<a.+<\/a>)-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+x\d+|PDF)\)/];
this.parse = function(node) {
var filename, link, resolution, size, unit, _, _ref;
FileInfo.ffType = node.childNodes.length > 3 ? 0 : 1;
_ref = node.innerHTML.match(FileInfo.ffRgex[FileInfo.ffType]), _ = _ref[0], link = _ref[1], size = _ref[2], unit = _ref[3], resolution = _ref[4], filename = _ref[5];
return {
link: link,
size: size,
unit: unit,
resolution: resolution,
filename: filename
};
};
FileInfo.funks = FileInfo.setFormats();
return g.callbacks.push(this.node);
},
node: function(root) {
var node;
var filename, link, node, resolution, size, unit, _, _ref;
if (root.className === 'inline' || !(node = $('.filesize', root))) return;
FileInfo.data = FileInfo.parse(node);
return node.innerHTML = FileInfo.funks[FileInfo.ffType](FileInfo) + ' ';
FileInfo.ffType = node.childElementCount === 2 ? 0 : 1;
_ref = node.innerHTML.match(FileInfo.ffRgex[FileInfo.ffType]), _ = _ref[0], link = _ref[1], size = _ref[2], unit = _ref[3], resolution = _ref[4], filename = _ref[5];
FileInfo.data = {
link: link,
size: size,
unit: unit,
resolution: resolution,
filename: filename
};
return node.innerHTML = FileInfo.funks[FileInfo.ffType](FileInfo);
},
setFormats: function() {
var code, i, _results;
@ -2993,6 +2986,9 @@
}
return "" + size + " " + unitT;
},
ffConf: ['fileInfoR', 'fileInfoT'],
ffMtrs: [/%([BKlLMnNrs])/g, /%([BKlMrs])/g],
ffRgex: [/File:\s(<a.+<\/a>)-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+x\d+|PDF),\s<span\stitle=\"([^\"]+)\">/, /File:\s(<a.+<\/a>)-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+x\d+|PDF)\)/],
formatters: {
B: function() {
return FileInfo.convertUnit('B');

60
script.coffee
View File

@ -2398,26 +2398,20 @@ Time =
FileInfo =
init: ->
return if g.BOARD is 'f'
FileInfo.ffConf = [ 'fileInfoR', 'fileInfoT' ]
FileInfo.ffMtrs = [ /%([BKlLMnNrs])/g, /%([BKlMrs])/g ]
FileInfo.ffRgex = [ /File:\s(<a.+<\/a>)-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+x\d+|PDF),\s<span\stitle=\"([^\"]+)\">/,
/File:\s(<a.+<\/a>)-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+x\d+|PDF)\)/ ]
@parse = (node) ->
FileInfo.ffType = if node.childNodes.length > 3 then 0 else 1
[_, link, size, unit, resolution, filename] =
node.innerHTML.match FileInfo.ffRgex[FileInfo.ffType]
link : link
size : size
unit : unit
resolution: resolution
filename : filename
FileInfo.funks = FileInfo.setFormats()
g.callbacks.push @node
node: (root) ->
return if root.className is 'inline' or not node = $ '.filesize', root
FileInfo.data = FileInfo.parse node
node.innerHTML = FileInfo.funks[FileInfo.ffType](FileInfo) + ' '
FileInfo.ffType = if node.childElementCount is 2 then 0 else 1
[_, link, size, unit, resolution, filename] =
node.innerHTML.match FileInfo.ffRgex[FileInfo.ffType]
FileInfo.data =
link: link
size: size
unit: unit
resolution: resolution
filename: filename
node.innerHTML = FileInfo.funks[FileInfo.ffType] FileInfo
setFormats: ->
for i in [0..1]
code = conf[FileInfo.ffConf[i]].replace FileInfo.ffMtrs[i], (s, c) ->
@ -2430,8 +2424,8 @@ FileInfo =
size = FileInfo.data.size
unitF = FileInfo.data.unit
if unitF isnt unitT
units = [ 'B', 'KB', 'MB' ]
i = units.indexOf(unitF) - units.indexOf(unitT)
units = ['B', 'KB', 'MB']
i = units.indexOf(unitF) - units.indexOf unitT
unitT = 'Bytes' if unitT is 'B'
if i > 0
size *= 1024 while i-- > 0
@ -2440,19 +2434,33 @@ FileInfo =
if size < 1 and size.toString().length > size.toFixed(2).length
size = size.toFixed 2
"#{size} #{unitT}"
ffConf: [
'fileInfoR'
'fileInfoT'
]
ffMtrs: [
/%([BKlLMnNrs])/g
/%([BKlMrs])/g
]
ffRgex: [
/File:\s(<a.+<\/a>)-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+x\d+|PDF),\s<span\stitle=\"([^\"]+)\">/
/File:\s(<a.+<\/a>)-\((?:Spoiler Image,\s)?([\d\.]+)\s([BKM]{1,2}),\s(\d+x\d+|PDF)\)/
]
formatters:
B: -> FileInfo.convertUnit 'B'
K: -> FileInfo.convertUnit 'KB'
l: -> if FileInfo.ffType is 0
FileInfo.data.link.replace />\d+\.\w+</, '>' + FileInfo.formatters.n() + '<'
else
FileInfo.data.link
l: ->
if FileInfo.ffType is 0
FileInfo.data.link.replace />\d+\.\w+</, '>' + FileInfo.formatters.n() + '<'
else
FileInfo.data.link
L: -> FileInfo.data.link.replace />\d+\.\w+</, '>' + FileInfo.data.filename + '<'
M: -> FileInfo.convertUnit 'MB'
n: -> if (ext = FileInfo.data.filename.lastIndexOf '.') > 38
'<span class=fnfull>' + FileInfo.data.filename + '</span><span class=fntrunc>' + FileInfo.data.filename.substr(0, 32) + ' (...)' + FileInfo.data.filename.substr(ext) + '</span>'
else
FileInfo.data.filename
n: ->
if (ext = FileInfo.data.filename.lastIndexOf '.') > 38
'<span class=fnfull>' + FileInfo.data.filename + '</span><span class=fntrunc>' + FileInfo.data.filename.substr(0, 32) + ' (...)' + FileInfo.data.filename.substr(ext) + '</span>'
else
FileInfo.data.filename
N: -> FileInfo.data.filename
r: -> FileInfo.data.resolution
s: -> "#{FileInfo.data.size} #{FileInfo.data.unit}"