diff --git a/fanficdownloader/adapters/adapter_hpfanficarchivecom.py b/fanficdownloader/adapters/adapter_hpfanficarchivecom.py index 8a57e359..754132db 100644 --- a/fanficdownloader/adapters/adapter_hpfanficarchivecom.py +++ b/fanficdownloader/adapters/adapter_hpfanficarchivecom.py @@ -37,11 +37,6 @@ 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 f057c8f8..8fea5a7c 100644 --- a/fanficdownloader/adapters/adapter_ncisfictionnet.py +++ b/fanficdownloader/adapters/adapter_ncisfictionnet.py @@ -37,11 +37,6 @@ class NCISFictionNetAdapter(BaseSiteAdapter): def __init__(self, config, url): BaseSiteAdapter.__init__(self, config, url) - # 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.7')] - self.decode = ["iso-8859-1", "Windows-1252"] # 1252 is a superset of iso-8859-1. # Most sites that claim to be diff --git a/fanficdownloader/adapters/base_adapter.py b/fanficdownloader/adapters/base_adapter.py index ef0dc448..46273f8c 100644 --- a/fanficdownloader/adapters/base_adapter.py +++ b/fanficdownloader/adapters/base_adapter.py @@ -77,6 +77,8 @@ class BaseSiteAdapter(Configurable): self.is_adult=False self.opener = u2.build_opener(u2.HTTPCookieProcessor(),GZipProcessor()) + ## Specific UA because too many sites are blocking the default python UA. + self.opener.addheaders = [('User-agent', 'FFDL/1.7')] self.storyDone = False self.metadataDone = False self.story = Story(configuration)