Bug fixes, better linux compatibility #9

Merged
mjforan merged 6 commits from master into master 2022-05-24 15:10:06 -06:00
2 changed files with 8 additions and 9 deletions

View File

@ -473,7 +473,7 @@ def findCourseAssignments(course):
hasattr(submission, "submission_comments") else "" hasattr(submission, "submission_comments") else ""
# Attempt # Attempt
sub_view.attempt = submission.attempt if \ sub_view.attempt = submission.attempt if \
hasattr(submission, "attempt") else 0 hasattr(submission, "attempt") and submission.attempt is not None else 0
# User ID # User ID
sub_view.user_id = str(submission.user_id) if \ sub_view.user_id = str(submission.user_id) if \
hasattr(submission, "user_id") else "" hasattr(submission, "user_id") else ""

View File

@ -1,7 +1,7 @@
from subprocess import run from subprocess import run
SINGLEFILE_BINARY_PATH = ".\\node_modules\\single-file\\cli\\single-file" SINGLEFILE_BINARY_PATH = "./node_modules/single-file/cli/single-file"
#CHROME_PATH = "C:\\Program Files\\Google\Chrome\\Application\\chrome.exe" #Uncomment this and set your browser exe if it can't find yours. CHROME_PATH = "C:/Program Files/Google\ Chrome/Application/chrome.exe" #Uncomment this and set your browser exe if it can't find yours.
def addQuotes(str): def addQuotes(str):
return "\"" + str.strip("\"") + "\"" return "\"" + str.strip("\"") + "\""
@ -9,20 +9,19 @@ def addQuotes(str):
def download_page(url, cookies_path, output_path, output_name_template = ""): def download_page(url, cookies_path, output_path, output_name_template = ""):
args = [ args = [
addQuotes(SINGLEFILE_BINARY_PATH), addQuotes(SINGLEFILE_BINARY_PATH),
#"--browser-executeable-path=" + addQuotes(CHROME_PATH.strip("\"")), #Uncomment this and set your browser exe if it can't find yours. #"--browser-executable-path=" + addQuotes(CHROME_PATH.strip("\"")), #Uncomment this and set your browser exe if it can't find yours.
"--browser-cookies-file=" + addQuotes(cookies_path), "--browser-cookies-file=" + addQuotes(cookies_path),
"--output-directory=" + addQuotes(output_path), "--output-directory=" + addQuotes(output_path),
url addQuotes(url)
] ]
if(output_name_template != ""): if(output_name_template != ""):
args.append("--filename-template=" + addQuotes(output_name_template)) args.append("--filename-template=" + addQuotes(output_name_template))
try: try:
run("node " + " ".join(args)) run("node " + " ".join(args), shell=True)
except Exception as e: except Exception as e:
print("Was not able to save the URL " + url + " using singlefile. The reported error was " + print("Was not able to save the URL " + url + " using singlefile. The reported error was " + e.strerror)
e.strerror)
#if __name__ == "__main__": #if __name__ == "__main__":
#download_page("https://www.google.com/", "", ".\\output\\test", "test.html") #download_page("https://www.google.com/", "", "./output/test", "test.html")