Allow short form user entry
- 0 = Use OtaUrl first then default - 1 = Use default
This commit is contained in:
parent
e2b04ae6fb
commit
a245696d7c
@ -732,15 +732,20 @@ class Extension_manager
|
|||||||
var url = webserver.arg(0)
|
var url = webserver.arg(0)
|
||||||
self.ext_repo = "" # Use OtaUrl or default
|
self.ext_repo = "" # Use OtaUrl or default
|
||||||
if size(url) > 0 # Input validation
|
if size(url) > 0 # Input validation
|
||||||
var url_parts = string.split(url, "/")
|
if url == "0" # Reset to use OtaUrl or default
|
||||||
if url_parts.size() > 2 # http: / / server / extensions
|
elif url == "1" # Default repository
|
||||||
var is_httpx = url_parts[0] == "http:" || url_parts[0] == "https:"
|
self.ext_repo = self.EXT_REPO
|
||||||
var is_delim = url[-1] == '/'
|
else # Process user input
|
||||||
var is_extensions = url_parts[(is_delim)?-2:-1] == "extensions"
|
var url_parts = string.split(url, "/")
|
||||||
if is_httpx && url_parts[1] == "" && is_extensions
|
if url_parts.size() > 2 # http: / / server / extensions
|
||||||
self.ext_repo = url
|
var is_httpx = url_parts[0] == "http:" || url_parts[0] == "https:"
|
||||||
if !is_delim
|
var is_delim = url[-1] == '/'
|
||||||
self.ext_repo += '/'
|
var is_extensions = url_parts[(is_delim)?-2:-1] == "extensions"
|
||||||
|
if is_httpx && url_parts[1] == "" && is_extensions
|
||||||
|
self.ext_repo = url
|
||||||
|
if !is_delim
|
||||||
|
self.ext_repo += '/'
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user