status-im/nim-chronos
2
0
Fork 0
mirror of https://github.com/status-im/nim-chronos.git synced 2025-01-22 01:10:12 +00:00
Code Issues Projects Releases Wiki Activity

getPreferredContentType() deprecate float math (#303)

Browse Source 
* Deprecate float math.

* Remove unneeded helper procedures.

* Remove limitation of 99 types and comments.
This commit is contained in:
Eugene Kabanov 2022-08-10 14:07:51 +03:00 committed by GitHub
parent 93800879fd
commit 1334cdfebd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
chronos/apps/http/httpserver.nim
View File

@ -490,7 +490,6 @@ proc preferredContentType*(acceptHeader: string,
## ##
## Note: Quality value (weight) for content type has priority over server's ## Note: Quality value (weight) for content type has priority over server's
## preferred content-type. ## preferred content-type.
doAssert(len(types) < 99, "Maximum number of types is 99")
if len(types) == 0: if len(types) == 0:
if len(acceptHeader) == 0: if len(acceptHeader) == 0:
# If `Accept` header is missing, return `*/*`. # If `Accept` header is missing, return `*/*`.
@ -525,43 +524,29 @@ proc preferredContentType*(acceptHeader: string,
# If `Accept` header is incorrect, client accepts any type of content. # If `Accept` header is incorrect, client accepts any type of content.
ok(types[0]) ok(types[0])
else: else:
# This algorithm exploits ``q-value`` range which is [0.000, 1.000],
# by using smaller values for sorting server's preferred content types.
# So between 0.000 and 0.001 there present 99 possible values
# [0.00001, 0.00099] which can be used.
# Server's preferred types marked with `preferred-value` which is
# has highest value for first index and the lowest for the last.
# ``maxWeight`` represents maximum possible weight value which can be # ``maxWeight`` represents maximum possible weight value which can be
# obtained. # obtained.
let maxWeight = 1.0 + float(len(types)) / float(100_000) let maxWeight = (1.0, 0)
var var
currentType = MediaType() currentType = MediaType()
currentWeight = 0.0 currentIndex = -1
for itemType in ares.get().data: currentWeight = (-1.0, 0)
let
preferredIndex = types.find(itemType.mediaType)
preferredWeight =
if preferredIndex == -1:
0.0
else:
# Calculate weight which depends on position in ``types``
# array. Because ``preferredIndex`` is always less than
# ``len(types)`` this weight could not be ``0.0``.
float(len(types) - preferredIndex) / float(100_000)
if preferredWeight != 0: for itemType in ares.get().data:
let weight = itemType.qvalue + preferredWeight let preferredIndex = types.find(itemType.mediaType)
if preferredIndex != -1:
let weight = (itemType.qvalue, -preferredIndex)
if currentWeight < weight: if currentWeight < weight:
currentType = types[preferredIndex] currentType = types[preferredIndex]
currentWeight = weight currentWeight = weight
currentIndex = preferredIndex
if currentWeight == maxWeight: if currentWeight == maxWeight:
# There is no reason to continue search, because maximum possible # There is no reason to continue search, because maximum possible
# weight is already achieved, so this is the best match. # weight is already achieved, so this is the best match.
break break
if currentWeight == 0.0: if currentIndex == -1:
err("Preferred content type not found") err("Preferred content type not found")
else: else:
ok(currentType) ok(currentType)