", "")
+
+ level = (len(line) - len(line.lstrip("| "))) // 3 - 1
+ if level < 1:
continue
- soup_line = BeautifulSoup(line, "html.parser")
- td_elements = soup_line.find_all('td')
- key = td_elements[0].text.strip()
- value = None if len(td_elements) < 2 else td_elements[-1].text.strip()
+ while line.startswith(" | "):
+ line = line[line.find(">") + 1:]
+ else:
+ continue
- # Clean the key
- key = key.rstrip(":").strip("[]").strip()
+ line = line.replace(" ", "")
+ td_elements = line.split(" | ")
+ key = self.get_inner_text(td_elements[0])
+ value = None if len(td_elements) < 2 else self.get_inner_text(td_elements[-1])
+
+ key = key.rstrip(":").strip("[]").strip()
- # Pop from stack to find the correct parent dictionary
- while stack and stack[-1][1] >= level:
- stack.pop()
+ while stack and stack[-1][1] >= level:
+ stack.pop()
+
+ current_dict = stack[-1][0]
+ key = self.get_unique_key(key, current_dict)
- # Add the new key-value pair
- current_dict = stack[-1][0]
- key = self.get_unique_key(key, current_dict)
+ if value is None:
+ new_dict = {}
+ current_dict[key] = new_dict
+ stack.append((new_dict, level))
+ else:
+ current_dict[key] = value
- if value is None:
- new_dict = {}
- current_dict[key] = new_dict
- stack.append((new_dict, level))
- else:
- if ' | ' not in line:
- current_dict[key] = value
- else:
- if not current_dict.items():
- current_dict[key] = []
- current_dict[value] = []
- else:
- current_dict[list(current_dict.keys())[0]].append(key)
- current_dict[list(current_dict.keys())[1]].append(value)
+ start_index = table_end_index
- if len(table_names) != len(root):
- raise Exception("Your AIDA64 report is missing some information. Please revise it according to the provided guidelines")
- return root
+ return parsed_data
def dump(self, report_path):
html_content = self.try_open(report_path)
- report_dict = self.html_to_dict(html_content)
+ report_dict = self.parse_html_to_json(html_content)
dmi = self.parse_dmi(report_dict.get("DMI", {}))
windows_devices = self.parse_windows_devices(report_dict.get("Windows Devices", {}))
diff --git a/Scripts/github.py b/Scripts/github.py
index a57f1d2..69a592e 100755
--- a/Scripts/github.py
+++ b/Scripts/github.py
@@ -1,19 +1,14 @@
from Scripts import resource_fetcher
from Scripts import utils
-from dotenv import load_dotenv
import os
-load_dotenv()
-
class Github:
def __init__(self):
self.utils = utils.Utils()
- # Load the GitHub token from environment variables
- self.github_token = os.getenv("GITHUB_TOKEN")
# Set the headers for GitHub API requests
self.headers = {
"Accept": "application/vnd.github+json",
- "#Authorization": "token {}".format(self.github_token),
+ "#Authorization": "token GITHUB_TOKEN",
"X-GitHub-Api-Version": "2022-11-28",
}
self.fetcher = resource_fetcher.ResourceFetcher(self.headers)
diff --git a/Scripts/resource_fetcher.py b/Scripts/resource_fetcher.py
index 7a7d627..e1a12c2 100755
--- a/Scripts/resource_fetcher.py
+++ b/Scripts/resource_fetcher.py
@@ -1,19 +1,26 @@
-import requests
+import sys
import ssl
import os
-import certifi
import plistlib
+import json
+
+if sys.version_info >= (3, 0):
+ from urllib.request import urlopen, Request
+else:
+ import urllib2
+ from urllib2 import urlopen, Request
class ResourceFetcher:
- def __init__(self, headers = None):
+ def __init__(self, headers=None):
self.request_headers = headers
- self.buffer_size = 16*1024
+ self.buffer_size = 16 * 1024
self.ssl_context = self.create_ssl_context()
def create_ssl_context(self):
try:
cafile = ssl.get_default_verify_paths().openssl_cafile
if not os.path.exists(cafile):
+ import certifi
cafile = certifi.where()
ssl_context = ssl.create_default_context(cafile=cafile)
except Exception as e:
@@ -22,35 +29,29 @@ class ResourceFetcher:
return ssl_context
def fetch_and_parse_content(self, resource_url, content_type=None):
- response = requests.get(resource_url, headers=self.request_headers, verify=self.ssl_context.verify_mode != ssl.CERT_NONE)
- response.raise_for_status()
+ request = Request(resource_url, headers=self.request_headers or {})
+ with urlopen(request, context=self.ssl_context) as response:
+ content = response.read()
+ if content_type == 'json':
+ return json.loads(content)
+ elif content_type == 'plist':
+ return plistlib.loads(content)
+ else:
+ return content.decode('utf-8')
- if content_type == 'json':
- return response.json()
- elif content_type == 'plist':
- return plistlib.loads(response.content)
- else:
- return response.text
-
- def download_and_save_file(self, resource_url, destination_path, extract=True):
- with requests.get(resource_url, headers=self.request_headers, stream=True, verify=self.ssl_context.verify_mode != ssl.CERT_NONE) as response:
- response.raise_for_status()
-
- try:
- total_size = int(response.headers.get('Content-Length', -1))
- except ValueError:
- total_size = -1
-
+ def download_and_save_file(self, resource_url, destination_path):
+ request = Request(resource_url, headers=self.request_headers or {})
+ with urlopen(request, context=self.ssl_context) as response:
+ total_size = response.length
bytes_downloaded = 0
-
print("Download from {}".format(resource_url))
-
+
with open(destination_path, 'wb') as file_writer:
while True:
- chunk = response.raw.read(self.buffer_size)
+ chunk = response.read(self.buffer_size)
if not chunk:
break
file_writer.write(chunk)
bytes_downloaded += len(chunk)
- if total_size != -1:
- print("Downloaded {:.2f} MB of {:.2f} MB".format(bytes_downloaded / (1024 * 1024), total_size / (1024 * 1024)), end='\r')
\ No newline at end of file
+ if total_size:
+ print("Downloaded {:.2f} MB of {:.2f} MB".format(bytes_downloaded / (1024 * 1024), total_size / (1024 * 1024)), end='\r')
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 543ebd7..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-bs4
-requests
-python-dotenv
-pytz
\ No newline at end of file
|