From 5afebc803043aab16d18cf904dbd740da13679c6 Mon Sep 17 00:00:00 2001 From: Justin Toft Date: Fri, 10 Jun 2022 21:22:33 -0400 Subject: [PATCH] Fixed broken ubuntu and ubuntu_ports mirror checks --- projects/ubuntu.py | 3 ++- projects/ubuntu_releases.py | 9 ++------- shared.py | 1 + 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/projects/ubuntu.py b/projects/ubuntu.py index 00d9ab6..6639548 100644 --- a/projects/ubuntu.py +++ b/projects/ubuntu.py @@ -5,6 +5,7 @@ Contains ubuntu class import os from project import Project from shared import CSC_MIRROR +from shared import NUM_UBUNTU_RELEASES import requests import datefinder # another date finding library from datetime import timedelta @@ -17,4 +18,4 @@ class ubuntu(Project): @staticmethod def check(data, project, current_time): page = requests.get(data[project]["upstream"]).text - return page.count("Up to date") == 21 + return page.count("Up to date") == NUM_UBUNTU_RELEASES diff --git a/projects/ubuntu_releases.py b/projects/ubuntu_releases.py index 68e4095..1ce1036 100644 --- a/projects/ubuntu_releases.py +++ b/projects/ubuntu_releases.py @@ -5,6 +5,7 @@ Contains ubuntu_releases class import os from project import Project from shared import CSC_MIRROR +from shared import NUM_UBUNTU_RELEASES import requests import datefinder # another date finding library from datetime import timedelta @@ -17,10 +18,4 @@ class ubuntu_releases(Project): @staticmethod def check(data, project, current_time): page = requests.get(data[project]["upstream"]).text - indexOfFile = page.find("last verified") - matches = list(datefinder.find_dates(page[indexOfFile:])) - date = matches[0].replace(tzinfo=None) # date is of type datetime.datetime - data[project]["out_of_sync_since"] = date.timestamp() - return(pd.to_datetime(current_time, unit='s') - date <= pd.to_timedelta(data[project]["out_of_sync_interval"], unit='s')) - - # https://launchpad.net/ubuntu/+mirror/mirror.csclub.uwaterloo.ca-release + return page.count("Up to date") == NUM_UBUNTU_RELEASES diff --git a/shared.py b/shared.py index 9de4e7a..11c2854 100644 --- a/shared.py +++ b/shared.py @@ -1,3 +1,4 @@ """Contains shared constants""" CSC_MIRROR = "http://mirror.csclub.uwaterloo.ca/" +NUM_UBUNTU_RELEASES = 24