Skip to content
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.

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

Remove sistersite feature. #1831

Merged
merged 1 commit into from
Jan 26, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion src/moin/config/default.py
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,6 @@ def __init__(self, exprstr):
"List of names of the supplementation (sub)items [Unicode]",
),
("interwiki_preferred", [], "In dialogues, show those wikis at the top of the list [list of Unicode]."),
("sistersites", [], "list of tuples: (<WikiName>, <sisterpagelist_fetch_url>)"),
("trail_size", 5, "Number of items in the trail of recently visited items"),
(
"item_views",
Expand Down
35 changes: 0 additions & 35 deletions src/moin/themes/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
split_fqname,
get_fqname,
)
from moin.utils.crypto import cache_key
from moin.utils.forms import make_generator
from moin.utils.clock import timed
from moin.utils.mime import Type
Expand Down Expand Up @@ -458,8 +457,6 @@ def navibar(self, fqname):
"""
if not isinstance(fqname, CompositeName):
fqname = split_fqname(fqname)
item_name = fqname.value
current = item_name
# Process config navi_bar
items = []
for cls, endpoint, args, link_text, title in self.cfg.navi_bar:
Expand All @@ -481,42 +478,10 @@ def navibar(self, fqname):
elif endpoint == "admin.index" and not getattr(flaskg.user.may, SUPERUSER)():
continue
items.append((cls, url_for(endpoint, **args), link_text, title))

# Add user links to wiki links.
for text in self.user.quicklinks:
url, link_text, title = self.split_navilink(text)
items.append(("userlink", url, link_text, title))

# Add sister pages (see http://meatballwiki.org/wiki/?SisterSitesImplementationGuide )
for sistername, sisterurl in self.cfg.sistersites:
if is_local_wiki(sistername):
items.append(("sisterwiki current", sisterurl, sistername, ""))
else:
cid = cache_key(usage="SisterSites", sistername=sistername)
sisteritems = app.cache.get(cid)
if sisteritems is None:
uo = urllib.request.URLopener()
uo.version = "MoinMoin SisterItem list fetcher 1.0"
try:
sisteritems = {}
f = uo.open(sisterurl)
for line in f:
line = line.strip()
try:
item_url, item_name = line.split(" ", 1)
sisteritems[item_name.decode("utf-8")] = item_url
except Exception:
pass # ignore invalid lines
f.close()
app.cache.set(cid, sisteritems)
logging.info(f"Site: {sistername!r} Status: Updated. Pages: {len(sisteritems)}")
except OSError as err:
(title, code, msg, headers) = err.args # code e.g. 304
logging.warning(f"Site: {sistername!r} Status: Not updated.")
logging.exception("exception was:")
if current in sisteritems:
url = sisteritems[current]
items.append(("sisterwiki", url, sistername, ""))
return items

def parent_item(self, item_name):
Expand Down
Loading