From b2a41a9b10daed127b1b3524384842d8b4aabdc1 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Sun, 28 Jul 2013 10:53:47 -0500 Subject: [PATCH] Use FFDL/1.7 User-Agent with hpfanficarchive.com because of python blocking. --- fanficdownloader/adapters/adapter_hpfanficarchivecom.py | 5 +++++ fanficdownloader/adapters/adapter_ncisfictionnet.py | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/fanficdownloader/adapters/adapter_hpfanficarchivecom.py b/fanficdownloader/adapters/adapter_hpfanficarchivecom.py index 4bd88033..7fb386a5 100644 --- a/fanficdownloader/adapters/adapter_hpfanficarchivecom.py +++ b/fanficdownloader/adapters/adapter_hpfanficarchivecom.py @@ -37,6 +37,11 @@ class HPFanficArchiveComAdapter(BaseSiteAdapter): def __init__(self, config, url): BaseSiteAdapter.__init__(self, config, url) + # hpfanficarchive.com blocks the default user-agent. However, + # when asked, they said it was just general anti-spam, not + # targeted at us. That lets me do this in good conscience: + self.opener.addheaders = [('User-agent', 'FFDL/1.7')] + self.decode = ["Windows-1252", "utf8"] # 1252 is a superset of iso-8859-1. # Most sites that claim to be diff --git a/fanficdownloader/adapters/adapter_ncisfictionnet.py b/fanficdownloader/adapters/adapter_ncisfictionnet.py index 079d8a1c..9b1f987e 100644 --- a/fanficdownloader/adapters/adapter_ncisfictionnet.py +++ b/fanficdownloader/adapters/adapter_ncisfictionnet.py @@ -37,10 +37,10 @@ class NCISFictionNetAdapter(BaseSiteAdapter): def __init__(self, config, url): BaseSiteAdapter.__init__(self, config, url) - # ncisfiction.net blocks IPs the default user-agent. However, + # ncisfiction.net blocks the default user-agent. However, # when asked, they said it was just general anti-spam, not # targeted at us. That lets me do this in good conscience: - self.opener.addheaders = [('User-agent', 'FFDL/1.6')] + self.opener.addheaders = [('User-agent', 'FFDL/1.7')] self.decode = ["iso-8859-1", "Windows-1252"] # 1252 is a superset of iso-8859-1.