Skip to content

WIP: Migrate mediawiki to a namespace in dokuwiki for inclusion in existing dokuwiki #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
loz-hurst wants to merge 15 commits into
base: master
Choose a base branch
from
Open

WIP: Migrate mediawiki to a namespace in dokuwiki for inclusion in existing dokuwiki #55

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
af74c3d
Add support for <s>..</s> (which is the same as <del>..</del>) in med…
Aug 15, 2019
da32e65
Added support for strikethrough text with <del> tag
Aug 15, 2019
df663b5
Added content test for del and s tags.
Aug 15, 2019
743ce31
Missed a change in last commit - del belongs in Tag not Style
Aug 15, 2019
98a4c18
Added support for table captions.
Aug 15, 2019
4e96c53
Changed to convert captions to bold text and add tests.
Aug 15, 2019
311d221
Fixed bugs with pagesnames that have ':' or begin with '/' or space.
Aug 20, 2019
0f0f070
Print url of downloaded image - for debugging failed fetches
Aug 20, 2019
b1d1215
Working on migrating to a sub namespace in dokuwiki
Aug 20, 2019
cb027de
Merge pull request #1 from loz-hurst/pagename-bugfixes
loz-hurst Aug 20, 2019
05e7b2d
Merge pull request #2 from loz-hurst/print-url-of-downloaded-img
loz-hurst Aug 20, 2019
6fa65fe
Merge pull request #3 from loz-hurst/table_caption_support
loz-hurst Aug 20, 2019
eeb84ee
Merge pull request #4 from loz-hurst/s_tag_support
loz-hurst Aug 20, 2019
e76e94c
Merge branch 'lah-develop' into migrate-to-namespace
loz-hurst Aug 20, 2019
f4ebb3f
Merge remote-tracking branch 'origin' into migrate-to-namespace
LHurst-UoB Aug 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions dokuwiki.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,20 @@ def write_images(self, images, file_namespace, http_user=None, http_pass=None):
"""
auth=None if http_user is None else HTTPBasicAuth(http_user, http_pass)
file_namespace = file_namespace.lower()
filedir = os.path.join(self.data, "media", file_namespace)
ensure_directory_exists(filedir)
filemeta = os.path.join(self.data, "media_meta", file_namespace)
ensure_directory_exists(filemeta)
for image in images:
# download the image from the Mediawiki server
print("Downloading %s... (%s)" % (image['name'], image['url']))
r = requests.get(image['url'], auth=auth)
# write the actual image out to the data/file directory
name = make_dokuwiki_pagename(image['name'])
if ':' in name:
this_file_namespace, name = name.split(':')
else:
this_file_namespace = file_namespace
filedir = os.path.join(self.data, "media", this_file_namespace)
ensure_directory_exists(filedir)
filemeta = os.path.join(self.data, "media_meta", this_file_namespace)
ensure_directory_exists(filemeta)
imagepath = os.path.join(filedir, name)
with open(imagepath, "wb") as f:
f.write(r.content)
Expand All @@ -69,7 +73,7 @@ def write_images(self, images, file_namespace, http_user=None, http_pass=None):
# write a .changes file out to the media_meta/file directory
changepath = os.path.join(filemeta, "%s.changes" % name)
with codecs.open(changepath, "w", "utf-8") as f:
fields = (str(timestamp), "::1", "C", u"%s:%s"%(file_namespace,name), "", "created")
fields = (str(timestamp), "::1", "C", u"%s:%s"%(this_file_namespace,name), "", "created")
f.write(u"\t".join(fields) + "\r\n")
# aggregate all the new changes to the media_meta/_media.changes file
self._aggregate_changes(os.path.join(self.data, "media_meta"), "_media.changes")
Expand Down Expand Up @@ -200,6 +204,8 @@ def make_dokuwiki_pagename(mediawiki_name):
result = result.lstrip(':')
# Fix any pages that began with a space, because that breaks dokuwiki
result = result.replace(":_", ":")
# Add custom namespace
result = "old_wiki:" + result
result = codecs.encode(result, sys.getfilesystemencoding(), "replace")
return result

Expand Down