Backup_Repos/FanFicFare
1
0
Fork 0
mirror of https://github.com/JimmXinu/FanFicFare.git synced 2026-05-08 21:11:59 +02:00
Code Issues Projects Releases Wiki Activity

Add always_login setting to base_xenforo for SV login-required story with 404 result.

Browse source
This commit is contained in:
Jim Miller 2019-01-15 10:55:45 -06:00
parent d423100e6b
commit 188d3420f6
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
fanficfare/adapters/base_xenforoforum_adapter.py
View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright 2018 FanFicFare team
# Copyright 2019 FanFicFare team
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -194,6 +194,10 @@ class BaseXenForoForumAdapter(BaseSiteAdapter):
else:
params['login'] = self.getConfig("username")
params['password'] = self.getConfig("password")
if not params['login']:
raise exceptions.FailedToLogin(self.url,"No username given. Set in personal.ini or enter when prompted.")
params['register'] = '0'
params['cookie_check'] = '1'
params['_xfToken'] = ''
@ -328,13 +332,14 @@ class BaseXenForoForumAdapter(BaseSiteAdapter):
useurl = opened.geturl()
logger.info("use useurl: "+useurl)
except HTTPError as e:
if e.code == 404:
raise exceptions.StoryDoesNotExist(self.url)
elif e.code == 403:
# QQ gives 403, SV at least gives 404. Which unfortunately
if e.code == 403 or self.getConfig('always_login',False):
self.performLogin()
(data,opened) = self._fetchUrlOpened(useurl)
useurl = opened.geturl()
logger.info("use useurl: "+useurl)
elif e.code == 404:
raise exceptions.StoryDoesNotExist(self.url)
else:
raise
if '#' not in useurl and '/posts/' not in useurl:

2
fanficfare/configurable.py
View file

@ -224,7 +224,7 @@ def get_valid_set_options():
'include_author_notes':(['fimfiction.net'],None,boollist),
'do_update_hook':(['fimfiction.net',
'archiveofourown.org'],None,boollist),
'always_login':(['archiveofourown.org'],None,boollist),
'always_login':(['archiveofourown.org']+base_xenforo_list,None,boollist),
'use_archived_author':(['archiveofourown.org'],None,boollist),
'use_view_full_work':(['archiveofourown.org'],None,boollist),