Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prefer exact match without parameters to one with extra parameters #36

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Prefer exact match without parameters to one with extra parameters #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75a473c
Increase preference of match w/out parameters.
suola Oct 14, 2018
3c66a84
Merge branch 'master' into prefer_exact_match_over_one_with_extra_par…
suola Oct 28, 2021
1dcfb2c
Take q into account always.
suola Oct 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions mimeparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@ def quality_and_fitness_parsed(mime_type, parsed_ranges):
Find the best match for a given mime-type against a list of media_ranges
that have already been parsed by parse_media_range(). Returns a tuple of
the fitness value and the value of the 'q' quality parameter of the best
match, or (-1, 0) if no match was found. Just as for quality_parsed(),
match, or (0, [-1]) if no match was found. Just as for quality_parsed(),
'parsed_ranges' must be a list of parsed media ranges.

:rtype: (float,int)
:rtype: (float,list[int])
"""
best_fitness = -1
best_fitness = [-1]
best_fit_q = 0
(target_type, target_subtype, target_params) = \
parse_media_range(mime_type)
Expand All @@ -92,21 +92,27 @@ def quality_and_fitness_parsed(mime_type, parsed_ranges):
# if they do, assess the "fitness" of this mime_type
if type_match and subtype_match:

# 100 points if the type matches w/o a wildcard
fitness = type == target_type and 100 or 0
# fitness is a list of metrics in decreasing precedence order
fitness = []

# 10 points if the subtype matches w/o a wildcard
fitness += subtype == target_subtype and 10 or 0
# 1) type matches w/o a wildcard
fitness.append(type == target_type)

# 1 bonus point for each matching param besides "q"
# 2) subtype matches w/o a wildcard
fitness.append(subtype == target_subtype)

# 3) each matching param besides "q"
param_matches = sum([
1 for (key, value) in target_params.items()
if key != 'q' and key in params and value == params[key]
])
fitness += param_matches
fitness.append(param_matches)

# 4) target's "q" param (between 0 and 1)
fitness.append(float(target_params.get('q', 1)))

# finally, add the target's "q" param (between 0 and 1)
fitness += float(target_params.get('q', 1))
# 5) no extra parameters besides q
fitness.append((set(target_params) | set(params)) - {'q'} == set())

if fitness > best_fitness:
best_fitness = fitness
Expand Down
16 changes: 16 additions & 0 deletions testdata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,22 @@
"text/html",
"match should use highest order of supported when there is a tie"
],
[
[
["application/json", "application/json;boundary=NL"],
"application/json"
],
"application/json",
"exact match without parameters should be preferred over similar one with extra parameters"
],
[
[
["application/json;q=0.2", "application/json;q=0.6;foo=bar"],
"application/json"
],
"application/json;q=0.6;foo=bar",
"q parameter should apply between options of same type"
],
[
[
["application/json;q=1.0", "text/html;q=0.9", "text/plain;q=0.1"],
Expand Down