rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

utils.rfc6266: Nicer ext-param handling

Browse Source
This commit is contained in:
Florian Bruhin 2014-08-14 10:15:32 +02:00
parent e159990363
commit acb5159791
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qutebrowser/utils/rfc6266.py
View File

@ -55,9 +55,9 @@ class ContentDisposition:
""" """
if 'filename*' in self.assocs: if 'filename*' in self.assocs:
val = self.assocs['filename*'] param = self.assocs['filename*']
assert isinstance(val, ExtDispositionParm) assert isinstance(param, ExtDispositionParm)
return parse_ext_value(val[0]).string return parse_ext_value(param.value).string
elif 'filename' in self.assocs: elif 'filename' in self.assocs:
# XXX Reject non-ascii (parsed via qdtext) here? # XXX Reject non-ascii (parsed via qdtext) here?
return self.assocs['filename'] return self.assocs['filename']
@ -142,7 +142,6 @@ def parse_headers(content_disposition, location=None, relaxed=False):
def parse_ext_value(val): def parse_ext_value(val):
charset = val[0]
if len(val) == 3: if len(val) == 3:
charset, langtag, coded = val charset, langtag, coded = val
else: else:
@ -251,9 +250,13 @@ class NoExtToken(peg.Symbol):
class DispositionParm(str): class DispositionParm(str):
grammar = peg.attr('name', NoExtToken), '=', Value grammar = peg.attr('name', NoExtToken), '=', Value
class ExtDispositionParm(peg.List): class ExtDispositionParm:
grammar = peg.attr('name', ExtToken), '=', ExtValue grammar = peg.attr('name', ExtToken), '=', ExtValue
def __init__(self, value, name=None):
self.name = name
self.value = value
class DispositionType(peg.List): class DispositionType(peg.List):
grammar = [re.compile('(inline|attachment)', re.I), Token] grammar = [re.compile('(inline|attachment)', re.I), Token]