Skip to content

Commit

Permalink
fix bug in link target rewriting
Browse files Browse the repository at this point in the history
  • Loading branch information
lahwaacz committed Mar 3, 2016
1 parent d76535d commit 7abcbe5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
6 changes: 1 addition & 5 deletions ArchWiki/ArchWiki.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def is_ascii(text):

class ArchWiki(MediaWiki):

def __init__(self, safe_filenames=False, resolve_redirects=True, **kwargs):
def __init__(self, safe_filenames=False, **kwargs):
""" Parameters:
@safe_filenames: force self.get_local_filename() to return ASCII string
@resolve_redirects: whether to resolve redirects inside self.get_local_filename()
Expand All @@ -106,7 +106,6 @@ def __init__(self, safe_filenames=False, resolve_redirects=True, **kwargs):
super().__init__(url, **kwargs)

self._safe_filenames = safe_filenames
self._resolve_redirects = resolve_redirects
self._namespaces = None
self._redirects = None

Expand Down Expand Up @@ -178,9 +177,6 @@ def detect_language(self, title):
def get_local_filename(self, title, basepath):
""" Return file name where the given page should be stored, relative to 'basepath'.
"""
if self._resolve_redirects is True:
title = self.resolve_redirect(title)

title, lang = self.detect_language(title)
title, namespace = self.detect_namespace(title)

Expand Down
2 changes: 2 additions & 0 deletions ArchWiki/optimizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ def update_links(self):
title = self.wiki.resolve_redirect(match.group(1))
try:
title, fragment = title.split("#", maxsplit=1)
# FIXME has to be dot-encoded
fragment = fragment.replace(" ", "_")
except ValueError:
fragment = ""
# explicit fragment overrides the redirect
Expand Down
2 changes: 1 addition & 1 deletion arch-wiki-docs.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
epoch = datetime.datetime.utcnow()
else:
# this should be the date of the latest incompatible change
epoch = datetime.datetime(2016, 3, 3, 14, 0, 0)
epoch = datetime.datetime(2016, 3, 3, 18, 0, 0)

user_agent = build_user_agent(__file__, ArchWiki.__version__, ArchWiki.__url__)
aw = ArchWiki.ArchWiki(user_agent=user_agent, safe_filenames=args.safe_filenames)
Expand Down

0 comments on commit 7abcbe5

Please sign in to comment.