diff --git a/.github/workflows/push-continous-delivery.yml b/.github/workflows/push-continous-delivery.yml
index eef7e0f84..b3258ee0e 100644
--- a/.github/workflows/push-continous-delivery.yml
+++ b/.github/workflows/push-continous-delivery.yml
@@ -11,14 +11,14 @@ jobs:
steps:
- uses: actions/checkout@master
- name: Set up Docker Buildx
- uses: crazy-max/ghaction-docker-buildx@v1.5.0
+ uses: crazy-max/ghaction-docker-buildx@v3.2.0
with:
- buildx-version: v0.3.1
+ buildx-version: latest
qemu-version: latest
- - uses: actions/cache@v1
+ - uses: actions/cache@v2
with:
path: /tmp/buildxcache
- key: ${{ runner.os }}-docker-buildx-${{ hashFiles('**') }}
+ key: ${{ runner.os }}-docker-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-docker-buildx-
- name: Docker Login
@@ -30,23 +30,13 @@ jobs:
- name: Build/Push Nightly Docker
run: |
- if [ -f /tmp/buildxcache/index.json ]; then
- echo "Using buildx cache!"
- docker buildx build --pull \
- --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x \
- --output "type=image,push=true" \
- --tag difegue/lanraragi:nightly \
- --cache-from=type=local,src=/tmp/buildxcache \
- --cache-to=type=local,dest=/tmp/buildxcache \
- --file ./tools/build/docker/Dockerfile .
- else
- docker buildx build --pull \
- --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x \
- --output "type=image,push=true" \
- --tag difegue/lanraragi:nightly \
- --cache-to=type=local,dest=/tmp/buildxcache \
- --file ./tools/build/docker/Dockerfile .
- fi
+ docker buildx build \
+ --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x \
+ --output "type=image,push=true" \
+ --tag difegue/lanraragi:nightly \
+ --cache-from "type=local,src=/tmp/buildxcache" \
+ --cache-to "type=local,dest=/tmp/buildxcache" \
+ --file ./tools/build/docker/Dockerfile .
exportDockerRootFS:
name: Build and export Docker rootfs for Windows build
diff --git a/.github/workflows/release-delivery.yml b/.github/workflows/release-delivery.yml
index f593547f7..f145d04b0 100644
--- a/.github/workflows/release-delivery.yml
+++ b/.github/workflows/release-delivery.yml
@@ -71,21 +71,29 @@ jobs:
steps:
- uses: actions/checkout@master
- name: Set up Docker Buildx
- uses: crazy-max/ghaction-docker-buildx@v1.5.0
+ uses: crazy-max/ghaction-docker-buildx@v3.2.0
with:
- buildx-version: v0.3.1
+ buildx-version: latest
qemu-version: latest
+ - uses: actions/cache@v2
+ with:
+ path: /tmp/buildxcache
+ key: ${{ runner.os }}-docker-buildx-${{ github.sha }}
+ restore-keys: |
+ ${{ runner.os }}-docker-buildx-
- name: Build/Push Latest Docker image and tag with Release number
env:
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
run: |
TAG=${GITHUB_REF:10:10}
- docker buildx build --pull \
+ docker buildx build \
--platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x \
- --output "type=registry" \
+ --output "type=image,push=true" \
--tag difegue/lanraragi:latest \
--tag difegue/lanraragi:$TAG \
+ --cache-from "type=local,src=/tmp/buildxcache" \
+ --cache-to "type=local,dest=/tmp/buildxcache" \
--file ./tools/build/docker/Dockerfile .
- uses: Ilshidur/action-discord@master
env:
diff --git a/lib/LANraragi/Utils/Routing.pm b/lib/LANraragi/Utils/Routing.pm
index ebd670574..66a4644e4 100644
--- a/lib/LANraragi/Utils/Routing.pm
+++ b/lib/LANraragi/Utils/Routing.pm
@@ -70,7 +70,7 @@ sub apply_routes {
$public_api->get('/api/info')->to('api-other#serve_serverinfo');
$logged_in_api->get('/api/plugins/:type')->to('api-other#list_plugins');
$logged_in_api->post('/api/plugins/use')->to('api-other#use_plugin');
- $logged_in_api->post('/api/plugin/use')->to('api-other#use_plugin');
+ $logged_in_api->post('/api/plugin/use')->to('api-other#use_plugin'); #old
$logged_in_api->delete('/api/tempfolder')->to('api-other#clean_tempfolder');
# Archive API (old)
diff --git a/lib/Shinobu.pm b/lib/Shinobu.pm
index 24954c57a..d3a14b8a2 100644
--- a/lib/Shinobu.pm
+++ b/lib/Shinobu.pm
@@ -38,6 +38,7 @@ use LANraragi::Utils::Generic qw(is_archive);
use LANraragi::Model::Config;
use LANraragi::Model::Plugins;
use LANraragi::Utils::Plugins; # Needed here since Shinobu doesn't inherit from the main LRR package
+use LANraragi::Model::Search; # idem
# Filemap hash, global to all subs and exposed to the server through IPC
my %filemap;
diff --git a/package.json b/package.json
index 68ff603f4..6c3877ed9 100755
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "lanraragi",
- "version": "0.7.1",
- "version_name": "Tonight",
+ "version": "0.7.2",
+ "version_name": "Neighborhood Threat",
"description": "holla where the chinese comics at",
"scripts": {
"test": "prove -l -v tests/*.t",
diff --git a/public/js/index.js b/public/js/index.js
index 57480f33c..a96a606c1 100755
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -253,6 +253,8 @@ function loadCategories() {
}
function encode(r) {
+ if (r === undefined)
+ return r;
if (Array.isArray(r))
return r[0].replace(/[\x26\x0A\<>'"]/g, function (r) { return "&#" + r.charCodeAt(0) + ";" });
else
diff --git a/public/js/index_datatables.js b/public/js/index_datatables.js
index dc6f60f21..427bb6502 100644
--- a/public/js/index_datatables.js
+++ b/public/js/index_datatables.js
@@ -130,7 +130,7 @@ function titleColumnDisplay(data, type, full, meta) {
titleHtml += buildProgressDiv(data.arcid, data.isnew);
return `${titleHtml}
-
${encode(data.title)}
@@ -185,7 +185,7 @@ function buildThumbDiv(row, data, index) {
+