修复多主体兼容性问题

HCLonely · Mar 28, 2023 · f34100b · f34100b
1 parent 3139e2f
commit f34100b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 4 deletions.
diff --git a/lib/bangumi-generator.js b/lib/bangumi-generator.js
@@ -111,7 +111,7 @@ module.exports = /*#__PURE__*/function () {
               source: (_config$type$source = config[type].source) !== null && _config$type$source !== void 0 ? _config$type$source : 'bili',
               showMyComment: (_config$type$showMyCo = config[type].showMyComment) !== null && _config$type$showMyCo !== void 0 ? _config$type$showMyCo : false,
               pagination: (_config$type$paginati = config[type].pagination) !== null && _config$type$paginati !== void 0 ? _config$type$paginati : false,
-              theme: fs.existsSync(path.join(__dirname, "".concat(config.theme, ".css"))) ? config.theme : null,
+              theme: fs.existsSync(path.join(__dirname, "templates/theme/".concat(config.theme, ".min.css"))) ? config.theme : null,
               ejsTemplate: fs.readFileSync(path.join(__dirname, "templates/".concat(config[type].source === 'bgm' ? 'bgm' : 'bili', "-template.ejs"))).toString().replace('class="bangumi-item"', 'class="bangumi-item bangumi-hide"'),
               wantWatch: wantWatch,
               watched: watched,

diff --git a/lib/templates/bangumi.ejs b/lib/templates/bangumi.ejs
@@ -9,6 +9,7 @@
 <% } %>
 <style>
     <%- include('index.css') %>
+    <% console.log(theme) %>
     <% if (theme) { %>
     <%- include(`theme/${theme}.min.css`) %>
     <% } %>

diff --git a/lib/templates/index.css b/lib/templates/index.css
diff --git a/lib/templates/theme/fluid.min.css b/lib/templates/theme/fluid.min.css
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hexo-bilibili-bangumi",
-  "version": "1.8.5",
+  "version": "1.8.6",
   "description": "hexo bilibili番剧页",
   "main": "index.js",
   "scripts": {

diff --git a/src/lib/bangumi-generator.js b/src/lib/bangumi-generator.js
@@ -78,7 +78,7 @@ module.exports = async function (locals, type = 'bangumi') {
     source: config[type].source ?? 'bili',
     showMyComment: config[type].showMyComment ?? false,
     pagination: config[type].pagination ?? false,
-    theme: fs.existsSync(path.join(__dirname, `${config.theme}.css`)) ? config.theme : null,
+    theme: fs.existsSync(path.join(__dirname, `templates/theme/${config.theme}.min.css`)) ? config.theme : null,
     ejsTemplate: fs.readFileSync(path.join(__dirname, `templates/${config[type].source === 'bgm' ? 'bgm' : 'bili'}-template.ejs`)).toString()
       .replace('class="bangumi-item"', 'class="bangumi-item bangumi-hide"'),
     wantWatch,