From 3e141ad886e8f0d22fb5ee6a2df61b0f053e297f Mon Sep 17 00:00:00 2001 From: bpmcdevitt Date: Sun, 21 Aug 2022 22:08:11 -0500 Subject: [PATCH] working on sanitizing the line in the release file some more --- tools/ubuntu_package_puller/release.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/ubuntu_package_puller/release.py b/tools/ubuntu_package_puller/release.py index fcc206c..9ca09e6 100644 --- a/tools/ubuntu_package_puller/release.py +++ b/tools/ubuntu_package_puller/release.py @@ -6,7 +6,7 @@ import json from meta_release import SourceMetaRelease, MetaRelease -RELEASE_WORD_MATCHER = r'(^\Origin\:\s|Label:\s|Suite:\s|Version:\s|Codename:\s|Date:\s|Architecture:\s|Components:\s|Description:\s|MD5Sum:\s|SHA256:\s|Aquire\-By\-Hash:\s)' +#RELEASE_WORD_MATCHER = r'(^\Origin\:\s|Label:\s|Suite:\s|Version:\s|Codename:\s|Date:\s|Architecture:\s|Components:\s|Description:\s|MD5Sum:\s|SHA256:\s|Aquire\-By\-Hash:\s)' class Release: def __init__(self, distro_codename): @@ -33,8 +33,18 @@ class Release: """ Use this method for cleaning the line, especially the one with the md5 and shasums in them. """ try: + data = {} #cleaned_line = re.split(RELEASE_WORD_MATCHER, line) - cleaned_line = line + split_line_arr = line.split(':') + if len(split_line_arr) == 3: + for checksum, filesize, filepath: + data['checksum'] = checksum + data['filesize'] = filesize + data['filepath'] = filepath + # if the the first element in the array regular expression matches + # RELEASE_WORD_MATCHER so we can detect if its a key: we need. + #elif len(split_line_arr)[0] + ## TODO: LEFT OFF HERE return cleaned_line except Exception as e: print('failed to clean')