codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix relative redirecting in blocklist plugin

This commit is contained in:
John Garland 2010-05-06 23:27:04 +10:00
parent 10de8d5475
commit 15247507d4
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -11,6 +11,7 @@
==== Blocklist ==== ==== Blocklist ====
* Implement local blocklist support * Implement local blocklist support
* #861: Pause transfers until blocklist is imported * #861: Pause transfers until blocklist is imported
* Fix redirection not working with relative paths
==== Execute ==== ==== Execute ====
* Fix running commands with the TorrentAdded event * Fix running commands with the TorrentAdded event

3
deluge/plugins/blocklist/blocklist/core.py
View File

@ -38,6 +38,7 @@ import os
import time import time
from datetime import datetime, timedelta from datetime import datetime, timedelta
from wsgiref.handlers import format_date_time from wsgiref.handlers import format_date_time
from urlparse import urljoin
import shutil import shutil
from twisted.internet.task import LoopingCall from twisted.internet.task import LoopingCall
@ -281,7 +282,7 @@ class Core(CorePluginBase):
d = f d = f
if f.check(error.PageRedirect): if f.check(error.PageRedirect):
# Handle redirect errors # Handle redirect errors
location = error_msg.split(" to ")[1] location = urljoin(self.config["url"], error_msg.split(" to ")[1])
if "Moved Permanently" in error_msg: if "Moved Permanently" in error_msg:
log.debug("Setting blocklist url to %s", location) log.debug("Setting blocklist url to %s", location)
self.config["url"] = location self.config["url"] = location