mirror of
https://github.com/jellyfin/jellyfin-roku.git
synced 2024-12-03 20:01:05 +00:00
Merge branch 'master' into improved-server-connection-feedback
This commit is contained in:
commit
ce5290582f
@ -115,23 +115,28 @@ sub programUpdated()
|
||||
|
||||
day = getRelativeDayName(startDate)
|
||||
|
||||
' Get Start Date in local timezone for display to user
|
||||
localStartDate = createObject("roDateTime")
|
||||
localStartDate.FromISO8601String(prog.StartDate)
|
||||
localStartDate.ToLocalTime()
|
||||
|
||||
if startDate.AsSeconds() < now.AsSeconds() and endDate.AsSeconds() > now.AsSeconds() then
|
||||
if day = "today" then
|
||||
m.broadcastDetails.text = tr("Started at") + " " + formatTime(startDate)
|
||||
m.broadcastDetails.text = tr("Started at") + " " + formatTime(localStartDate)
|
||||
else
|
||||
m.broadcastDetails.text = tr("Started") + " " + tr(day) + ", " + formatTime(startDate)
|
||||
m.broadcastDetails.text = tr("Started") + " " + tr(day) + ", " + formatTime(localStartDate)
|
||||
end if
|
||||
else if startDate.AsSeconds() > now.AsSeconds()
|
||||
if day = "today" then
|
||||
m.broadcastDetails.text = tr("Starts at") + " " + formatTime(startDate)
|
||||
m.broadcastDetails.text = tr("Starts at") + " " + formatTime(localStartDate)
|
||||
else
|
||||
m.broadcastDetails.text = tr("Starts") + " " + tr(day) + ", " + formatTime(startDate)
|
||||
m.broadcastDetails.text = tr("Starts") + " " + tr(day) + ", " + formatTime(localStartDate)
|
||||
end if
|
||||
else
|
||||
if day = "today" then
|
||||
m.broadcastDetails.text = tr("Ended at") + " " + formatTime(endDate)
|
||||
m.broadcastDetails.text = tr("Ended at") + " " + formatTime(localStartDate)
|
||||
else
|
||||
m.broadcastDetails.text = tr("Ended") + " " + tr(day) + ", " + formatTime(endDate)
|
||||
m.broadcastDetails.text = tr("Ended") + " " + tr(day) + ", " + formatTime(localStartDate)
|
||||
end if
|
||||
end if
|
||||
|
||||
|
@ -34,11 +34,11 @@ function CreateServerGroup()
|
||||
if node = "submit"
|
||||
'Append default ports
|
||||
maxSlashes = 0
|
||||
if left(server_hostname.value,8) = "https://" or left(server_hostname.value,7) = "http://" then maxSlashes = 2
|
||||
if left(lcase(server_hostname.value),8) = "https://" or left(lcase(server_hostname.value),7) = "http://" then maxSlashes = 2
|
||||
'Check to make sure entry has no extra slashes before adding default ports.
|
||||
if Instr(0, server_hostname.value, "/") = maxSlashes then
|
||||
if server_hostname.value.len() > 5 and mid(server_hostname.value, server_hostname.value.len()-4,1) <> ":" and mid(server_hostname.value, server_hostname.value.len()-5,1) <> ":" then
|
||||
if left(server_hostname.value ,5) = "https" then
|
||||
if left(lcase(server_hostname.value) ,5) = "https" then
|
||||
server_hostname.value = server_hostname.value + ":8920"
|
||||
else
|
||||
server_hostname.value = server_hostname.value + ":8096"
|
||||
@ -46,12 +46,12 @@ function CreateServerGroup()
|
||||
end if
|
||||
end if
|
||||
'Append http:// to server
|
||||
if left(server_hostname.value,4) <> "http" then server_hostname.value = "http://" + server_hostname.value
|
||||
if left(lcase(server_hostname.value),4) <> "http" then server_hostname.value = "http://" + server_hostname.value
|
||||
'If this is a different server from what we know, reset username/password setting
|
||||
if get_setting("server") <> server_hostname.value then
|
||||
set_setting("username", "")
|
||||
set_setting("password", "")
|
||||
endif
|
||||
end if
|
||||
set_setting("server", server_hostname.value)
|
||||
|
||||
' Show Connecting to Server spinner
|
||||
|
Loading…
Reference in New Issue
Block a user