do not sort BaseExtractor instances by name

pull/2301/head
Mike Fährmann 3 years ago
parent b4f8e15a1f
commit 4e4cb40663
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88

@ -864,32 +864,32 @@ Consider all sites to be NSFW unless otherwise known.
<td colspan="4"><strong>Gelbooru Beta 0.1.11</strong></td> <td colspan="4"><strong>Gelbooru Beta 0.1.11</strong></td>
</tr> </tr>
<tr> <tr>
<td>/v/idyart</td> <td>The /co/llection</td>
<td>https://vidyart.booru.org/</td> <td>https://the-collection.booru.org/</td>
<td>Posts, Tag Searches</td> <td>Posts, Tag Searches</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>All girl</td> <td>Illusion Game Cards</td>
<td>https://allgirl.booru.org/</td> <td>https://illusioncards.booru.org/</td>
<td>Posts, Tag Searches</td> <td>Posts, Tag Searches</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>Draw Friends</td> <td>All girl</td>
<td>https://drawfriends.booru.org/</td> <td>https://allgirl.booru.org/</td>
<td>Posts, Tag Searches</td> <td>Posts, Tag Searches</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>Illusion Game Cards</td> <td>Draw Friends</td>
<td>https://illusioncards.booru.org/</td> <td>https://drawfriends.booru.org/</td>
<td>Posts, Tag Searches</td> <td>Posts, Tag Searches</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>The /co/llection</td> <td>/v/idyart</td>
<td>https://the-collection.booru.org/</td> <td>https://vidyart.booru.org/</td>
<td>Posts, Tag Searches</td> <td>Posts, Tag Searches</td>
<td></td> <td></td>
</tr> </tr>
@ -937,37 +937,37 @@ Consider all sites to be NSFW unless otherwise known.
<td>Galleries, Posts, Search Results</td> <td>Galleries, Posts, Search Results</td>
<td><a href="configuration.rst#extractorderpibooruapi-key">API Key</a></td> <td><a href="configuration.rst#extractorderpibooruapi-key">API Key</a></td>
</tr> </tr>
<tr>
<td>Furbooru</td>
<td>https://furbooru.org/</td>
<td>Galleries, Posts, Search Results</td>
<td></td>
</tr>
<tr> <tr>
<td>Ponybooru</td> <td>Ponybooru</td>
<td>https://ponybooru.org/</td> <td>https://ponybooru.org/</td>
<td>Galleries, Posts, Search Results</td> <td>Galleries, Posts, Search Results</td>
<td>API Key</td> <td>API Key</td>
</tr> </tr>
<tr>
<td>Furbooru</td>
<td>https://furbooru.org/</td>
<td>Galleries, Posts, Search Results</td>
<td></td>
</tr>
<tr> <tr>
<td colspan="4"><strong>Reactor Instances</strong></td> <td colspan="4"><strong>Reactor Instances</strong></td>
</tr> </tr>
<tr> <tr>
<td>JoyReactor</td> <td>Reactor</td>
<td>http://joyreactor.cc/</td> <td>http://reactor.cc/</td>
<td>Posts, Search Results, Tag Searches, User Profiles</td> <td>Posts, Search Results, Tag Searches, User Profiles</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>PornReactor</td> <td>JoyReactor</td>
<td>http://pornreactor.cc/</td> <td>http://joyreactor.cc/</td>
<td>Posts, Search Results, Tag Searches, User Profiles</td> <td>Posts, Search Results, Tag Searches, User Profiles</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>Reactor</td> <td>PornReactor</td>
<td>http://reactor.cc/</td> <td>http://pornreactor.cc/</td>
<td>Posts, Search Results, Tag Searches, User Profiles</td> <td>Posts, Search Results, Tag Searches, User Profiles</td>
<td></td> <td></td>
</tr> </tr>
@ -982,8 +982,8 @@ Consider all sites to be NSFW unless otherwise known.
<td colspan="4"><strong>Moebooru and MyImouto</strong></td> <td colspan="4"><strong>Moebooru and MyImouto</strong></td>
</tr> </tr>
<tr> <tr>
<td>Hypnohub</td> <td>yande.re</td>
<td>https://hypnohub.net/</td> <td>https://yande.re/</td>
<td>Pools, Popular Images, Posts, Tag Searches</td> <td>Pools, Popular Images, Posts, Tag Searches</td>
<td></td> <td></td>
</tr> </tr>
@ -994,8 +994,8 @@ Consider all sites to be NSFW unless otherwise known.
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>Lolibooru</td> <td>Hypnohub</td>
<td>https://lolibooru.moe/</td> <td>https://hypnohub.net/</td>
<td>Pools, Popular Images, Posts, Tag Searches</td> <td>Pools, Popular Images, Posts, Tag Searches</td>
<td></td> <td></td>
</tr> </tr>
@ -1006,8 +1006,8 @@ Consider all sites to be NSFW unless otherwise known.
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>yande.re</td> <td>Lolibooru</td>
<td>https://yande.re/</td> <td>https://lolibooru.moe/</td>
<td>Pools, Popular Images, Posts, Tag Searches</td> <td>Pools, Popular Images, Posts, Tag Searches</td>
<td></td> <td></td>
</tr> </tr>
@ -1022,8 +1022,8 @@ Consider all sites to be NSFW unless otherwise known.
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>arch.b4k.co</td> <td>Archived.Moe</td>
<td>https://arch.b4k.co/</td> <td>https://archived.moe/</td>
<td>Boards, Galleries, Search Results, Threads</td> <td>Boards, Galleries, Search Results, Threads</td>
<td></td> <td></td>
</tr> </tr>
@ -1034,8 +1034,8 @@ Consider all sites to be NSFW unless otherwise known.
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>Archived.Moe</td> <td>arch.b4k.co</td>
<td>https://archived.moe/</td> <td>https://arch.b4k.co/</td>
<td>Boards, Galleries, Search Results, Threads</td> <td>Boards, Galleries, Search Results, Threads</td>
<td></td> <td></td>
</tr> </tr>
@ -1101,12 +1101,6 @@ Consider all sites to be NSFW unless otherwise known.
<tr> <tr>
<td colspan="4"><strong>Mastodon Instances</strong></td> <td colspan="4"><strong>Mastodon Instances</strong></td>
</tr> </tr>
<tr>
<td>baraag</td>
<td>https://baraag.net/</td>
<td>Images from Statuses, User Profiles</td>
<td><a href="https://github.com/mikf/gallery-dl#oauth">OAuth</a></td>
</tr>
<tr> <tr>
<td>mastodon.social</td> <td>mastodon.social</td>
<td>https://mastodon.social/</td> <td>https://mastodon.social/</td>
@ -1119,6 +1113,12 @@ Consider all sites to be NSFW unless otherwise known.
<td>Images from Statuses, User Profiles</td> <td>Images from Statuses, User Profiles</td>
<td><a href="https://github.com/mikf/gallery-dl#oauth">OAuth</a></td> <td><a href="https://github.com/mikf/gallery-dl#oauth">OAuth</a></td>
</tr> </tr>
<tr>
<td>baraag</td>
<td>https://baraag.net/</td>
<td>Images from Statuses, User Profiles</td>
<td><a href="https://github.com/mikf/gallery-dl#oauth">OAuth</a></td>
</tr>
<tr> <tr>
<td colspan="4"><strong>Shopify Instances</strong></td> <td colspan="4"><strong>Shopify Instances</strong></td>
@ -1129,12 +1129,6 @@ Consider all sites to be NSFW unless otherwise known.
<td>Collections, Products</td> <td>Collections, Products</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>Loungeunderwear</td>
<td>https://loungeunderwear.com/</td>
<td>Collections, Products</td>
<td></td>
</tr>
<tr> <tr>
<td>Omg Miami Swimwear</td> <td>Omg Miami Swimwear</td>
<td>https://www.omgmiamiswimwear.com/</td> <td>https://www.omgmiamiswimwear.com/</td>
@ -1147,6 +1141,12 @@ Consider all sites to be NSFW unless otherwise known.
<td>Collections, Products</td> <td>Collections, Products</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>Loungeunderwear</td>
<td>https://loungeunderwear.com/</td>
<td>Collections, Products</td>
<td></td>
</tr>
<tr> <tr>
<td colspan="4"><strong>lolisafe and chibisafe</strong></td> <td colspan="4"><strong>lolisafe and chibisafe</strong></td>

@ -408,8 +408,10 @@ def generate_output(columns, categories, domains):
name = BASE_MAP.get(name) or (name.capitalize() + " Instances") name = BASE_MAP.get(name) or (name.capitalize() + " Instances")
append('\n<tr>\n <td colspan="4"><strong>' + append('\n<tr>\n <td colspan="4"><strong>' +
name + '</strong></td>\n</tr>') name + '</strong></td>\n</tr>')
clist = base.items()
else:
clist = sorted(base.items(), key=category_key) clist = sorted(base.items(), key=category_key)
for category, subcategories in clist: for category, subcategories in clist:
append("<tr>") append("<tr>")
for column in columns: for column in columns:

Loading…
Cancel
Save