11 files changed, 138 insertions, 213 deletions
diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html
index 678a1db..e434e9b 100644
--- a/layouts/_default/archives.html
+++ b/layouts/_default/archives.html
@@ -1,74 +1,22 @@
 {{ define "main" }}
 <!-- page info section e.g. current tag & total archive pages -->
 <div class="page-info">
-    <span>{{ i18n "archivesTotalPages" }}{{ len (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }}</span>
+  <span>{{ i18n "archivesTotalPages" }}{{ len (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) }}</span>
 </div>
 <!-- archives range in all posts -->
 {{ $paginator := .Paginate (where .Site.RegularPages "Type" "in" .Site.Params.mainSections) 50 }}
 {{ range $paginator.Pages }}
 <div class="post">
-    <h3 class="post-item post-title-archive">
-        <a href="{{ .Permalink }}">{{ .Title }}</a>
-    </h3>
-    <div class="post-item post-meta-archive">
-        {{ partial "post-meta.html" . }}
-    </div>
+  <h3 class="post-item post-title-archive">
+    <a href="{{ .Permalink }}">{{ .Title }}</a>
+  </h3>
+  <div class="post-item post-meta-archive">
+    {{ partial "post-meta.html" . }}
+  </div>
 </div>
 {{ end }}
 
 <!-- custom smart pagination -->
-{{ $offsetLinks := 2 }}
-{{ $maxLinks := (add (mul $offsetLinks 2) 1) }}
-{{ $lowerLimit := (add $offsetLinks 1) }}
-{{ $upperLimit := (sub $paginator.TotalPages $offsetLinks) }}
-{{ if gt $paginator.TotalPages 1 }}
-<div class="pagination">
-    {{ if ne $paginator.PageNumber 1 }}
-    <div class="pag-first">
-        <a href="{{ $paginator.First.URL }}"><i class="iconfont icon-caret-back-circle-sharp"></a>
-    </div>
-    {{ end }}
-    {{ if $paginator.HasPrev }}
-    <div class="pag-previous">
-        <a href="{{ $paginator.Prev.URL }}"><i class="iconfont icon-chevron-back-circle-sharp"></i></a>
-    </div>
-    {{ end }}
-    {{ range $paginator.Pagers }}
-    {{ $.Scratch.Set "pageNumFlag" false }}
-    {{ if gt $paginator.TotalPages $maxLinks }}
-    {{ if le $paginator.PageNumber $lowerLimit }}
-    {{ if le .PageNumber $maxLinks }}
-    {{ $.Scratch.Set "pageNumFlag" true }}
-    {{ end }}
-    {{ else if ge $paginator.PageNumber $upperLimit }}
-    {{ if gt .PageNumber (sub $paginator.TotalPages $maxLinks) }}
-    {{ $.Scratch.Set "pageNumFlag" true }}
-    {{ end }}
-    {{ else }}
-    {{ if and ( ge .PageNumber (sub $paginator.PageNumber $offsetLinks) ) ( le .PageNumber (add $paginator.PageNumber $offsetLinks) ) }}
-    {{ $.Scratch.Set "pageNumFlag" true }}
-    {{ end }}
-    {{ end }}
-    {{ else }}
-    {{ $.Scratch.Set "pageNumFlag" true }}
-    {{ end }}
-    {{ if eq ($.Scratch.Get "pageNumFlag") true }}
-    <div class="pag-item{{ if eq . $paginator }} pag-current{{ end }}">
-        <a href="{{ .URL }}">{{ .PageNumber }}</a>
-    </div>
-    {{ end }}
-    {{ end }}
-    {{ if $paginator.HasNext }}
-    <div class="pag-next">
-        <a href="{{ $paginator.Next.URL }}"><i class="iconfont icon-chevron-forward-circle-sharp"></i></a>
-    </div>
-    {{ end }}
-    {{ if ne $paginator.PageNumber $paginator.TotalPages }}
-    <div class="pag-last">
-        <a href="{{ $paginator.Last.URL }}"><i class="iconfont icon-caret-forward-circle-sharp"></i></a>
-    </div>
-    {{ end }}
-</div>
-{{ end }}
+{{- partial "pagination.html" (dict "context" . "pagi" $paginator) -}}
 
-{{ end }}
-\ No newline at end of file
+{{ end }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 69f8708..6961c1b 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -15,59 +15,6 @@
 </div>
 {{ end }}
 
-<!-- custom smart pagination -->
-{{ $offsetLinks := 2 }}
-{{ $maxLinks := (add (mul $offsetLinks 2) 1) }}
-{{ $lowerLimit := (add $offsetLinks 1) }}
-{{ $upperLimit := (sub $paginator.TotalPages $offsetLinks) }}
-{{ if gt $paginator.TotalPages 1 }}
-<div class="pagination">
-    {{ if ne $paginator.PageNumber 1 }}
-    <div class="pag-first">
-        <a href="{{ $paginator.First.URL }}"><i class="iconfont icon-caret-back-circle-sharp"></i></a>
-    </div>
-    {{ end }}
-    {{ if $paginator.HasPrev }}
-    <div class="pag-previous">
-        <a href="{{ $paginator.Prev.URL }}"><i class="iconfont icon-chevron-back-circle-sharp"></i></a>
-    </div>
-    {{ end }}
-    {{ range $paginator.Pagers }}
-    {{ $.Scratch.Set "pageNumFlag" false }}
-    {{ if gt $paginator.TotalPages $maxLinks }}
-    {{ if le $paginator.PageNumber $lowerLimit }}
-    {{ if le .PageNumber $maxLinks }}
-    {{ $.Scratch.Set "pageNumFlag" true }}
-    {{ end }}
-    {{ else if ge $paginator.PageNumber $upperLimit }}
-    {{ if gt .PageNumber (sub $paginator.TotalPages $maxLinks) }}
-    {{ $.Scratch.Set "pageNumFlag" true }}
-    {{ end }}
-    {{ else }}
-    {{ if and ( ge .PageNumber (sub $paginator.PageNumber $offsetLinks) ) ( le .PageNumber (add $paginator.PageNumber $offsetLinks) ) }}
-    {{ $.Scratch.Set "pageNumFlag" true }}
-    {{ end }}
-    {{ end }}
-    {{ else }}
-    {{ $.Scratch.Set "pageNumFlag" true }}
-    {{ end }}
-    {{ if eq ($.Scratch.Get "pageNumFlag") true }}
-    <div class="pag-item{{ if eq . $paginator }} pag-current{{ end }}">
-        <a href="{{ .URL }}">{{ .PageNumber }}</a>
-    </div>
-    {{ end }}
-    {{ end }}
-    {{ if $paginator.HasNext }}
-    <div class="pag-next">
-        <a href="{{ $paginator.Next.URL }}"><i class="iconfont icon-chevron-forward-circle-sharp"></i></i></a>
-    </div>
-    {{ end }}
-    {{ if ne $paginator.PageNumber $paginator.TotalPages }}
-    <div class="pag-last">
-        <a href="{{ $paginator.Last.URL }}"><i class="iconfont icon-caret-forward-circle-sharp"></i></a>
-    </div>
-    {{ end }}
-</div>
-{{ end }}
+{{- partial "pagination.html" (dict "context" . "pagi" $paginator) -}}
 
-{{ end }}
-\ No newline at end of file
+{{ end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 8f7eb35..cd2bd48 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -7,9 +7,6 @@
     <div class="post-item post-meta">
         {{ partial "post-meta.html" . }}
     </div>
-    {{ with .Params.player }}
-    <div id="post-aplayer"></div>
-    {{ end }}
     <!-- post main content -->
     <div class="post-content markdown-body">
         {{ .Content }}
diff --git a/layouts/_default/tag.html b/layouts/_default/tag.html
index c3df91e..1185f1d 100644
--- a/layouts/_default/tag.html
+++ b/layouts/_default/tag.html
@@ -1,77 +1,25 @@
 {{ define "main" }}
 <!-- page info section e.g. current tag & total archive pages -->
 <div class="page-info">
-    <span>{{ i18n "tagsCurrentTag" . }}</span>
+  <span>{{ i18n "tagsCurrentTag" . }}</span>
 </div>
 <!-- tags page range in posts with current tag -->
 {{ $paginator := .Paginator }}
 {{ range $paginator.Pages }}
 <div class="post">
-    <h2 class="post-item post-title">
-        <a href="{{ .Permalink }}">{{ .Title }}</a>
-    </h2>
-    <div class="post-item post-meta">
-        {{ partial "post-meta.html" . }}
-    </div>
-    <div class="post-item post-summary markdown-body">
-        {{ .Summary }}
-    </div>
+  <h2 class="post-item post-title">
+    <a href="{{ .Permalink }}">{{ .Title }}</a>
+  </h2>
+  <div class="post-item post-meta">
+    {{ partial "post-meta.html" . }}
+  </div>
+  <div class="post-item post-summary markdown-body">
+    {{ .Summary }}
+  </div>
 </div>
 {{ end }}
 
 <!-- custom smart pagination -->
-{{ $offsetLinks := 2 }}
-{{ $maxLinks := (add (mul $offsetLinks 2) 1) }}
-{{ $lowerLimit := (add $offsetLinks 1) }}
-{{ $upperLimit := (sub $paginator.TotalPages $offsetLinks) }}
-{{ if gt $paginator.TotalPages 1 }}
-<div class="pagination">
-    {{ if ne $paginator.PageNumber 1 }}
-    <div class="pag-first">
-        <a href="{{ $paginator.First.URL }}"><i class="iconfont icon-caret-back-circle-sharp"></i></a>
-    </div>
-    {{ end }}
-    {{ if $paginator.HasPrev }}
-    <div class="pag-previous">
-        <a href="{{ $paginator.Prev.URL }}"><i class="iconfont icon-chevron-back-circle-sharp"></i></a>
-    </div>
-    {{ end }}
-    {{ range $paginator.Pagers }}
-    {{ $.Scratch.Set "pageNumFlag" false }}
-    {{ if gt $paginator.TotalPages $maxLinks }}
-    {{ if le $paginator.PageNumber $lowerLimit }}
-    {{ if le .PageNumber $maxLinks }}
-    {{ $.Scratch.Set "pageNumFlag" true }}
-    {{ end }}
-    {{ else if ge $paginator.PageNumber $upperLimit }}
-    {{ if gt .PageNumber (sub $paginator.TotalPages $maxLinks) }}
-    {{ $.Scratch.Set "pageNumFlag" true }}
-    {{ end }}
-    {{ else }}
-    {{ if and ( ge .PageNumber (sub $paginator.PageNumber $offsetLinks) ) ( le .PageNumber (add $paginator.PageNumber $offsetLinks) ) }}
-    {{ $.Scratch.Set "pageNumFlag" true }}
-    {{ end }}
-    {{ end }}
-    {{ else }}
-    {{ $.Scratch.Set "pageNumFlag" true }}
-    {{ end }}
-    {{ if eq ($.Scratch.Get "pageNumFlag") true }}
-    <div class="pag-item{{ if eq . $paginator }} pag-current{{ end }}">
-        <a href="{{ .URL }}">{{ .PageNumber }}</a>
-    </div>
-    {{ end }}
-    {{ end }}
-    {{ if $paginator.HasNext }}
-    <div class="pag-next">
-        <a href="{{ $paginator.Next.URL }}"><i class="iconfont icon-chevron-forward-circle-sharp"></i></a>
-    </div>
-    {{ end }}
-    {{ if ne $paginator.PageNumber $paginator.TotalPages }}
-    <div class="pag-last">
-        <a href="{{ $paginator.Last.URL }}"><i class="iconfont icon-caret-forward-circle-sharp"></i></a>
-    </div>
-    {{ end }}
-</div>
-{{ end }}
+{{- partial "pagination.html" (dict "context" . "pagi" $paginator) -}}
 
-{{ end }}
-\ No newline at end of file
+{{ end }}
diff --git a/layouts/partials/favicon.html b/layouts/partials/favicon.html
index ce75989..3dabd7d 100644
--- a/layouts/partials/favicon.html
+++ b/layouts/partials/favicon.html
@@ -1 +1 @@
-<link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/amzrk2/cdn-stcapi@1/favicons/favicon.ico" />
-\ No newline at end of file
+<link rel="shortcut icon" href="https://cdn.jsdelivr.net/gh/dsrkafuu/dsr-cdn@1/images/favicons/dsrca/favicon.ico" />
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index bdc4891..c11dc42 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -9,7 +9,7 @@
             <span>&copy; {{ with .Site.Params.copyrightStartYear }}{{ . }}-{{ end }}{{ now.Format "2006" }}
                 <a href="{{ .Site.BaseURL }}">{{ .Site.Params.author }}</a>
                 {{ with .Site.Params.sourceURL }} | <a href="{{ . }}">Source code</a> {{ end }}
-                | {{ i18n "footerPoweredFront" }}<a href="https://github.com/amzrk2/hugo-theme-fuji/"
+                | {{ i18n "footerPoweredFront" }}<a href="https://github.com/dsrkafuu/hugo-theme-fuji/"
                    target="_blank">Fuji-v2</a> &amp; <a href="https://gohugo.io/"
                                                     target="_blank">Hugo</a>{{ i18n "footerPoweredEnd" }}
             </span>
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index bd2eaea..c9f194a 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -39,7 +39,7 @@
 {{ with .Site.Params.googleAdsense }}
 <script async data-ad-client="ca-pub-{{ . }}" src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
 {{ end}}
-{{ if .Params.player }}
+{{ if .Params.aplayer }}
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/aplayer@1.10.1/dist/APlayer.min.css" />
 {{ end }}
 {{ if .Site.Params.useDisqusJS }}
diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html
new file mode 100644
index 0000000..3db973f
--- /dev/null
+++ b/layouts/partials/pagination.html
@@ -0,0 +1,56 @@
+{{- $paginator := .pagi -}}
+{{- $scratch := newScratch -}}
+<!-- custom smart pagination -->
+{{- $offsetLinks := 2 -}}
+{{- $maxLinks := (add (mul $offsetLinks 2) 1) -}}
+{{- $lowerLimit := (add $offsetLinks 1) -}}
+{{- $upperLimit := (sub $paginator.TotalPages $offsetLinks) -}}
+{{- if gt $paginator.TotalPages 1 -}}
+<div class="pagination">
+  {{- if ne $paginator.PageNumber 1 -}}
+  <div class="pag-first">
+    <a href="{{ $paginator.First.URL }}"><i class="iconfont icon-caret-back-circle-sharp"></i></a>
+  </div>
+  {{- end -}}
+  {{- if $paginator.HasPrev -}}
+  <div class="pag-previous">
+    <a href="{{ $paginator.Prev.URL }}"><i class="iconfont icon-chevron-back-circle-sharp"></i></a>
+  </div>
+  {{- end -}}
+  {{- range $paginator.Pagers -}}
+  {{- $scratch.Set "pageNumFlag" false -}}
+  {{- if gt $paginator.TotalPages $maxLinks -}}
+  {{- if le $paginator.PageNumber $lowerLimit -}}
+  {{- if le .PageNumber $maxLinks -}}
+  {{- $scratch.Set "pageNumFlag" true -}}
+  {{- end -}}
+  {{- else if ge $paginator.PageNumber $upperLimit -}}
+  {{- if gt .PageNumber (sub $paginator.TotalPages $maxLinks) -}}
+  {{- $scratch.Set "pageNumFlag" true -}}
+  {{- end -}}
+  {{- else -}}
+  {{- if and ( ge .PageNumber (sub $paginator.PageNumber $offsetLinks) ) ( le .PageNumber (add $paginator.PageNumber $offsetLinks) ) -}}
+  {{- $scratch.Set "pageNumFlag" true -}}
+  {{- end -}}
+  {{- end -}}
+  {{- else -}}
+  {{- $scratch.Set "pageNumFlag" true -}}
+  {{- end -}}
+  {{- if eq ($scratch.Get "pageNumFlag") true -}}
+  <div class="pag-item{{ if eq . $paginator }} pag-current{{ end }}">
+    <a href="{{ .URL }}">{{- .PageNumber -}}</a>
+  </div>
+  {{- end -}}
+  {{- end -}}
+  {{- if $paginator.HasNext -}}
+  <div class="pag-next">
+    <a href="{{ $paginator.Next.URL }}"><i class="iconfont icon-chevron-forward-circle-sharp"></i></a>
+  </div>
+  {{- end -}}
+  {{- if ne $paginator.PageNumber $paginator.TotalPages -}}
+  <div class="pag-last">
+    <a href="{{ $paginator.Last.URL }}"><i class="iconfont icon-caret-forward-circle-sharp"></i></a>
+  </div>
+  {{- end -}}
+</div>
+{{- end -}}
diff --git a/layouts/partials/scripts-end.html b/layouts/partials/scripts-end.html
index 2a2f316..82388cf 100644
--- a/layouts/partials/scripts-end.html
+++ b/layouts/partials/scripts-end.html
@@ -1,10 +1,12 @@
 {{ if eq .Section "search" }}
-<script defer src="https://cdn.jsdelivr.net/combine/npm/art-template@4.13.2/lib/template-web.min.js,npm/fuse.js@6.4.1"></script>
+<script defer src="https://cdn.jsdelivr.net/npm/art-template@4.13.2/lib/template-web.min.js"></script>
+<script defer src="https://cdn.jsdelivr.net/npm/fuse.js@6.4.6/dist/fuse.min.js"></script>
 {{ else if eq .Section "archives" }}
 {{ else }}
-<script defer src="https://cdn.jsdelivr.net/combine/npm/medium-zoom@1.0.6,npm/lazysizes@5.2.2"></script>
-<script defer src="https://cdn.jsdelivr.net/npm/prismjs@1.21.0/components/prism-core.min.js"></script>
-<script defer src="https://cdn.jsdelivr.net/npm/prismjs@1.21.0/plugins/autoloader/prism-autoloader.min.js"></script>
+<script defer src="https://cdn.jsdelivr.net/npm/medium-zoom@1.0.6/dist/medium-zoom.min.js"></script>
+<script defer src="https://cdn.jsdelivr.net/npm/lazysizes@5.3.0/lazysizes.min.js"></script>
+<script defer src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/components/prism-core.min.js"></script>
+<script defer src="https://cdn.jsdelivr.net/npm/prismjs@1.23.0/plugins/autoloader/prism-autoloader.min.js"></script>
 {{ end }}
 {{ $options := (dict "targetPath" "assets/js/fuji.min.js" "minify" true "target" "es2015" "format" "iife") }}
 {{ $built := resources.Get "js/fuji.js" | js.Build $options }}
@@ -12,33 +14,51 @@
 {{ if or .Params.math .Site.Params.math }}
 {{ partial "math.html" . }}
 {{ end }}
-{{ with .Params.player }}
+{{ with .Params.aplayer }}
 <script src="https://cdn.jsdelivr.net/npm/aplayer@1.10.1/dist/APlayer.min.js"></script>
 <script>
-    // in-post aplayer
-    // prettier-ignore
-    var aPlayer = new APlayer({
-        container: document.getElementById('post-aplayer'),
+  // in-post aplayer
+  var pContainers = document.querySelectorAll('.content article .post-aplayer');
+  if (pContainers && pContainers.length > 0) {
+    pContainers.forEach(function (container) {
+      var attrs = ['urls', 'names', 'artists', 'covers'];
+      attrs = attrs.map(function (attr) {
+        var arr = container.getAttribute('data-' + attr).replace(/( |%20)/ig, '').split(',');
+        if (arr.length > 0){
+          return arr.map(function (val) {
+            return String(val).trim();
+          });
+        } else {
+          return attr;
+        }
+      });
+      var audio = [];
+      for (var i = 0; i < attrs[0].length; i++) {
+        var a = {
+          name: attrs[1][i],
+          url: attrs[0][i],
+        };
+        (typeof attrs[2] !== 'string') && (a.artist = attrs[2][i]);
+        (typeof attrs[3] !== 'string') && (a.cover = attrs[3][i]);
+        audio.push(a);
+      }
+      new APlayer({
+        container: container,
         theme: '#8f82bc',
         volume: 0.1,
         listFolded: true,
-        audio: [{{- range $.Params.player -}}
-            {
-                name: '{{ .playerName }}',
-                artist: '{{ .playerArtist }}',
-                url: '{{ .playerURL }}',
-                cover: '{{ .playerCover }}'
-            },
-            {{- end -}}]
-    });
-    // aplayer toc anchors fix
-    // see https://github.com/MoePlayer/APlayer/issues/242#issuecomment-602471423
-    document.addEventListener('DOMContentLoaded', function () {
-        var issueTocEle = document.querySelector('.sidebar-toc');
-        if (issueTocEle) {
-            var newTocEle = issueTocEle.cloneNode(true);
-            issueTocEle.parentNode.replaceChild(newTocEle, issueTocEle);
-        }
+        audio: audio
+      });
     });
+  }
+  // aplayer toc anchors fix
+  // see https://github.com/MoePlayer/APlayer/issues/242#issuecomment-602471423
+  document.addEventListener('DOMContentLoaded', function () {
+    var issueTocEle = document.querySelector('.sidebar-toc');
+    if (issueTocEle) {
+      var newTocEle = issueTocEle.cloneNode(true);
+      issueTocEle.parentNode.replaceChild(newTocEle, issueTocEle);
+    }
+  });
 </script>
 {{ end }}
 \ No newline at end of file
diff --git a/layouts/partials/scripts-front.html b/layouts/partials/scripts-front.html
index c28912a..c802702 100644
--- a/layouts/partials/scripts-front.html
+++ b/layouts/partials/scripts-front.html
@@ -10,4 +10,4 @@
       document.body.setAttribute('data-theme', fujiThemeData === 'dark' ? 'dark' : 'light');
     }
   }
-</script>
+</script>
+\ No newline at end of file
diff --git a/layouts/shortcodes/aplayer.html b/layouts/shortcodes/aplayer.html
new file mode 100644
index 0000000..ac56aaa
--- /dev/null
+++ b/layouts/shortcodes/aplayer.html
@@ -0,0 +1,9 @@
+<div class="post-player-wrapper">
+  <div
+    class="post-aplayer"
+    data-urls="{{- .Get "urls" -}}"
+    data-names="{{- .Get "names" -}}"
+    {{ with .Get "artists" -}}data-artists="{{- . -}}"{{- end }}
+    {{ with .Get "covers" -}}data-covers="{{- . -}}"{{- end }}
+  ></div>
+</div>
+\ No newline at end of file