Backup_Repos/FanFicFare
1
0
Fork 0
mirror of https://github.com/JimmXinu/FanFicFare.git synced 2025-12-07 09:23:28 +01:00
Code Issues Projects Releases Wiki Activity

OTW: Fix for site change breaking logged in detection. Closes #1263

Browse source
This commit is contained in:
Jim Miller 2025-10-18 09:29:14 -05:00
parent fe82aed91d
commit 68ad4c87aa
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fanficfare/adapters/base_otw_adapter.py
View file

@ -27,6 +27,8 @@ from .. import exceptions as exceptions
from .base_adapter import BaseSiteAdapter, makeDate from .base_adapter import BaseSiteAdapter, makeDate
LOGOUT_STR='href="/users/logout'
class BaseOTWAdapter(BaseSiteAdapter): class BaseOTWAdapter(BaseSiteAdapter):
def __init__(self, config, url): def __init__(self, config, url):
@ -138,7 +140,7 @@ class BaseOTWAdapter(BaseSiteAdapter):
d = self.post_request(loginUrl, params) d = self.post_request(loginUrl, params)
if 'href="/users/logout"' not in d : if LOGOUT_STR not in d :
logger.info("Failed to login to URL %s as %s" % (loginUrl, logger.info("Failed to login to URL %s as %s" % (loginUrl,
params['user[login]'])) params['user[login]']))
raise exceptions.FailedToLogin(url,params['user[login]']) raise exceptions.FailedToLogin(url,params['user[login]'])
@ -159,7 +161,7 @@ class BaseOTWAdapter(BaseSiteAdapter):
logger.debug("Converting TEMP chapters URL to storyUrl") logger.debug("Converting TEMP chapters URL to storyUrl")
data = self.get_request(churl) data = self.get_request(churl)
if self.needToLoginCheck(data) or \ if self.needToLoginCheck(data) or \
( self.getConfig("always_login") and 'href="/users/logout"' not in data ): ( self.getConfig("always_login") and LOGOUT_STR not in data ):
self.performLogin(churl,data) self.performLogin(churl,data)
data = self.get_request(churl,usecache=False) data = self.get_request(churl,usecache=False)
# logger.debug(data) # logger.debug(data)
@ -225,7 +227,7 @@ class BaseOTWAdapter(BaseSiteAdapter):
# need to log in for this one, or always_login. # need to log in for this one, or always_login.
# logger.debug(data) # logger.debug(data)
if self.needToLoginCheck(data) or \ if self.needToLoginCheck(data) or \
( self.getConfig("always_login") and 'href="/users/logout"' not in data ): ( self.getConfig("always_login") and LOGOUT_STR not in data ):
self.performLogin(url,data) self.performLogin(url,data)
data = self.get_request(url,usecache=False) data = self.get_request(url,usecache=False)
meta = self.get_request(metaurl,usecache=False) meta = self.get_request(metaurl,usecache=False)
@ -251,7 +253,7 @@ class BaseOTWAdapter(BaseSiteAdapter):
a = soup.find('a', href=re.compile(r"/works/\d+$")) a = soup.find('a', href=re.compile(r"/works/\d+$"))
self.story.setMetadata('title',stripHTML(a)) self.story.setMetadata('title',stripHTML(a))
if self.getConfig("always_login") and 'href="/users/logout"' in data: # check actually is logged. if self.getConfig("always_login") and LOGOUT_STR in data: # check actually is logged.
# deliberately using always_login instead of checking for # deliberately using always_login instead of checking for
# actual login so we don't have a case where these show up # actual login so we don't have a case where these show up
# for a user only when they get user-restricted stories. # for a user only when they get user-restricted stories.