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

Further attempt at extended char URLs for adapter_wwwlushstoriescom. Works on Win10(US English) CLI and Calibre.

Browse source
This commit is contained in:
Jim Miller 2017-01-04 14:53:01 -06:00
parent bd9b8d61f4
commit 267c19e8dd
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
fanficfare/adapters/adapter_wwwlushstoriescom.py
View file

@ -25,7 +25,6 @@ import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
import re import re
import urllib2 import urllib2
import sys
from ..htmlcleanup import stripHTML from ..htmlcleanup import stripHTML
from .. import exceptions as exceptions from .. import exceptions as exceptions
@ -58,8 +57,18 @@ class WWWLushStoriesComAdapter(BaseSiteAdapter): # XXX
self.is_adult=False self.is_adult=False
# get storyId from url # get storyId from url
self.story.setMetadata('storyId',urllib2.quote(self.parsedUrl.path.split('/')[3].replace( storyId = self.parsedUrl.path.split('/')[3].replace('.aspx','')
'.aspx',''))) if '%' not in storyId:
## assume already escaped if contains %. Assume needs escaping if it doesn't.
try:
storyId = urllib2.quote(storyId)
except KeyError:
## string from calibre on windows *isn't* utf8, but a
## latin1 of some kind. This encode would be better
## done somewhere where the code type can be known.
storyId = urllib2.quote(storyId.encode("Windows-1252"))
self.story.setMetadata('storyId',storyId)
## This site has the category as part of the url, so to normalize the url below, we get it ## This site has the category as part of the url, so to normalize the url below, we get it
## here ## here