Removed recalibrate command, improved day detection

Author: caderek

README.md

@@ -49,9 +49,9 @@ npm i aoctimer -D
 
 If you prefer a single binary file (Node.js included), you can download it for the most popular platforms:
 
-- [aoctimer-linux64-v2.0.0.zip](https://github.com/caderek/aoctimer/releases/download/v2.0.0/aoctimer-linux64-v2.0.0.zip)
-- [aoctimer-macos-v2.0.0.zip](https://github.com/caderek/aoctimer/releases/download/v2.0.0/aoctimer-macos-v2.0.0.zip)
-- [aoctimer-windows64-v2.0.0.zip](https://github.com/caderek/aoctimer/releases/download/v2.0.0/aoctimer-windows64-v2.0.0.zip)
+- [aoctimer-linux64-v3.0.0.zip](https://github.com/caderek/aoctimer/releases/download/v3.0.0/aoctimer-linux64-v3.0.0.zip)
+- [aoctimer-macos-v3.0.0.zip](https://github.com/caderek/aoctimer/releases/download/v3.0.0/aoctimer-macos-v3.0.0.zip)
+- [aoctimer-windows64-v3.0.0.zip](https://github.com/caderek/aoctimer/releases/download/v3.0.0/aoctimer-windows64-v3.0.0.zip)
 
 ## Preparing your code
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aoctimer",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "AoC TIMER - compare your AoC solutions with others",
   "repository": "https://github.com/caderek/aoctimer",
   "homepage": "https://github.com/caderek/aoctimer",

src/actions/calibrate.ts

@@ -1,10 +1,9 @@
 const help = () => {
   console.log(`
-AoC TIMER v.2.0.0
+AoC TIMER v.3.0.0
 
 Commands:
   init [language] [year]        Calibrate and create local config
-  calibrate                     Recalibrate the timer
   summary                       Display the summary
   [-d, --day <day>] <command>   Run the timer for your command
   --help, -h                    Show help page

src/actions/help.ts

@@ -1,6 +1,7 @@
 import * as readline from "readline"
 import { save } from "../config"
-import calibrate from "./calibrate"
+import getSystem from "../helpers/get-system"
+import benchmark from "../benchmark"
 
 const ask = (rl, question): Promise<string> =>
   new Promise((resolve) => rl.question(question, resolve))
@@ -15,25 +16,28 @@ const init = async ({ language, year }) => {
     output: process.stdout,
   })
 
-  if (year === undefined) {
-    year = await ask(rl, `Year${yearData ? ` (default ${yearData[0]})` : ""}: `)
-  }
-
   if (language === undefined) {
     language = await ask(rl, "Language: ")
   }
 
+  if (year === undefined) {
+    year = await ask(rl, `Year${yearData ? ` (default ${yearData[0]})` : ""}: `)
+  }
+
   rl.close()
 
+  console.log("Calibrating (it may take a while)...")
+  const bench = benchmark()
+
   save({
     version: "2.0.0",
     year: (year ? year : yearData[0]) as string,
     language: (language || "unknown") as string,
+    system: getSystem().toString(),
+    benchmark: bench,
     days: [],
   })
 
-  calibrate()
-
   console.log("Done!")
 }
 

src/actions/init.ts

@@ -1,4 +1,4 @@
-import { spawn } from "child_process"
+import { spawn, execSync } from "child_process"
 import config, { check, save } from "../config"
 import views from "../views"
 import stats from "../stats"
@@ -24,7 +24,7 @@ Total 12345
 My solution has total time of 123.100 us.
 `
 
-const runStats = (time: bigint, day: string) => {
+const runStats = (time: bigint, day: string, command: string | null) => {
   if (time !== null) {
     const data = stats.day(time)
 
@@ -43,41 +43,34 @@ const runStats = (time: bigint, day: string) => {
       })
     }
 
-    console.log(views.day(day, data))
+    return data
   } else {
     console.log(NO_TIME_MESSAGE)
   }
 }
 
-const run = ({ day, exec, time }) => {
+const run = ({ day, command, time }) => {
   if (!check() || !config.benchmark) {
     console.log("Please run 'aoctimer init' first.")
     return
   }
 
-  day = day ?? getDay()
+  day = day ?? getDay(command)
 
   if (time !== null) {
-    runStats(time, day)
+    runStats(time, day, null)
     process.exit()
   }
 
-  let output = ""
-
-  const [command, ...args] = exec
-
-  const ps = spawn(command, args, {
-    stdio: ["pipe", "pipe", process.stderr],
-  })
-
-  ps.stdout.on("data", (data) => {
-    output += data.toString()
-  })
-
-  ps.once("close", () => {
+  try {
+    const output = execSync(command).toString()
     const time = extractTime(output)
-    runStats(time, day)
-  })
+    console.log("Running")
+    const data = runStats(time, day, command)
+    console.log(views.day(day, data))
+  } catch (e) {
+    console.log(`Failed to execute the command: ${command}`)
+  }
 }
 
 export default run

src/actions/run.ts

@@ -6,6 +6,7 @@ const summary = () => {
     console.log("Please run 'aoctimer init' first.")
     return
   }
+
   console.log(views.summary(config.year, config.days))
 }
 

src/actions/summary.ts

@@ -14,10 +14,11 @@ type Data = {
   year?: string
   benchmark?: number
   language?: string
+  system?: string
   days?: Day[]
 }
 
-const fileName = `aoctimer.json`
+const fileName = `.aoctimer.json`
 
 const configDir = process.cwd()
 const configFile = path.join(configDir, fileName)

src/config/index.ts

@@ -1,9 +1,21 @@
-const getDay = () => {
-  const dayData = `${process.cwd()} ${process.argv.slice(3).join(" ")}`
-    .replace(/20\d{2}/, "")
-    .match(/\d?\d/)
+const getDay = (command: string | null) => {
+  if (command === null) {
+    return "??"
+  }
 
-  return dayData ? dayData[0].padStart(2, "0") : "??"
+  const dayData = command.replace(/20\d{2}/, "").match(/\d?\d/g)
+
+  if (dayData === null) {
+    return "??"
+  }
+
+  const day = Number(dayData[dayData.length - 1])
+
+  if (day < 1 || day > 25) {
+    return "??"
+  }
+
+  return String(day).padStart(2, "0")
 }
 
 export default getDay

src/helpers/get-day.ts

@@ -0,0 +1,30 @@
+import * as os from "os"
+
+const OS = {
+  aix: "AIX",
+  darwin: "MacOS",
+  freebsd: "FreeBSD",
+  linux: "Linux",
+  openbsd: "OpenBSD",
+  sunos: "SunOS",
+  win32: "Windows",
+}
+
+const getSystem = () => {
+  const cpu = os.cpus()[0].model
+  const mem = Math.round(os.totalmem() / 10 ** 9)
+  const platform = OS[os.platform()]
+  const arch = os.arch()
+
+  return {
+    cpu,
+    mem,
+    platform,
+    arch,
+    toString() {
+      return `${cpu}|${arch}|${platform}|${mem}GB`
+    },
+  }
+}
+
+export default getSystem