X-Git-Url: https://git.draconx.ca/gitweb/homepage.git/blobdiff_plain/6493de72be35a962a45a31059c7e90a8e9c3b737..79dfd09162d1c4e201eccec188057c0e9ded2260:/lib/helpers.rb diff --git a/lib/helpers.rb b/lib/helpers.rb index df48f4c..c9a1cc3 100644 --- a/lib/helpers.rb +++ b/lib/helpers.rb @@ -1,6 +1,6 @@ # Nick's web site: Ruby helpers for processing # -# Copyright © 2018-2019 Nick Bowler +# Copyright © 2018-2021 Nick Bowler # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -44,7 +44,11 @@ def item_source(item = @item) end def item_uri(item = @item, rep: :default) - return item.path(rep: rep).gsub(/\/index.[^.]*$/, "/") + return item.path(rep: rep).sub(%r{/index[.][^.]*$}, "/") +end + +def rep_uri(rep = @rep) + return rep.path.sub(%r{/index[.][^.]*$}, "/") end def find_license(license) @@ -73,6 +77,7 @@ end def human_filesize(size) units = ["B", "KiB", "MiB", "GiB"] + prec = 0 for unit in units if (size < 1024) @@ -80,7 +85,8 @@ def human_filesize(size) end size /= 1024.0 + prec = 1 end - sprintf("%.1f %s", size + 0.05, unit) + sprintf("%.*f %s", prec, size + 0.05, unit) end