Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2024-12-25 10:16:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #109 from oddstr13/pr-ipv6-input-brackets-2

Browse source 
Remove dependency on `ipaddress` (not stdlib in py2)
This commit is contained in:
mcarlton00 2019-10-05 09:14:34 -04:00 committed by GitHub
commit fb6e8f54b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
resources/lib/dialogs/servermanual.py
View file

@ -4,7 +4,7 @@
import logging import logging
import os import os
import ipaddress import re
import xbmcgui import xbmcgui
import xbmcaddon import xbmcaddon
@ -27,6 +27,9 @@ ERROR = {
'Empty': 2 'Empty': 2
} }
# https://stackoverflow.com/a/17871737/1035647
_IPV6_PATTERN = "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$"
_IPV6_RE = re.compile(_IPV6_PATTERN)
################################################################################################## ##################################################################################################
@ -115,12 +118,8 @@ class ServerManual(xbmcgui.WindowXMLDialog):
return control return control
def _connect_to_server(self, server, port): def _connect_to_server(self, server, port):
try: if _IPV6_RE.match(server):
addr = ipaddress.ip_address(server.decode('utf-8') if not isinstance(server, type(u'')) else server) server = "[%s]" % (server)
if addr.version == 6:
server = u"[%s]" % (addr.compressed)
except ValueError:
pass
server_address = "%s:%s" % (server, port) if port else server server_address = "%s:%s" % (server, port) if port else server
self._message("%s %s..." % (_(30610), server_address)) self._message("%s %s..." % (_(30610), server_address))

4
resources/lib/jellyfin/core/connection_manager.py
View file

@ -476,6 +476,10 @@ class ConnectionManager(object):
return None return None
def _normalize_address(self, address): def _normalize_address(self, address):
# TODO: Try HTTPS first, then HTTP if that fails.
if '://' not in address:
address = 'http://' + address
# Attempt to correct bad input # Attempt to correct bad input
url = urllib3.util.parse_url(address.strip()) url = urllib3.util.parse_url(address.strip())