zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-08-02 07:41:52 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix up file uris/uri path code

Browse source
This commit is contained in:
Kyle Drake 2024-09-15 14:18:35 -05:00
parent 1794a4bcba
commit dee9128cb3
4 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
models/site.rb
View file

@ -1244,8 +1244,10 @@ class Site < Sequel::Model
def file_list(path='')
list = Dir.glob(File.join(files_path(path), '*'), File::FNM_DOTMATCH).reject { |entry| File.basename(entry) == '.' || File.basename(entry) == '..' }.collect do |file_path|
extname = File.extname file_path
path = file_path.gsub(base_files_path+'/', '')
file = {
path: file_path.gsub(base_files_path+'/', ''),
path: path,
uri: uri(path),
name: File.basename(file_path),
ext: extname.gsub('.', ''),
is_directory: File.directory?(file_path),
@ -1426,13 +1428,20 @@ class Site < Sequel::Model
'https'
end
def uri
"#{default_schema}://#{host}"
end
def uri(path=nil)
uri = "#{default_schema}://#{host}"
def file_uri(path)
path = '/' + path unless path[0] == '/'
uri + (path =~ ROOT_INDEX_HTML_REGEX ? '/' : path)
return uri unless path
path = '' if path == '/' || path =~ ROOT_INDEX_HTML_REGEX
path = path.sub(%r{^/}, '').sub(%r{/index\.html$}, '/').sub(/\.html$/, '')
unless path.empty?
escaped_path = Rack::Utils.escape_path(path).gsub('?', '%3F')
uri += "/#{escaped_path}"
end
uri
end
def title