Q1 2022 Progress Report (#165)

Co-authored-by: Tyler Wilding <[email protected]>

Long overdue Progress Report.

README.md

@@ -28,7 +28,7 @@ Navigate to your local git repository for the site and use the below to start th
 To start the server you will need to be in your Github repository that contains the `package.json`.
 
 ```bash
-yarn start
+yarn start # alternatively, you can use `npm run start`
 ```
 
 Browse to http://localhost:8080/

docs/usage/setup/index.md

@@ -269,7 +269,7 @@ PlayStation 2 game discs are unencrypted DVDs and CDs. This means they can be du
 - Put your game disc into an optical drive
 - Create an image file from a disc inside ImgBurn (highlighted in screenshot below)
 
-{{< img cols="6" src="./img/imgburn.webp">}}
+<Image cols={6} src={require("./img/imgburn.webp").default} />
 
 ## Alternative: Dumping PlayStation 2 discs with Media Preservation Frontend (more advanced)
 
@@ -293,4 +293,4 @@ This tool is currently only available on Windows, but Linux support may be added
 
 One quick note, the lower the drive speed of the optical drive the more likely you are to get a good dump of the disc. The fastest drive speed will take much less time, but may be incomplete, corrupted, or inaccurate. It could also be perfectly fine, so depending on your drive and your media, try different things and see what works best for you.
 
-{{< img cols="6" src="./img/MPF.webp">}}
+<Image cols={6} src={require("./img/MPF.webp").default} />

scripts/hugo-to-docu.py

@@ -104,7 +104,7 @@ def convert_article(orig_path):
   # TODO - lint over HTML tags that i skipped in the original migration, catch them now
   content = article.content
   # recreate folder structure
-  new_dir = os.path.dirname(orig_path).replace("content", "pcsx2-net")
+  new_dir = os.path.dirname(orig_path).replace("content/", "")
   os.makedirs(new_dir, exist_ok=True)
   # copy contents
   copy_tree(os.path.dirname(orig_path), new_dir)
@@ -154,7 +154,7 @@ def convert_article(orig_path):
 with open("scripts/track.json") as f:
   track_data = json.load(f)
 
-subfolders = [ f.path for f in os.scandir("content/blog/2020") if f.is_dir() ]
+subfolders = [ f.path for f in os.scandir("content/blog/2022") if f.is_dir() ]
 
 for article in subfolders:
   article = article.replace("\\", "/")

src/data/latestBlogs.js

@@ -1,14 +1,14 @@
 // docusaurus does not have a query engine layer, so these can be set manually or at build-time
 // (manually for now)
 
-import latestProgressReportImage from "/blog/2022/q4-2021-progress-report/feature-progrepq42021-bgonly.jpg";
+import latestProgressReportImage from "/blog/2023/q1-2022-progress-report/feature-progrepq1-2022-bgonly.webp";
 import latestBlogImage from "/blog/2022/life-is-short/feature-nobbs66.webp";
-import previousProgressReportImage from "/blog/2021/q3-2021-progress-report/feature-progrepq32021.webp";
+import previousProgressReportImage from "/blog/2022/q4-2021-progress-report/feature-progrepq42021-bgonly.jpg";
 import previousBlogImage from "/blog/2021/aethersx2-brings-pcsx2-to-mobile/feature-AetherSX2sm.webp";
 
 export const latestProgressReport = {
-  url: "/blog/2022/q4-2021-progress-report",
-  title: "Q4 2021 Progress Report",
+  url: "/blog/2023/q1-2022-progress-report",
+  title: "Q1 2022 Progress Report",
   img: latestProgressReportImage,
 };
 export const latestBlog = {
@@ -17,8 +17,8 @@ export const latestBlog = {
   img: latestBlogImage,
 };
 export const previousProgressReport = {
-  url: "/blog/2021/q3-2021-progress-report",
-  title: "Q3 2021 Progress Report",
+  url: "/blog/2022/q4-2021-progress-report",
+  title: "Q4 2021 Progress Report",
   img: previousProgressReportImage,
 };
 export const previousBlog = {

src/mdx/PRLink/PCSX2PRLink.js

@@ -1,107 +1,107 @@
-import React from "react";
-import { GoGitCommit, GoGitPullRequest } from "react-icons/go";
-import { Avatar, Grid, Tooltip } from "@nextui-org/react";
-import { IconContext } from "react-icons";
-import styles from "./PCSX2PRLink.module.css";
-
-function generatePRLinks(prNums) {
-  if (!prNums) {
-    return null;
-  }
-  const nums = prNums.split(",");
-  if (nums.length === 0) {
-    return null;
-  }
-  let icons = [];
-  let i = 0;
-  for (const num of nums) {
-    icons.push(
-      <a key={i++} href={`https://github.com/PCSX2/pcsx2/pull/${num}`}>
-        <IconContext.Provider value={{ style: { verticalAlign: "middle" } }}>
-          <GoGitPullRequest size={24}></GoGitPullRequest>
-        </IconContext.Provider>
-        {num}
-      </a>
-    );
-  }
-  return icons;
-}
-
-function generateCommitLinks(commitShas) {
-  if (!commitShas) {
-    return null;
-  }
-  const shas = commitShas.split(",");
-  if (shas.length === 0) {
-    return null;
-  }
-  let icons = [];
-  let i = 0;
-  for (const sha of shas) {
-    icons.push(
-      <a key={i++} href={`https://github.com/PCSX2/pcsx2/commit/${sha}`}>
-        <IconContext.Provider value={{ style: { verticalAlign: "middle" } }}>
-          <GoGitCommit size={24}></GoGitCommit>
-        </IconContext.Provider>
-        {sha.substr(0, 6)}
-      </a>
-    );
-  }
-  return icons;
-}
-
-const authorsWithoutAvatars = ["github-actions"];
-
-function generateAuthorAvatars(authors) {
-  if (!authors) {
-    return null;
-  }
-  const authorNames = authors.split(",");
-  if (authorNames.length === 0) {
-    return null;
-  }
-  let avatars = [];
-  let i = 0;
-  for (const author of authorNames) {
-    avatars.push(
-      <Tooltip key={i++} content={author}>
-        <Avatar
-          size="md"
-          src={
-            authorsWithoutAvatars.includes(author.toLowerCase())
-              ? undefined
-              : `https://github.com/${author}.png?size=40`
-          }
-          text={author}
-          alt={author}
-          bordered
-          color="gradient"
-          stacked
-        />
-      </Tooltip>
-    );
-  }
-  return (
-    <Avatar.Group
-      animated={avatars.length > 1}
-      style={{ marginRight: "0.5em" }}
-    >
-      {avatars}
-    </Avatar.Group>
-  );
-}
-
-export default function PCSX2PRLink({ children, prNums, shas, authors }) {
-  return (
-    <Grid.Container className={styles["pr-link"]}>
-      <Grid xs={12} alignItems="center">
-        <span style={{ marginRight: "1.5em" }}>{children}</span>
-      </Grid>
-      <Grid xs={12} alignItems="center" css={{ ml: "0.75em" }}>
-        {generateAuthorAvatars(authors)}
-        {generatePRLinks(prNums)}
-        {generateCommitLinks(shas)}
-      </Grid>
-    </Grid.Container>
-  );
-}
+import React from "react";
+import { GoGitCommit, GoGitPullRequest } from "react-icons/go";
+import { Avatar, Grid, Tooltip } from "@nextui-org/react";
+import { IconContext } from "react-icons";
+import styles from "./PCSX2PRLink.module.css";
+
+function generatePRLinks(prNums) {
+  if (!prNums) {
+    return null;
+  }
+  const nums = prNums.split(",");
+  if (nums.length === 0) {
+    return null;
+  }
+  let icons = [];
+  let i = 0;
+  for (const num of nums) {
+    icons.push(
+      <a key={i++} href={`https://github.com/PCSX2/pcsx2/pull/${num}`}>
+        <IconContext.Provider value={{ style: { verticalAlign: "middle" } }}>
+          <GoGitPullRequest size={24}></GoGitPullRequest>
+        </IconContext.Provider>
+        {num}
+      </a>
+    );
+  }
+  return icons;
+}
+
+function generateCommitLinks(commitShas) {
+  if (!commitShas) {
+    return null;
+  }
+  const shas = commitShas.split(",");
+  if (shas.length === 0) {
+    return null;
+  }
+  let icons = [];
+  let i = 0;
+  for (const sha of shas) {
+    icons.push(
+      <a key={i++} href={`https://github.com/PCSX2/pcsx2/commit/${sha}`}>
+        <IconContext.Provider value={{ style: { verticalAlign: "middle" } }}>
+          <GoGitCommit size={24}></GoGitCommit>
+        </IconContext.Provider>
+        {sha.substr(0, 6)}
+      </a>
+    );
+  }
+  return icons;
+}
+
+const authorsWithoutAvatars = ["github-actions"];
+
+function generateAuthorAvatars(authors) {
+  if (!authors) {
+    return null;
+  }
+  const authorNames = authors.split(",");
+  if (authorNames.length === 0) {
+    return null;
+  }
+  let avatars = [];
+  let i = 0;
+  for (const author of authorNames) {
+    avatars.push(
+      <Tooltip key={i++} content={author}>
+        <Avatar
+          size="md"
+          src={
+            authorsWithoutAvatars.includes(author.toLowerCase())
+              ? undefined
+              : `https://github.com/${author}.png?size=40`
+          }
+          text={author}
+          alt={author}
+          bordered
+          color="gradient"
+          stacked
+        />
+      </Tooltip>
+    );
+  }
+  return (
+    <Avatar.Group
+      animated={avatars.length > 1}
+      style={{ marginRight: "0.5em" }}
+    >
+      {avatars}
+    </Avatar.Group>
+  );
+}
+
+export default function PCSX2PRLink({ children, prNums, shas, authors }) {
+  return (
+    <Grid.Container className={styles["pr-link"]}>
+      <Grid xs={12} alignItems="center">
+        <span style={{ marginRight: "1.5em" }}>{children}</span>
+      </Grid>
+      <Grid xs={12} alignItems="center" css={{ ml: "0.75em" }}>
+        {generateAuthorAvatars(authors)}
+        {generatePRLinks(prNums)}
+        {generateCommitLinks(shas)}
+      </Grid>
+    </Grid.Container>
+  );
+}