v.1.10

050644zf · 050644zf · commit 65ac5e560ae2 · 2024-10-18T16:14:11.000+08:00
diff --git a/reader/src/ASTRv2/astr-i18n b/reader/src/ASTRv2/astr-i18n
@@ -1 +1 @@
-Subproject commit 611bf0183f3a481d96e367f055f3570689efdbc9
+Subproject commit efc8f7907fd51585a672c4f8ffebaffa4b2c106b
diff --git a/reader/src/ASTRv2/contentpage.vue b/reader/src/ASTRv2/contentpage.vue
@@ -177,6 +177,7 @@ import {
 } from "@vicons/material";
 import { useLoadingBar, useDialog, useMessage, messageDark } from "naive-ui";
 import { defineComponent, ref } from "vue";
+import source from "./source.js";
 
 export default {
   data() {
@@ -256,25 +257,20 @@ export default {
       this.loading = true;
       // using await
       try{
-        let res = await fetch(
-          "https://raw.githubusercontent.com/050644zf/ArknightsStoryJson/main/" +
-            this.server +
-            "/gamedata/story/" +
-            this.path +
-            ".json"
-        );
+        // let res = await fetch(
+        //   "https://raw.githubusercontent.com/050644zf/ArknightsStoryJson/main/" +
+        //     this.server +
+        //     "/gamedata/story/" +
+        //     this.path +
+        //     ".json"
+        // );
+        let res = await source.getData(this.server, "/gamedata/story/" + this.path + ".json");
         let s = await res.json();
         let altserver = func.alt;
         if (altserver != "none"){
         try{
           
-          let res2 = await fetch(
-            "https://raw.githubusercontent.com/050644zf/ArknightsStoryJson/main/" +
-              altserver +
-              "/gamedata/story/" +
-              this.path +
-              ".json"
-          );
+          let res2 = await source.getData(altserver, "/gamedata/story/" + this.path + ".json");
           this.altserverdata = await res2.json();
 
 
diff --git a/reader/src/ASTRv2/export.vue b/reader/src/ASTRv2/export.vue
@@ -12,6 +12,14 @@
           $t('eventpage.export2excel')
         }}</n-breadcrumb-item>
       </n-breadcrumb>
+
+      <n-alert type="warning" show-icon>
+        {{ $t('eventpage.export.warning') }} <br/>
+        <n-a href="https://github.com/codespaces/new?hide_repo_select=true&ref=main&repo=495279163">
+          <n-image src="https://github.com/codespaces/badge.svg" preview-disabled></n-image>
+        </n-a>
+      </n-alert>
+
       <n-data-table
         :columns="cols"
         :data="exportList"
@@ -103,6 +111,7 @@ import {
   ClearAllOutlined,
   FileDownloadOutlined,
 } from "@vicons/material";
+import source from "./source";
 
 export default {
   data() {
@@ -197,13 +206,7 @@ export default {
         " " +
         story.storyName +
         "\n";
-      let storyData = await fetch(
-        "https://raw.githubusercontent.com/050644zf/ArknightsStoryJson/main/" +
-          story.server +
-          "/gamedata/story/" +
-          story.path +
-          ".json"
-      );
+      let storyData = await source.getData(story.server, "/gamedata/story/" + story.path + ".json");
       storyData = await storyData.json();
       let storyList = this.reader(storyData);
       let sheet = xlsx.utils.aoa_to_sheet(storyList);
diff --git a/reader/src/ASTRv2/footer.vue b/reader/src/ASTRv2/footer.vue
@@ -47,6 +47,7 @@
 
 <script>
 import { Github, Discord, Patreon } from "@vicons/fa";
+import source from "./source";
 
 export default {
   data() {
@@ -60,9 +61,10 @@ export default {
     Patreon,
   },
   created() {
-    fetch(
-      "https://raw.githubusercontent.com/050644zf/ArknightsStoryJson/main/log.json"
-    )
+    // fetch(
+    //   "https://raw.githubusercontent.com/050644zf/ArknightsStoryJson/main/log.json"
+    // )
+    source.getData("", "log.json")
       .then((r) => r.json())
       .then((s) => {
         this.latestUpdate = s["latestCommitTime"];
diff --git a/reader/src/ASTRv2/header.vue b/reader/src/ASTRv2/header.vue
@@ -34,7 +34,7 @@
           </router-link>
           <n-text depth="3" class="astrversion">
             Arknights Story Text Reader <br />
-            Version 1.9
+            Version 1.10
           </n-text>
         </n-space>
       </n-space>
diff --git a/reader/src/ASTRv2/menu.vue b/reader/src/ASTRv2/menu.vue
@@ -5,6 +5,8 @@
 </template>
 
 <script>
+import source from './source';
+
 export default {
   data() {
     return {
@@ -23,16 +25,17 @@ export default {
   },
   methods: {
     async loadData() {
-      this.data = await fetch(
-        "https://raw.githubusercontent.com/Kengxxiao/ArknightsGameData/master/" +
-          this.server +
-          "/gamedata/excel/story_review_table.json"
-      ).then((res) => res.json());
-      this.chardict = await fetch(
-        "https://raw.githubusercontent.com/050644zf/ArknightsStoryJson/main/" +
-          this.server +
-          "/chardict.json"
-      ).then((res) => res.json());
+      // this.data = await fetch(
+      //   "https://raw.githubusercontent.com/Kengxxiao/ArknightsGameData/master/" +
+      //     this.server +
+      //     "/gamedata/excel/story_review_table.json"
+      this.data = await source.getData(this.server, "/gamedata/excel/story_review_table.json").then((res) => res.json());
+      // this.chardict = await fetch(
+      //   "https://raw.githubusercontent.com/050644zf/ArknightsStoryJson/main/" +
+      //     this.server +
+      //     "/chardict.json"
+      // ).then((res) => res.json());
+      this.chardict = await source.getData("050644zf", "/chardict.json").then((res) => res.json());
       this.eventList = await this.getEventList(this.data, this.chardict);
     },
     async getEventList(reviewData, chardict) {
diff --git a/reader/src/ASTRv2/menupage/changelog.vue b/reader/src/ASTRv2/menupage/changelog.vue
@@ -3,6 +3,10 @@
     <template #header>
       <n-h2 prefix="bar">Changelog</n-h2>
     </template>
+    <n-h4>v1.10</n-h4>
+    <n-oi>
+      <n-li>Migrate the ArknightsJson repo to Cloudflare R2 service. If the R2 is unavailable will fallback to githubusercontent.</n-li>
+    </n-oi>
     <n-h4>v1.9.2</n-h4>
     <n-oi>
       <n-li> Adding i18n keys for homepage. 
diff --git a/reader/src/ASTRv2/menupage/events.vue b/reader/src/ASTRv2/menupage/events.vue
@@ -49,11 +49,11 @@
               <n-image
                 v-if="eventype != 'or'"
                 :src="
-                  'https://raw.githubusercontent.com/050644zf/ArknightsStoryJson/main/img/banners/' +
+                  'https://r2.m31ns.top/img/banners/' +
                   edata.id +
                   '.png'
                 "
-                fallback-src="https://raw.githubusercontent.com/050644zf/ArknightsStoryJson/main/img/banners/404.png"
+                fallback-src="https://r2.m31ns.top/img/banners/404.png"
                 preview-disabled
               />
               <n-image
@@ -66,7 +66,7 @@
                   '.png'
                 "
                 style="height: 64px"
-                fallback-src="https://raw.githubusercontent.com/050644zf/ArknightsStoryJson/main/img/icons/404.png"
+                fallback-src="https://r2.m31ns.top/img/icons/404.png"
                 preview-disabled
               />
               <n-flex vertical justify="space-around">
diff --git a/reader/src/ASTRv2/menupage/homepage.vue b/reader/src/ASTRv2/menupage/homepage.vue
@@ -22,10 +22,10 @@
             })
             ">
           <template #cover>
-            <n-image :src="'https://raw.githubusercontent.com/050644zf/ArknightsStoryJson/main/img/banners/' +
+            <n-image :src="'https://r2.m31ns.top/img/banners/' +
               latestEvents[0].id +
               '.png'
-              " fallback-src="https://raw.githubusercontent.com/050644zf/ArknightsStoryJson/main/img/banners/404.png"
+              " fallback-src="https://r2.m31ns.top/img/banners/404.png"
               preview-disabled />
           </template>
           <template #header-extra>
diff --git a/reader/src/ASTRv2/menupage/maintheme.vue b/reader/src/ASTRv2/menupage/maintheme.vue
@@ -29,14 +29,14 @@
               <template #cover>
                 <n-image
                   :src="
-                    'https://raw.githubusercontent.com/050644zf/ArknightsStoryJson/main/img/icons/' +
+                    'https://r2.m31ns.top/img/icons/' +
                     eid +
                     '.png'
                   "
                   class="mainicon"
                   style="height: 100px; width: 100px; margin: auto"
                   preview-disabled
-                  fallback-src="https://raw.githubusercontent.com/050644zf/ArknightsStoryJson/main/img/icons/404.png"
+                  fallback-src="https://r2.m31ns.top/img/icons/404.png"
                 />
               </template>
               <n-text strong>{{ mdata[eid].name }}</n-text>
diff --git a/reader/src/ASTRv2/menupage/or.vue b/reader/src/ASTRv2/menupage/or.vue
@@ -151,10 +151,8 @@ export default {
   },
   methods: {
     async loadCharInfo() {
-      const gamejson =
-        "https://raw.githubusercontent.com/050644zf/ArknightsStoryJson/main/";
       try {
-        let cdata = await fetch(gamejson + this.server + "/charinfo.json").then(
+        let cdata = await source.getData(this.server,'/charinfo.json').then(
           (res) => {
             return res.json();
           }
diff --git a/reader/src/ASTRv2/misc/act17side_log.vue b/reader/src/ASTRv2/misc/act17side_log.vue
@@ -80,12 +80,8 @@ export default {
     async loadLogData() {
       try {
         var mdata = {};
-          mdata = await fetch(
-            // "https://raw.githubusercontent.com/Kengxxiao/ArknightsGameData/master/" +
-            //   this.server +
-            //   "/gamedata/excel/story_review_meta_table.json"
-            source.getDataUrl("github", this.server, "/gamedata/excel/story_review_meta_table.json")
-          ).then((res) => res.json());
+          mdata = await 
+            source.getData(this.server, "/gamedata/excel/story_review_meta_table.json").then((res) => res.json());
 
         this.mdata = mdata;
         this.log_entries = this.mdata.actArchiveData.components.act17side.log;
diff --git a/reader/src/ASTRv2/misc/act25side_log.vue b/reader/src/ASTRv2/misc/act25side_log.vue
@@ -71,12 +71,7 @@ export default {
     async loadLogData() {
       try {
         var mdata = {};
-          mdata = await fetch(
-            // "https://raw.githubusercontent.com/Kengxxiao/ArknightsGameData/master/" +
-            //   this.server +
-            //   "/gamedata/excel/story_review_meta_table.json"
-            source.getDataUrl("github", this.server, "/gamedata/excel/story_review_meta_table.json")
-          ).then((res) => res.json());
+          mdata = await source.getData(this.server, "/gamedata/excel/story_review_meta_table.json").then((res) => res.json());
         this.mdata = mdata;
         this.log_entries =
           this.mdata.actArchiveData.components.act25side.story.stories;
diff --git a/reader/src/ASTRv2/misc/extra.vue b/reader/src/ASTRv2/misc/extra.vue
@@ -72,6 +72,7 @@ import {
 } from "@vicons/material";
 import { useLoadingBar, useDialog } from "naive-ui";
 import func from "../func.js";
+import source from "../source.js";
 export default {
   data() {
     return {
@@ -119,11 +120,7 @@ export default {
   methods: {
     async loadExtraInfo() {
       try {
-        let mdata = await fetch(
-          "https://raw.githubusercontent.com/050644zf/ArknightsStoryJson/master/" +
-            this.server +
-            "/extrastory.json"
-        ).then((res) => res.json());
+        let mdata = await source.getData(this.server, "/extrastory.json").then((res) => res.json());
         this.extraInfo = mdata.extra;
         this.isExtraInfoLoaded = true;
         console.log(this.extraInfo);
diff --git a/reader/src/ASTRv2/misc/isdialog.vue b/reader/src/ASTRv2/misc/isdialog.vue
@@ -91,14 +91,7 @@ export default {
       console.log(chatData);
       var i = 1;
       for (var chatItem of chatData.clientChatItemData) {
-        // var path =
-        //   "https://raw.githubusercontent.com/Kengxxiao/ArknightsGameData/master/" +
-        //   this.server +
-        //   "/gamedata/story/" +
-        //   chatItem.chatStoryId.toLowerCase() +
-        //   ".txt";
-        var path = source.getDataUrl("github", this.server, "/gamedata/story/" +chatItem.chatStoryId.toLowerCase() + ".txt");
-        var res = await fetch(path);
+        var res = await source.getData(this.server, "/gamedata/story/" +chatItem.chatStoryId.toLowerCase() + ".txt");
         var text = await res.text();
         if (text == "404: Not Found") {
           console.log("Not Found");
diff --git a/reader/src/ASTRv2/misc/isrecords.vue b/reader/src/ASTRv2/misc/isrecords.vue
@@ -84,12 +84,8 @@ export default {
   methods: {
     async loadIsData() {
       try {
-        let idata = await fetch(
-          // "https://raw.githubusercontent.com/Kengxxiao/ArknightsGameData/master/" +
-          //   this.server +
-          //   "/gamedata/excel/roguelike_topic_table.json"
-          source.getDataUrl("github", this.server, "/gamedata/excel/roguelike_topic_table.json")
-        ).then((res) => res.json());
+        let idata = await 
+          source.getData( this.server, "/gamedata/excel/roguelike_topic_table.json").then((res) => res.json());
         for (var topic in idata.topics) {
           this.topics.push({
             id: topic,
diff --git a/reader/src/ASTRv2/server.vue b/reader/src/ASTRv2/server.vue
@@ -113,38 +113,29 @@ export default {
       this.loadingProgress = 0;
       try {
         this.loadFont();
-        let menudata = await fetch(
-          source.getDataUrl("github", this.server, "/gamedata/excel/story_review_table.json")
-        ).then((res) => {
+        let menudata = await 
+          source.getData(this.server, "/gamedata/excel/story_review_table.json").then((res) => {
           this.loadingProgress = 10;
           return res.json();
         });
-        let chardict = await fetch(
-          // gamejson + this.server + "/chardict.json"
-          source.getDataUrl("github", this.server, "/chardict.json")
-        ).then((res) => {
+        let chardict = await source.getData(this.server, "/chardict.json")
+        .then((res) => {
           this.loadingProgress = 20;
           return res.json();
         });
         // let charinfo = await fetch(gamejson+this.server+'/charinfo.json').then(res => {this.loadingProgress = 25;return res.json()});
-        let infodata = await fetch(
-          // gamejson + this.server + "/storyinfo.json"
-          source.getDataUrl("github", this.server, "/storyinfo.json")
-        ).then((res) => {
+        let infodata = await source.getData(this.server, "/storyinfo.json")
+        .then((res) => {
           this.loadingProgress = 30;
           return res.json();
         });
-        let chapterdata = await fetch(
-          // gamedata + this.server + "/gamedata/excel/chapter_table.json"
-          source.getDataUrl("github", this.server, "/gamedata/excel/chapter_table.json")
-        ).then((res) => {
+        let chapterdata = await 
+          source.getData( this.server, "/gamedata/excel/chapter_table.json").then((res) => {
           this.loadingProgress = 40;
           return res.json();
         });
-        let wordCountData = await fetch(
-          // gamejson + this.server + "/wordcount.json"
-          source.getDataUrl("github", this.server, "/wordcount.json")
-        ).then((res) => {
+        let wordCountData = await source.getData(this.server, "/wordcount.json")
+        .then((res) => {
           this.loadingProgress = 50;
           return res.json();
         });
diff --git a/reader/src/ASTRv2/source.js b/reader/src/ASTRv2/source.js
@@ -4,7 +4,8 @@ const IMAGES_SRC_REPOS = {
 };
 
 const GAME_DATA_REPOS = {
-  github: "https://raw.githubusercontent.com/050644zf/ArknightsStoryJson/main/"
+  github: "https://raw.githubusercontent.com/050644zf/ArknightsStoryJson/main/",
+  m31ns: "https://r2.m31ns.top/"
 }
 
 export default {
@@ -35,9 +36,13 @@ export default {
       return `${IMAGES_SRC_REPOS[repo]}/avatar/ASSISTANT/${charId}.png`;
     }
   },
-  getDataUrl(repo, server, path) {
-    if (repo == "github") {
-      return `${GAME_DATA_REPOS[repo]}${server}${path}`;
+  async getData(server, path) {
+    try{
+      return await fetch(`${GAME_DATA_REPOS["m31ns"]}${server}${path}`);
     }
+    catch(e){
+      return await fetch(`${GAME_DATA_REPOS["github"]}${server}${path}`);
+    }
+    
   }
 };
