indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Tidying

merge-requests/30/head
Bob Mottram 2024-04-08 15:55:10 +01:00
parent 6c0b11aef5
commit 52ab97b03b
3 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
daemon_get.py
View File

@ -1349,7 +1349,10 @@ def daemon_http_get(self) -> None:
proxy_type, proxy_type,
getreq_start_time, getreq_start_time,
self.server.debug, self.server.debug,
curr_session, MAX_POSTS_IN_RSS_FEED) curr_session, MAX_POSTS_IN_RSS_FEED,
self.server.translate,
self.server.system_language,
self.server.fitness)
else: else:
get_rss2site(self, calling_domain, self.path, get_rss2site(self, calling_domain, self.path,
self.server.base_dir, self.server.base_dir,
@ -1360,7 +1363,9 @@ def daemon_http_get(self) -> None:
self.server.translate, self.server.translate,
getreq_start_time, getreq_start_time,
self.server.debug, self.server.debug,
curr_session, MAX_POSTS_IN_RSS_FEED) curr_session, MAX_POSTS_IN_RSS_FEED,
self.server.system_language,
self.server.fitness)
return return
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, self.server.fitness,
@ -1379,7 +1384,8 @@ def daemon_http_get(self) -> None:
getreq_start_time, getreq_start_time,
self.server.debug, self.server.debug,
self.server.system_language, self.server.system_language,
curr_session, MAX_POSTS_IN_RSS_FEED) curr_session, MAX_POSTS_IN_RSS_FEED,
self.server.fitness)
return return
users_in_path = False users_in_path = False
@ -1669,7 +1675,11 @@ def daemon_http_get(self) -> None:
proxy_type, proxy_type,
cookie, self.server.translate, cookie, self.server.translate,
self.server.debug, self.server.debug,
curr_session, MAX_POSTS_IN_BLOGS_FEED): curr_session, MAX_POSTS_IN_BLOGS_FEED,
self.server.peertube_instances,
self.server.system_language,
self.server.person_cache,
self.server.fitness):
return return
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, self.server.fitness,

14
daemon_get_blog.py
View File

@ -23,7 +23,11 @@ def show_blog_page(self, authorized: bool,
proxy_type: str, cookie: str, proxy_type: str, cookie: str,
translate: {}, debug: str, translate: {}, debug: str,
curr_session, curr_session,
max_posts_in_blogs_feed: int) -> bool: max_posts_in_blogs_feed: int,
peertube_instances: [],
system_language: str,
person_cache: {},
fitness: {}) -> bool:
"""Shows a blog page """Shows a blog page
""" """
page_number = 1 page_number = 1
@ -64,9 +68,9 @@ def show_blog_page(self, authorized: bool,
nickname, nickname,
domain, port, domain, port,
max_posts_in_blogs_feed, page_number, max_posts_in_blogs_feed, page_number,
self.server.peertube_instances, peertube_instances,
self.server.system_language, system_language,
self.server.person_cache, person_cache,
debug) debug)
if msg is not None: if msg is not None:
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
@ -75,7 +79,7 @@ def show_blog_page(self, authorized: bool,
cookie, calling_domain, False) cookie, calling_domain, False)
write2(self, msg) write2(self, msg)
fitness_performance(getreq_start_time, fitness_performance(getreq_start_time,
self.server.fitness, fitness,
'_GET', 'show_blog_page', '_GET', 'show_blog_page',
debug) debug)
return True return True

24
daemon_get_rss.py
View File

@ -26,7 +26,10 @@ def get_rss2feed(self, calling_domain: str, path: str,
domain: str, port: int, proxy_type: str, domain: str, port: int, proxy_type: str,
getreq_start_time, debug: bool, getreq_start_time, debug: bool,
curr_session, curr_session,
max_posts_in_rss_feed: int) -> None: max_posts_in_rss_feed: int,
translate: {},
system_language: str,
fitness: {}) -> None:
"""Returns an RSS2 feed for the blog """Returns an RSS2 feed for the blog
""" """
nickname = path.split('/blog/')[1] nickname = path.split('/blog/')[1]
@ -46,13 +49,13 @@ def get_rss2feed(self, calling_domain: str, path: str,
msg = \ msg = \
html_blog_page_rss2(base_dir, html_blog_page_rss2(base_dir,
http_prefix, http_prefix,
self.server.translate, translate,
nickname, nickname,
domain, domain,
port, port,
max_posts_in_rss_feed, 1, max_posts_in_rss_feed, 1,
True, True,
self.server.system_language) system_language)
if msg is not None: if msg is not None:
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -62,7 +65,7 @@ def get_rss2feed(self, calling_domain: str, path: str,
if debug: if debug:
print('Sent rss2 feed: ' + print('Sent rss2 feed: ' +
path + ' ' + calling_domain) path + ' ' + calling_domain)
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, fitness,
'_GET', '_get_rss2feed', '_GET', '_get_rss2feed',
debug) debug)
return return
@ -79,7 +82,9 @@ def get_rss2site(self, calling_domain: str, path: str,
getreq_start_time, getreq_start_time,
debug: bool, debug: bool,
curr_session, curr_session,
max_posts_in_rss_feed: int) -> None: max_posts_in_rss_feed: int,
system_language: str,
fitness: {}) -> None:
"""Returns an RSS2 feed for all blogs on this instance """Returns an RSS2 feed for all blogs on this instance
""" """
curr_session = \ curr_session = \
@ -107,7 +112,7 @@ def get_rss2site(self, calling_domain: str, path: str,
port, port,
max_posts_in_rss_feed, 1, max_posts_in_rss_feed, 1,
False, False,
self.server.system_language) system_language)
break break
if msg: if msg:
msg = rss2header(http_prefix, msg = rss2header(http_prefix,
@ -122,7 +127,7 @@ def get_rss2site(self, calling_domain: str, path: str,
if debug: if debug:
print('Sent rss2 feed: ' + print('Sent rss2 feed: ' +
path + ' ' + calling_domain) path + ' ' + calling_domain)
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, fitness,
'_GET', '_get_rss2site', '_GET', '_get_rss2site',
debug) debug)
return return
@ -138,7 +143,8 @@ def get_rss3feed(self, calling_domain: str, path: str,
getreq_start_time, getreq_start_time,
debug: bool, system_language: str, debug: bool, system_language: str,
curr_session, curr_session,
max_posts_in_rss_feed: int) -> None: max_posts_in_rss_feed: int,
fitness: {}) -> None:
"""Returns an RSS3 feed """Returns an RSS3 feed
""" """
nickname = path.split('/blog/')[1] nickname = path.split('/blog/')[1]
@ -168,7 +174,7 @@ def get_rss3feed(self, calling_domain: str, path: str,
if debug: if debug:
print('Sent rss3 feed: ' + print('Sent rss3 feed: ' +
path + ' ' + calling_domain) path + ' ' + calling_domain)
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, fitness,
'_GET', '_get_rss3feed', debug) '_GET', '_get_rss3feed', debug)
return return
if debug: if debug: