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.

Sign up for GitHub

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

Jump to bottom

donate-cpu-server.py: greatly simplified and optimized stale report and added days query parameter to it #6367

Merged
merged 5 commits into from
May 2, 2024
Merged

donate-cpu-server.py: greatly simplified and optimized stale report and added days query parameter to it #6367

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0502984
donate-cpu-server.py: greatly simplified and optimized stale report
firewave Apr 30, 2024
d1b750f
donate-cpu-server.py: added `pkg_from_file()` helper
firewave Apr 30, 2024
96e5734
donate-cpu-server.py: bumped version
firewave Apr 30, 2024
b8d41bf
donate-cpu-server.py: added `days` query parameter to stale report
firewave Apr 29, 2024
082117a
donate-cpu-server.py: added handling of potentially invalid timestamp…
firewave Apr 30, 2024
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
50 changes: 29 additions & 21 deletions tools/donate-cpu-server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# Version scheme (MAJOR.MINOR.PATCH) should orientate on "Semantic Versioning" https://semver.org/
# Every change in this script should result in increasing the version number accordingly (exceptions may be cosmetic
# changes)
SERVER_VERSION = "1.3.52"
SERVER_VERSION = "1.3.53"

OLD_VERSION = '2.14.0'

Expand Down Expand Up @@ -76,6 +76,10 @@ def dateTimeFromStr(datestr: str) -> datetime.datetime:
return datetime.datetime.strptime(datestr, '%Y-%m-%d %H:%M')


def pkg_from_file(filename: str) -> str:
return filename[filename.rfind('/')+1:]


def overviewReport() -> str:
html = '<!DOCTYPE html>\n'
html += '<html><head><title>daca@home</title></head><body>\n'
Expand Down Expand Up @@ -164,7 +168,7 @@ def latestReport(latestResults: list) -> str:
for filename in latestResults:
if not os.path.isfile(filename):
continue
package = filename[filename.rfind('/')+1:]
package = pkg_from_file(filename)
current_year = datetime.date.today().year

datestr = None
Expand Down Expand Up @@ -226,7 +230,7 @@ def crashReport(results_path: str, query_params: dict):
elif line.startswith('count:'):
if line.find('Crash') < 0:
break
package = filename[filename.rfind('/')+1:]
package = pkg_from_file(filename)
counts = line.split(' ')
c_version = ''
if counts[2] == 'Crash!':
Expand Down Expand Up @@ -325,7 +329,7 @@ def timeoutReport(results_path: str) -> str:
elif line.startswith('count:'):
if line.find('TO!') < 0:
break
package = filename[filename.rfind('/')+1:]
package = pkg_from_file(filename)
counts = line.split(' ')
c2 = ''
if counts[2] == 'TO!':
Expand All @@ -341,29 +345,33 @@ def timeoutReport(results_path: str) -> str:
return html


def staleReport(results_path: str) -> str:
def staleReport(results_path: str, query_params: dict) -> str:
thresh_d = query_params.get('days')
if thresh_d is None:
thresh_d = 30
else:
thresh_d = int(thresh_d)

html = '<!DOCTYPE html>\n'
html += '<html><head><title>Stale report</title></head><body>\n'
html += '<h1>Stale report</h1>\n'
html += '<pre>\n'
html += '<b>' + fmt('Package', 'Date Time', link=False) + '</b>\n'
current_year = datetime.date.today().year
for filename in sorted(glob.glob(os.path.expanduser(results_path + '/*'))):
if not os.path.isfile(filename) or filename.endswith('.diff'):
if filename.endswith('.diff') or not os.path.isfile(filename):
continue
for line in open(filename, 'rt'):
line = line.strip()
if line.startswith(str(current_year) + '-') or line.startswith(str(current_year - 1) + '-'):
datestr = line
else:
continue
dt = dateTimeFromStr(datestr)
diff = datetime.datetime.now() - dt
if diff.days < 30:
continue
package = filename[filename.rfind('/')+1:]
html += fmt(package, datestr) + '\n'
break
with open(filename, 'rt') as f:
# first line is datetime string
datestr = f.readline().strip()
try:
dt = dateTimeFromStr(datestr)
diff = datetime.datetime.now() - dt
except:
# there might be very outdated files which still might have an invalid timestamp
diff = datetime.timedelta(days=thresh_d)
if diff.days >= thresh_d:
package = pkg_from_file(filename)
html += fmt(package, datestr) + '\n'
html += '</pre>\n'

html += '</body></html>\n'
Expand Down Expand Up @@ -1121,7 +1129,7 @@ def run(self):
html = timeoutReport(self.resultPath)
httpGetResponse(self.connection, html, 'text/html')
elif url == '/stale.html':
html = staleReport(self.resultPath)
html = staleReport(self.resultPath, queryParams)
httpGetResponse(self.connection, html, 'text/html')
elif url == '/diff.html':
html = diffReport(self.resultPath)
Expand Down
Loading