classrooms: misc changes for updating wi22/sp22 room data

Author: SheepTester

scripts/deploy.sh

@@ -37,6 +37,7 @@ if [ -z "$2" ]; then
   done
 
   URL="https://sheeptester.github.io/uxdy/"
+  TAG="uxdy"
 else
   # Check out existing files in gh-pages
   git checkout origin/gh-pages
@@ -47,12 +48,13 @@ else
   cp -ar ../../$1/. $2
 
   URL="https://sheeptester.github.io/uxdy/$2/"
+  TAG="$2"
 fi
 
 # Commit everything and push
 git checkout -b gh-pages
 git add .
-git commit -m "Building for $LAST_COMMIT
+git commit -m "$TAG: Deploy $LAST_COMMIT
 
 $URL"
 git push origin gh-pages

webreg-scraping/scrape.rb

@@ -26,7 +26,7 @@ def get(path, query = {})
       end
 
     begin
-      return JSON.parse(File.read("./webreg-data/#{file_name}.json"), symbolize_names: true)
+      return JSON.parse(File.read("./cache-wi22/#{file_name}.json"), symbolize_names: true)
     rescue Errno::ENOENT
     end
 
@@ -35,8 +35,11 @@ def get(path, query = {})
       # I don't think UqZBpD3n needs to be a secret but whatever
       "Cookie" => "jlinksessionidx=#{@session_index}; UqZBpD3n=#{@uqz}",
     }).read, symbolize_names: true)
+    if json.length > 0 && json[0][:VERIFY] == "FAIL"
+      raise "[0].VERIFY: FAIL #{file_name}"
+    end
     # File.write: https://stackoverflow.com/a/19337403
-    File.write("./webreg-data/#{file_name}.json", JSON.pretty_generate(json))
+    File.write("./cache-wi22/#{file_name}.json", JSON.pretty_generate(json))
     puts "Fetched #{file_name}"
     json
   end

webreg-scraping/scrape.ts

@@ -132,6 +132,11 @@ export class Scraper {
         ? response.json()
         : Promise.reject(`HTTP ${response.status} error from ${response.url}`)
     )
+    if (json?.[0]?.VERIFY === 'FAIL') {
+      throw new Error(
+        'WebReg returned VERIFY: FAIL. Was the quarter selected on WebReg?'
+      )
+    }
     if (this.#cachePath !== null) {
       await Deno.writeTextFile(
         joinPath(this.#cachePath, `${fileName}.json`),
@@ -678,10 +683,10 @@ export class ScheduleSection extends BaseGroup<RawGetClassResult> {
 }
 
 if (import.meta.main) {
-  const getter = new Scraper('WI22', {
+  const getter = new Scraper('SP22', {
     jlinksessionidx: Deno.args[1],
     UqZBpD3n: Deno.args[0],
-    cachePath: 'cache-wi22'
+    cachePath: 'cache-sp22'
   })
   const courses = []
   const freq: Record<number, number> = {}