monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-11-30 16:33:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'feature/ChangeReValidHost' into develop

Browse source
This commit is contained in:
JackDandy 2018-04-26 15:49:30 +01:00
commit cbcff5cfc2
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sickbeard/helpers.py
View file

@ -1351,10 +1351,11 @@ def maybe_plural(number=1):
def re_valid_hostname(with_allowed=True):
return re.compile(r'(?i)(%slocalhost|.*\.local|%s|%s)$' % (
'%s|' % (with_allowed
and (sickbeard.ALLOWED_HOSTS and re.escape(sickbeard.ALLOWED_HOSTS).replace(',', '|') or '.*')
or ''), socket.gethostname() or 'localhost', valid_ipaddr_expr()))
this_host = socket.gethostname()
return re.compile(r'(?i)(%slocalhost|.*\.local|%s%s)$' % (
(with_allowed
and '%s|' % (sickbeard.ALLOWED_HOSTS and re.escape(sickbeard.ALLOWED_HOSTS).replace(',', '|') or '.*')
or ''), bool(this_host) and ('%s|' % this_host) or '', valid_ipaddr_expr()))
def valid_ipaddr_expr():