more consistent behavior of CurrentUser.root_url

This commit is contained in:
Albert Yi
2018-08-15 16:08:10 -07:00
parent f88234e21d
commit 0314dc9751
4 changed files with 4 additions and 4 deletions

View File

@@ -176,7 +176,7 @@ class ApplicationController < ActionController::Base
def reset_current_user
CurrentUser.user = nil
CurrentUser.ip_addr = nil
CurrentUser.root_url = root_url
CurrentUser.root_url = root_url.chomp("/")
end
def set_started_at_session

View File

@@ -59,7 +59,7 @@ class CurrentUser
end
def self.root_url
Thread.current[:current_root_url] || "https://#{Danbooru.config.hostname}/"
Thread.current[:current_root_url] || "https://#{Danbooru.config.hostname}"
end
def self.root_url=(root_url)

View File

@@ -14,7 +14,7 @@ class StorageManager
end
def default_base_url
CurrentUser.root_url + "data"
"#{CurrentUser.root_url}/data"
end
# Store the given file at the given path. If a file already exists at that

View File

@@ -254,7 +254,7 @@ module Danbooru
# base_url - where to serve files from (default: http://#{hostname}/data)
# hierarchical: false - store files in a single directory
# hierarchical: true - store files in a hierarchical directory structure, based on the MD5 hash
StorageManager::Local.new(base_url: CurrentUser.root_url + "data", base_dir: "#{Rails.root}/public/data", hierarchical: false)
StorageManager::Local.new(base_url: "#{CurrentUser.root_url}/data", base_dir: "#{Rails.root}/public/data", hierarchical: false)
# Store files on one or more remote host(s). Configure SSH settings in
# ~/.ssh_config or in the ssh_options param (ref: http://net-ssh.github.io/net-ssh/Net/SSH.html#method-c-start)