Commit 8796b13d authored by echel0n's avatar echel0n
Browse files

Merge branch 'release/9.3.66'

parents cc74e2e9 569f95cf
# Changelog
- * 9098c26 - 2018-08-30: Release v9.3.65
- * 4332f4e - 2018-09-01: Release v9.3.66
- * 33b3f9c - 2018-09-01: Disabled changelog from popping after a new update
- * 4c62c8c - 2018-08-31: Pre-Release v9.3.66.dev2
- * 4ac6773 - 2018-08-31: Pre-Release v9.3.66.dev1
- * 1ee6798 - 2018-08-31: Fixed issue #265 - Unable to detect internal IP address in order to add UPnP portmap
- * ab769b0 - 2018-08-30: Release v9.3.65
- * 889fa19 - 2018-08-30: Fixed issues with failed snatch searcher attempting to re-download archived episodes
- * cd59c7f - 2018-08-30: Pre-Release v9.3.65.dev3
- * 61c0376 - 2018-08-30: Pre-Release v9.3.65.dev2
......
......@@ -48,7 +48,7 @@ class UPNPClient(object):
self.add_nat_portmap()
def add_nat_portmap(self):
#sickrage.app.log.debug("Adding SiCKRAGE UPNP portmap...")
# sickrage.app.log.debug("Adding SiCKRAGE UPNP portmap...")
try:
upnp_dev = self._discover_upnp_device()
......@@ -68,10 +68,10 @@ class UPNPClient(object):
sickrage.app.log.exception("Failed to add UPnP portmap")
def _add_nat_portmap(self, upnp_dev):
internal_ip = self._find_internal_ip_on_device_network(upnp_dev)
if internal_ip is None:
sickrage.app.log.warn("Unable to detect internal IP address in order to add UPnP portmap")
return
# internal_ip = self._find_internal_ip_on_device_network(upnp_dev)
# if internal_ip is None:
# sickrage.app.log.warn("Unable to detect internal IP address in order to add UPnP portmap")
# return
for protocol, description in [('TCP', 'SiCKRAGE')]:
upnp_dev.WANIPConn1.AddPortMapping(
......@@ -79,16 +79,16 @@ class UPNPClient(object):
NewExternalPort=sickrage.app.config.web_external_port,
NewProtocol=protocol,
NewInternalPort=sickrage.app.config.web_port,
NewInternalClient=internal_ip,
NewInternalClient=sickrage.app.config.web_host,
NewEnabled='1',
NewPortMappingDescription=description,
NewLeaseDuration=self._nat_portmap_lifetime,
)
#sickrage.app.log.debug("UPnP port forwarding successfully added")
# sickrage.app.log.debug("UPnP port forwarding successfully added")
def delete_nat_portmap(self):
#sickrage.app.log.debug("Deleting SiCKRAGE UPNP portmap...")
# sickrage.app.log.debug("Deleting SiCKRAGE UPNP portmap...")
upnp_dev = self._discover_upnp_device()
if upnp_dev is None:
......@@ -96,11 +96,6 @@ class UPNPClient(object):
self._delete_nat_portmap(upnp_dev)
def _delete_nat_portmap(self, upnp_dev):
internal_ip = self._find_internal_ip_on_device_network(upnp_dev)
if internal_ip is None:
sickrage.app.log.warn("Unable to detect internal IP address in order to delete UPnP portmap")
return
for protocol, description in [('TCP', 'SiCKRAGE')]:
upnp_dev.WANIPConn1.DeletePortMapping(
NewRemoteHost='',
......@@ -108,7 +103,7 @@ class UPNPClient(object):
NewProtocol=protocol,
)
#sickrage.app.log.debug("UPnP port forwarding successfully deleted")
# sickrage.app.log.debug("UPnP port forwarding successfully deleted")
def _discover_upnp_device(self):
devices = upnpclient.discover()
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2178,7 +2178,11 @@ class changelog(WebHandler):
super(changelog, self).__init__(*args, **kwargs)
def index(self):
data = markdown2.markdown(sickrage.changelog(), extras=['header-ids'])
try:
data = markdown2.markdown(sickrage.changelog(), extras=['header-ids'])
except Exception:
data = ''
sickrage.app.config.view_changelog = False
sickrage.app.config.save()
return data
......
......@@ -290,7 +290,6 @@
</div>
<div class="form-row form-group">
<div class="col-lg-3 col-md-4 col-sm-5">
<label class="component-title">${_('Show indexer timeout')}</label>
</div>
......@@ -313,7 +312,6 @@
</div>
</div>
</div>
</div>
<div class="form-row form-group">
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment