Backup_Repos/FanFicFare
1
0
Fork 0
mirror of https://github.com/JimmXinu/FanFicFare.git synced 2026-05-04 18:40:51 +02:00
Code Issues Projects Releases Wiki Activity

login now required

Browse source
This commit is contained in:
oh45454545 2019-04-24 01:37:18 +02:00
parent 4976611375
commit 2b0d053c54
3 changed files with 37 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
calibre-plugin/plugin-defaults.ini
View file

@ -2133,10 +2133,11 @@ strip_text_links:true
[www.asianfanfics.com]
## Unlike most sites, asianfanfics.com, instead of denying access to
## 'adult' content, will censor the text of stories to remove the
## 'adult' words. FanFicFare cannot detect when this happens, but if
## you set your username and password, FFF will log you in to prevent
## that.
## 'adult' or subscriber-only content, will censor the text of stories
## to remove 'adult' words or entire portions of the text. This is why
## an account is required to download stories from this site. It is
## also strongly recommended to consider enabling auto_sub in order to
## further avoid this from happening.
#username:YourName
#password:yourpassword
@ -2165,7 +2166,10 @@ inject_chapter_title:false
## This website removes certain HTML tags and portions of the story
## from subscriber-only stories. It is strongly recommended to turn
## this option on.
## this option on. This will automatically subscribe you to such
## stories in order to acquire the unaltered text. You can
## unsubscribe manually on the website after the story has been
## downloaded.
auto_sub:false
[www.bdsmlibrary.com]

43
fanficfare/adapters/adapter_asianfanficscom.py
View file

@ -71,15 +71,24 @@ class AsianFanFicsComAdapter(BaseSiteAdapter):
else:
params['username'] = self.getConfig("username")
params['password'] = self.getConfig("password")
if not params['username']:
raise exceptions.FailedToLogin(url,params['username'])
params['from_url'] = url
params['csrf_aff_token'] = soup.find('input',{'name':'csrf_aff_token'})['value']
if not params['csrf_aff_token']:
raise exceptions.FailedToDownload('Error when logging in. This usually means a change in the website code.')
loginUrl = 'https://' + self.getSiteDomain() + '/login/index'
logger.info("Will now login to URL (%s) as (%s)" % (loginUrl, params['username']))
d = self._postUrl(loginUrl, params, usecache=False)
data = self._postUrl(loginUrl, params)
soup = self.make_soup(data)
if params['username'] not in d: # check if username is mentioned in output (logged in as, var visitorName, etc.)
logger.info("Failed to login to URL %s as %s" % (loginUrl, params['username']))
loginCheck = soup.find('div',{'id':'login'})
if loginCheck:
logger.info('Failed to login to URL %s as %s' % (loginUrl, params['username']))
raise exceptions.FailedToLogin(url,params['username'])
return False
else:
@ -112,7 +121,6 @@ class AsianFanFicsComAdapter(BaseSiteAdapter):
def doExtractChapterUrlsAndMetadata(self,get_cover=True):
url = self.url
logger.info("url: "+url)
try:
data = self._fetchUrl(url)
@ -125,31 +133,23 @@ class AsianFanFicsComAdapter(BaseSiteAdapter):
# use BeautifulSoup HTML parser to make everything easier to find.
soup = self.make_soup(data)
# it is best to log in whenever possible, unless already logged in from cache..
loginCheck = soup.find('div',{'id':'login'})
if self.password or self.getConfig("password") and loginCheck:
self.performLogin(url,soup)
data = self._fetchUrl(url,usecache=False)
soup = self.make_soup(data)
elif "Logout" not in data:
logger.info('Note: Logging in is highly recommended, as this website censors text otherwise.')
# require login to avoid lots of headaches
self.performLogin(url,soup)
# adult check
adultCheck = soup.find('form',{'action':'/account/toggle_age'})
if adultCheck:
logger.info('This story is marked as mature. It is recommended to log in, as this website censors text otherwise.')
# refresh website after logging in
data = self._fetchUrl(url,usecache=False)
soup = self.make_soup(data)
# subscription check
loginCheck = soup.find('div',{'id':'login'})
subCheck = soup.find('div',{'class':'click-to-read-full'})
if subCheck and self.getConfig("auto_sub") and not loginCheck:
if subCheck and self.getConfig("auto_sub"):
subSoup = self.doStorySubscribe(url,soup)
if subSoup:
soup = subSoup
else:
raise exceptions.FailedToDownload("Error when subscribing to story. This usually means a change in the website code.")
elif subCheck and not self.getConfig("auto_sub"):
raise exceptions.FailedToDownload("This story is marked as subscribers-only. It is recommended to log in and switch auto_sub to true in personal.ini, as this website removes certain HTML tags and portions of the text otherwise.")
raise exceptions.FailedToDownload("This story is marked as subscribers-only. In order to download such stories, auto_sub must be set to true in personal.ini, as this website removes certain HTML tags and portions of the text otherwise.")
## Title
a = soup.find('h1', {'id': 'story-title'})
@ -253,11 +253,6 @@ class AsianFanFicsComAdapter(BaseSiteAdapter):
data = self._fetchUrl(url)
soup = self.make_soup(data)
# have to do adult check here as well because individual chapters can be marked as mature
adultCheck = soup.find('form',{'action':'/account/toggle_age'})
if adultCheck:
logger.info('Some chapters in this story are marked as mature. It is recommended to log in, as this website censors text otherwise.')
try:
# https://www.asianfanfics.com/api/chapters/4791923/chapter_46d32e413d1a702a26f7637eabbfb6f3.json
jsonlink = soup.find('link',href=re.compile(r'/api/chapters/[0-9]+/chapter_[0-9a-z]+.json'))

14
fanficfare/defaults.ini
View file

@ -2167,10 +2167,11 @@ strip_text_links:true
[www.asianfanfics.com]
## Unlike most sites, asianfanfics.com, instead of denying access to
## 'adult' content, will censor the text of stories to remove the
## 'adult' words. FanFicFare cannot detect when this happens, but if
## you set your username and password, FFF will log you in to prevent
## that.
## 'adult' or subscriber-only content, will censor the text of stories
## to remove 'adult' words or entire portions of the text. This is why
## an account is required to download stories from this site. It is
## also strongly recommended to consider enabling auto_sub in order to
## further avoid this from happening.
#username:YourName
#password:yourpassword
@ -2199,7 +2200,10 @@ inject_chapter_title:false
## This website removes certain HTML tags and portions of the story
## from subscriber-only stories. It is strongly recommended to turn
## this option on.
## this option on. This will automatically subscribe you to such
## stories in order to acquire the unaltered text. You can
## unsubscribe manually on the website after the story has been
## downloaded.
auto_sub:false
[www.bdsmlibrary.com]