danolo
/
rss-bridge
mirror of https://github.com/danoloan10/rss-bridge
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[prtester] improvements and fixes for prtester (#3721)

This commit is contained in:
User123698745 2023-09-30 22:09:59 +02:00 committed by GitHub
parent 6cf9dfb7c9
commit d822d666c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 49 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/.gitignore vendored Normal file
View File

@ -0,0 +1,6 @@
# Visual Studio Code
.vscode/*
# Generated files
comment*.md
comment*.txt

54
.github/prtester.py vendored
View File

@ -1,5 +1,6 @@
import argparse import argparse
import requests import requests
import re
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
from datetime import datetime from datetime import datetime
from typing import Iterable from typing import Iterable
@ -16,18 +17,18 @@ class Instance:
name = '' name = ''
url = '' url = ''
def main(instances: Iterable[Instance], with_upload: bool, comment_title: str): def main(instances: Iterable[Instance], with_upload: bool, with_reduced_upload: bool, title: str, output_file: str):
start_date = datetime.now() start_date = datetime.now()
table_rows = [] table_rows = []
for instance in instances: for instance in instances:
page = requests.get(instance.url) # Use python requests to grab the rss-bridge main page page = requests.get(instance.url) # Use python requests to grab the rss-bridge main page
soup = BeautifulSoup(page.content, "html.parser") # use bs4 to turn the page into soup soup = BeautifulSoup(page.content, "html.parser") # use bs4 to turn the page into soup
bridge_cards = soup.select('.bridge-card') # get a soup-formatted list of all bridges on the rss-bridge page bridge_cards = soup.select('.bridge-card') # get a soup-formatted list of all bridges on the rss-bridge page
table_rows += testBridges(instance, bridge_cards, with_upload) # run the main scraping code with the list of bridges and the info if this is for the current version or the pr version table_rows += testBridges(instance, bridge_cards, with_upload, with_reduced_upload) # run the main scraping code with the list of bridges
with open(file=os.getcwd() + '/comment.txt', mode='w+', encoding='utf-8') as file: with open(file=output_file, mode='w+', encoding='utf-8') as file:
table_rows_value = '\n'.join(sorted(table_rows)) table_rows_value = '\n'.join(sorted(table_rows))
file.write(f''' file.write(f'''
## {comment_title} ## {title}
| Bridge | Context | Status | | Bridge | Context | Status |
| - | - | - | | - | - | - |
{table_rows_value} {table_rows_value}
@ -35,7 +36,7 @@ def main(instances: Iterable[Instance], with_upload: bool, comment_title: str):
*last change: {start_date.strftime("%A %Y-%m-%d %H:%M:%S")}* *last change: {start_date.strftime("%A %Y-%m-%d %H:%M:%S")}*
'''.strip()) '''.strip())
def testBridges(instance: Instance, bridge_cards: Iterable, with_upload: bool) -> Iterable: def testBridges(instance: Instance, bridge_cards: Iterable, with_upload: bool, with_reduced_upload: bool) -> Iterable:
instance_suffix = '' instance_suffix = ''
if instance.name: if instance.name:
instance_suffix = f' ({instance.name})' instance_suffix = f' ({instance.name})'
@ -43,7 +44,7 @@ def testBridges(instance: Instance, bridge_cards: Iterable, with_upload: bool) -
for bridge_card in bridge_cards: for bridge_card in bridge_cards:
bridgeid = bridge_card.get('id') bridgeid = bridge_card.get('id')
bridgeid = bridgeid.split('-')[1] # this extracts a readable bridge name from the bridge metadata bridgeid = bridgeid.split('-')[1] # this extracts a readable bridge name from the bridge metadata
print(f'{bridgeid}{instance_suffix}\n') print(f'{bridgeid}{instance_suffix}')
bridgestring = '/?action=display&bridge=' + bridgeid + '&format=Html' bridgestring = '/?action=display&bridge=' + bridgeid + '&format=Html'
bridge_name = bridgeid.replace('Bridge', '') bridge_name = bridgeid.replace('Bridge', '')
context_forms = bridge_card.find_all("form") context_forms = bridge_card.find_all("form")
@ -112,20 +113,26 @@ def testBridges(instance: Instance, bridge_cards: Iterable, with_upload: bool) -
page_text = response.text.replace('<head>','<head><base href="https://rss-bridge.org/bridge01/" target="_blank">') page_text = response.text.replace('<head>','<head><base href="https://rss-bridge.org/bridge01/" target="_blank">')
page_text = page_text.encode("utf_8") page_text = page_text.encode("utf_8")
soup = BeautifulSoup(page_text, "html.parser") soup = BeautifulSoup(page_text, "html.parser")
status_messages = list(map(lambda e: f'⚠️ `{e.text.strip().splitlines()[0]}`', soup.find_all('pre'))) status_messages = []
if response.status_code != 200: if response.status_code != 200:
status_messages = [f'❌ `HTTP status {response.status_code} {response.reason}`'] + status_messages status_messages += [f'❌ `HTTP status {response.status_code} {response.reason}`']
else: else:
feed_items = soup.select('.feeditem') feed_items = soup.select('.feeditem')
feed_items_length = len(feed_items) feed_items_length = len(feed_items)
if feed_items_length <= 0: if feed_items_length <= 0:
status_messages += [f'⚠️ `The feed has no items`'] status_messages += [f'⚠️ `The feed has no items`']
elif feed_items_length == 1 and len(soup.select('.error')) > 0: elif feed_items_length == 1 and len(soup.select('.error')) > 0:
status_messages = [f'❌ `{feed_items[0].text.strip().splitlines()[0]}`'] + status_messages status_messages += [f'❌ `{getFirstLine(feed_items[0].text)}`']
status_messages += map(lambda e: f'❌ `{getFirstLine(e.text)}`', soup.select('.error .error-type') + soup.select('.error .error-message'))
for item_element in soup.select('.feeditem'): # remove all feed items to not accidentally selected <pre> tags from item content
item_element.decompose()
status_messages += map(lambda e: f'⚠️ `{getFirstLine(e.text)}`', soup.find_all('pre'))
status_messages = list(dict.fromkeys(status_messages)) # remove duplicates
status = '<br>'.join(status_messages) status = '<br>'.join(status_messages)
if status.strip() == '': status_is_ok = status == '';
if status_is_ok:
status = '✔️' status = '✔️'
if with_upload: if with_upload and (not with_reduced_upload or not status_is_ok):
termpad = requests.post(url="https://termpad.com/", data=page_text) termpad = requests.post(url="https://termpad.com/", data=page_text)
termpad_url = termpad.text.strip() termpad_url = termpad.text.strip()
termpad_url = termpad_url.replace('termpad.com/','termpad.com/raw/') termpad_url = termpad_url.replace('termpad.com/','termpad.com/raw/')
@ -133,11 +140,22 @@ def testBridges(instance: Instance, bridge_cards: Iterable, with_upload: bool) -
form_number += 1 form_number += 1
return table_rows return table_rows
def getFirstLine(value: str) -> str:
# trim whitespace and remove text that can break the table or is simply unnecessary
clean_value = re.sub('^\[[^\]]+\]\s*rssbridge\.|[\|`]', '', value.strip())
first_line = next(iter(clean_value.splitlines()), '')
max_length = 250
if (len(first_line) > max_length):
first_line = first_line[:max_length] + '...'
return first_line
if __name__ == '__main__': if __name__ == '__main__':
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('-i', '--instances', nargs='+') parser.add_argument('--instances', nargs='+')
parser.add_argument('-nu', '--no-upload', action='store_true') parser.add_argument('--no-upload', action='store_true')
parser.add_argument('-t', '--comment-title', default='Pull request artifacts') parser.add_argument('--reduced-upload', action='store_true')
parser.add_argument('--title', default='Pull request artifacts')
parser.add_argument('--output-file', default=os.getcwd() + '/comment.txt')
args = parser.parse_args() args = parser.parse_args()
instances = [] instances = []
if args.instances: if args.instances:
@ -156,4 +174,10 @@ if __name__ == '__main__':
instance.name = 'pr' instance.name = 'pr'
instance.url = 'http://localhost:3001' instance.url = 'http://localhost:3001'
instances.append(instance) instances.append(instance)
main(instances=instances, with_upload=not args.no_upload, comment_title=args.comment_title); main(
instances=instances,
with_upload=not args.no_upload,
with_reduced_upload=args.reduced_upload and not args.no_upload,
title=args.title,
output_file=args.output_file
);

2
.github/workflows/prhtmlgenerator.yml vendored
View File

@ -8,6 +8,8 @@ jobs:
test-pr: test-pr:
name: Generate HTML name: Generate HTML
runs-on: ubuntu-latest runs-on: ubuntu-latest
env:
PYTHONUNBUFFERED: 1
# Needs additional permissions https://github.com/actions/first-interaction/issues/10#issuecomment-1041402989 # Needs additional permissions https://github.com/actions/first-interaction/issues/10#issuecomment-1041402989
steps: steps:
- name: Check out self - name: Check out self

4
templates/exception.html.php
View File

@ -60,7 +60,7 @@
<h2>Details</h2> <h2>Details</h2>
<div style="margin-bottom: 15px"> <div style="margin-bottom: 15px">
<div> <div class="error-type">
<strong>Type:</strong> <?= e(get_class($e)) ?> <strong>Type:</strong> <?= e(get_class($e)) ?>
</div> </div>
@ -68,7 +68,7 @@
<strong>Code:</strong> <?= e($e->getCode()) ?> <strong>Code:</strong> <?= e($e->getCode()) ?>
</div> </div>
<div> <div class="error-message">
<strong>Message:</strong> <?= e(sanitize_root($e->getMessage())) ?> <strong>Message:</strong> <?= e(sanitize_root($e->getMessage())) ?>
</div> </div>