From b057f1e77b3a8026317273fbc829ffa82f5ba4b9 Mon Sep 17 00:00:00 2001 From: asc Date: Tue, 25 Oct 2022 12:47:07 -0500 Subject: [PATCH] fixed issues with third party family --- setup.py | 6 +++++- tox.ini | 3 --- wookiee_dl/cli.py | 3 ++- wookiee_dl/wookieepedia_family.py | 28 ++++++++++++++++++++++++++++ 4 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 wookiee_dl/wookieepedia_family.py diff --git a/setup.py b/setup.py index bcc3dc5..54806ad 100644 --- a/setup.py +++ b/setup.py @@ -2,12 +2,16 @@ Tools for downloading info from Wookieepedia """ from setuptools import find_packages, setup +from setuptools.command.install import install +from setuptools.command.develop import develop +import os +from setuptools.command.egg_info import egg_info dependencies = ['click', 'pywikibot', 'pymediawiki', 'mwparserfromhell'] setup( name='wookieedl', - version='0.1.0', + version='0.1.1', url='https://github.com/anthonyscorrea/wookiee-dl', license='BSD', author='Anthony Correa', diff --git a/tox.ini b/tox.ini index a470058..234bfdc 100644 --- a/tox.ini +++ b/tox.ini @@ -15,10 +15,7 @@ deps = commands = ;Generate pywikibot family file - python -m pywikibot.scripts.generate_family_file "https://starwars.fandom.com/wiki/Main_Page" "wookieepedia" "n" "n" python -m unittest discover - ;remove pywikibot family file - rm -rf ./families [testenv:black] deps = diff --git a/wookiee_dl/cli.py b/wookiee_dl/cli.py index c2d8ea3..ca1bb4b 100644 --- a/wookiee_dl/cli.py +++ b/wookiee_dl/cli.py @@ -3,8 +3,9 @@ import os import click import mediawiki from pywikibot import FilePage, Page, Site +from wookiee_dl.wookieepedia_family import Family as WookieepediaFamily -site = Site("en", "wookieepedia") +site = Site("en", fam=WookieepediaFamily()) site_mw = mediawiki.MediaWiki("https://starwars.fandom.com/api.php") diff --git a/wookiee_dl/wookieepedia_family.py b/wookiee_dl/wookieepedia_family.py new file mode 100644 index 0000000..c4f1900 --- /dev/null +++ b/wookiee_dl/wookieepedia_family.py @@ -0,0 +1,28 @@ +""" +This family file was auto-generated by generate_family_file.py script. + +Configuration parameters: + url = https://starwars.fandom.com/wiki/Main_Page + name = wookieepedia + +Please do not commit this to the Git repository! +""" +from pywikibot import family + + +class Family(family.Family): # noqa: D101 + + name = "wookieepedia" + langs = { + "en": "starwars.fandom.com", + } + + def scriptpath(self, code): + return { + "en": "", + }[code] + + def protocol(self, code): + return { + "en": "https", + }[code]