Merge branch 'development' into ZapperDJ-patch-1

scripts/README.md

@@ -59,7 +59,7 @@ A simple script has been included to print sumamry statistics for a run of the B
 
 This will create an output like the following:
 
-```
+```text
 Downloaded submissions: 250
 Failed downloads: 103
 Files already downloaded: 20073

scripts/extract_failed_ids.ps1

@@ -1,21 +1,21 @@
 if (Test-Path -Path $args[0] -PathType Leaf) {
-	$file=$args[0]
+    $file=$args[0]
 }
 else {
-	Write-Host "CANNOT FIND LOG FILE"
-	Exit 1
+    Write-Host "CANNOT FIND LOG FILE"
+    Exit 1
 }
 
-if ($args[1] -ne $null) {
-	$output=$args[1]
-	Write-Host "Outputting IDs to $output"
+if ($null -ne $args[1]) {
+    $output=$args[1]
+    Write-Host "Outputting IDs to $output"
 }
 else {
-	$output="./failed.txt"
+    $output="./failed.txt"
 }
 
-Select-String -Path $file -Pattern "Could not download submission" | ForEach-Object { -split $_.Line | Select-Object -Skip 11 | Select-Object -First 1 } | foreach { $_.substring(0,$_.Length-1) } >> $output
+Select-String -Path $file -Pattern "Could not download submission" | ForEach-Object { -split $_.Line | Select-Object -Skip 11 | Select-Object -First 1 } | ForEach-Object { $_.substring(0,$_.Length-1) } >> $output
 Select-String -Path $file -Pattern "Failed to download resource" | ForEach-Object { -split $_.Line | Select-Object -Skip 14 | Select-Object -First 1 } >> $output
-Select-String -Path $file -Pattern "failed to download submission" | ForEach-Object { -split $_.Line | Select-Object -Skip 13 | Select-Object -First 1 } | foreach { $_.substring(0,$_.Length-1) } >> $output
+Select-String -Path $file -Pattern "failed to download submission" | ForEach-Object { -split $_.Line | Select-Object -Skip 13 | Select-Object -First 1 } | ForEach-Object { $_.substring(0,$_.Length-1) } >> $output
 Select-String -Path $file -Pattern "Failed to write file" | ForEach-Object { -split $_.Line | Select-Object -Skip 13 | Select-Object -First 1 } >> $output
 Select-String -Path $file -Pattern "skipped due to disabled module" | ForEach-Object { -split $_.Line | Select-Object -Skip 8 | Select-Object -First 1 } >> $output

scripts/extract_successful_ids.ps1

@@ -1,17 +1,17 @@
 if (Test-Path -Path $args[0] -PathType Leaf) {
-	$file=$args[0]
+    $file=$args[0]
 }
 else {
-	Write-Host "CANNOT FIND LOG FILE"
-	Exit 1
+    Write-Host "CANNOT FIND LOG FILE"
+    Exit 1
 }
 
-if ($args[1] -ne $null) {
-	$output=$args[1]
-	Write-Host "Outputting IDs to $output"
+if ($null -ne $args[1]) {
+    $output=$args[1]
+    Write-Host "Outputting IDs to $output"
 }
 else {
-	$output="./successful.txt"
+    $output="./successful.txt"
 }
 
 Select-String -Path $file -Pattern "Downloaded submission" | ForEach-Object { -split $_.Line | Select-Object -Last 3 | Select-Object -SkipLast 2 } >> $output

scripts/print_summary.ps1

@@ -1,17 +1,17 @@
 if (Test-Path -Path $args[0] -PathType Leaf) {
-	$file=$args[0]
+    $file=$args[0]
 }
 else {
-	Write-Host "CANNOT FIND LOG FILE"
-	Exit 1
+    Write-Host "CANNOT FIND LOG FILE"
+    Exit 1
 }
 
-if ($args[1] -ne $null) {
-	$output=$args[1]
-	Write-Host "Outputting IDs to $output"
+if ($null -ne $args[1]) {
+    $output=$args[1]
+    Write-Host "Outputting IDs to $output"
 }
 else {
-	$output="./successful.txt"
+    $output="./successful.txt"
 }
 
 Write-Host -NoNewline "Downloaded submissions: "

scripts/tests/example_logfiles/failed_resource_error.txt

@@ -1,2 +1 @@
 [2021-06-12 11:18:25,794 - bdfr.downloader - ERROR] - Failed to download resource https://i.redd.it/61fniokpjq471.jpg in submission nxv3dt with downloader Direct: Unrecoverable error requesting resource: HTTP Code 404
-

scripts/tests/example_logfiles/succeed_score_filter.txt

@@ -1,2 +1,2 @@
 [2022-07-23 14:04:14,095 - bdfr.downloader - DEBUG] - Submission ljyy27 filtered due to score 15 < [50]
-[2022-07-23 14:04:14,104 - bdfr.downloader - DEBUG] - Submission ljyy27 filtered due to score 16 > [1]
+[2022-07-23 14:04:14,104 - bdfr.downloader - DEBUG] - Submission ljyy27 filtered due to score 16 > [1]