opensource/filestash
1
0
Fork 0
mirror of https://github.com/mickael-kerjean/filestash.git synced 2025-10-31 18:16:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix (config): regression on config change

Browse Source
This commit is contained in:
MickaelK
2025-02-04 02:06:13 +11:00
parent fe830fb8e2
commit acad39b05f
5 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/assets/model/config.js
View File

@ -23,7 +23,7 @@ export function get(key, defaultValue) {
} }
export function getVersion() { export function getVersion() {
return get("version", "na"); return get("version", "");
} }
export function query() { export function query() {

5
public/assets/pages/filespage/ctrl_upload.js
View File

@ -3,10 +3,11 @@ import { toHref } from "../../lib/skeleton/router.js";
import rxjs, { effect, onClick } from "../../lib/rx.js"; import rxjs, { effect, onClick } from "../../lib/rx.js";
import { forwardURLParams } from "../../lib/path.js"; import { forwardURLParams } from "../../lib/path.js";
import { animate, slideYOut } from "../../lib/animate.js"; import { animate, slideYOut } from "../../lib/animate.js";
import { loadCSS } from "../../helpers/loader.js";
import { qs, qsa } from "../../lib/dom.js"; import { qs, qsa } from "../../lib/dom.js";
import { AjaxError } from "../../lib/error.js"; import { AjaxError } from "../../lib/error.js";
import assert from "../../lib/assert.js"; import assert from "../../lib/assert.js";
import { get as getConfig } from "../../model/config.js";
import { loadCSS } from "../../helpers/loader.js";
import { currentPath, isNativeFileUpload } from "./helper.js"; import { currentPath, isNativeFileUpload } from "./helper.js";
import { getPermission, calculatePermission } from "./model_acl.js"; import { getPermission, calculatePermission } from "./model_acl.js";
import { mkdir, save } from "./model_virtual_layer.js"; import { mkdir, save } from "./model_virtual_layer.js";
@ -358,7 +359,7 @@ function workerImplFile({ progress, speed }) {
} }
async prepareJob({ file, path, virtual }) { async prepareJob({ file, path, virtual }) {
const chunkSize = (window.CONFIG["upload_chunk_size"] || 0) *1024*1024; const chunkSize = getConfig("upload_chunk_size", 0) *1024*1024;
const numberOfChunks = Math.ceil(file.size / chunkSize); const numberOfChunks = Math.ceil(file.size / chunkSize);
const headersNoCache = { const headersNoCache = {
"Cache-Control": "no-store", "Cache-Control": "no-store",

8
public/assets/pages/filespage/thing.js
View File

@ -1,6 +1,7 @@
import { createElement } from "../../lib/skeleton/index.js"; import { createElement } from "../../lib/skeleton/index.js";
import { animate, opacityOut, opacityIn } from "../../lib/animate.js"; import { animate, opacityOut, opacityIn } from "../../lib/animate.js";
import assert from "../../lib/assert.js"; import assert from "../../lib/assert.js";
import { get as getConfig } from "../../model/config.js";
import { extractPath, isDir, isNativeFileUpload } from "./helper.js"; import { extractPath, isDir, isNativeFileUpload } from "./helper.js";
import { files$ } from "./ctrl_filesystem.js"; import { files$ } from "./ctrl_filesystem.js";
@ -24,11 +25,12 @@ const IMAGE = {
let TYPES = null; let TYPES = null;
export function init() { export function init() {
TYPES = { TYPES = {
MIME: window.CONFIG.mime, MIME: getConfig("mime", {}),
THUMBNAILER: (function() { THUMBNAILER: (function() {
const set = new Set(); const set = new Set();
for (let i=0; i<window.CONFIG.thumbnailer.length; i++) { const thumbnailers = getConfig("thumbnailer");
set.add(window.CONFIG.thumbnailer[i]); for (let i=0; i<thumbnailers.length; i++) {
set.add(thumbnailers[i]);
} }
return set; return set;
})(), })(),

3
public/assets/pages/viewerpage/application_editor.js
View File

@ -2,6 +2,7 @@ import { createElement, onDestroy } from "../../lib/skeleton/index.js";
import rxjs, { effect } from "../../lib/rx.js"; import rxjs, { effect } from "../../lib/rx.js";
import { animate, slideXIn, opacityOut } from "../../lib/animate.js"; import { animate, slideXIn, opacityOut } from "../../lib/animate.js";
import { qs } from "../../lib/dom.js"; import { qs } from "../../lib/dom.js";
import { get as getConfig } from "../../model/config.js";
import { createLoader } from "../../components/loader.js"; import { createLoader } from "../../components/loader.js";
import { createModal, MODAL_RIGHT_BUTTON } from "../../components/modal.js"; import { createModal, MODAL_RIGHT_BUTTON } from "../../components/modal.js";
import { loadCSS, loadJS } from "../../helpers/loader.js"; import { loadCSS, loadJS } from "../../helpers/loader.js";
@ -65,7 +66,7 @@ export default async function(render, { acl$, getFilename, getDownloadUrl }) {
}), }),
); );
return rxjs.of(content).pipe( return rxjs.of(content).pipe(
rxjs.mergeMap((content) => rxjs.of(window.CONFIG).pipe( rxjs.mergeMap((content) => rxjs.of(getConfig()).pipe(
rxjs.mergeMap((config) => rxjs.from(loadKeybinding(config.editor)).pipe(rxjs.mapTo(config))), rxjs.mergeMap((config) => rxjs.from(loadKeybinding(config.editor)).pipe(rxjs.mapTo(config))),
rxjs.map((config) => [content, config]), rxjs.map((config) => [content, config]),
rxjs.mergeMap((arr) => rxjs.from(loadMode(extname(getFilename()))).pipe( rxjs.mergeMap((arr) => rxjs.from(loadMode(extname(getFilename()))).pipe(

7
public/assets/pages/viewerpage/application_image.js
View File

@ -3,13 +3,14 @@ import { toHref } from "../../lib/skeleton/router.js";
import rxjs, { effect, onLoad, onClick } from "../../lib/rx.js"; import rxjs, { effect, onLoad, onClick } from "../../lib/rx.js";
import { animate } from "../../lib/animate.js"; import { animate } from "../../lib/animate.js";
import { extname } from "../../lib/path.js"; import { extname } from "../../lib/path.js";
import { loadCSS } from "../../helpers/loader.js";
import { qs } from "../../lib/dom.js"; import { qs } from "../../lib/dom.js";
import { get as getConfig } from "../../model/config.js";
import { Chromecast } from "../../model/chromecast.js";
import { loadCSS } from "../../helpers/loader.js";
import { createLoader } from "../../components/loader.js"; import { createLoader } from "../../components/loader.js";
import notification from "../../components/notification.js"; import notification from "../../components/notification.js";
import t from "../../locales/index.js"; import t from "../../locales/index.js";
import ctrlError from "../ctrl_error.js"; import ctrlError from "../ctrl_error.js";
import { Chromecast } from "../../model/chromecast.js";
import { transition } from "./common.js"; import { transition } from "./common.js";
@ -129,7 +130,7 @@ function buttonChromecast(filename, downloadURL) {
const link = Chromecast.createLink("/" + toHref(downloadURL)); const link = Chromecast.createLink("/" + toHref(downloadURL));
const media = new window.chrome.cast.media.MediaInfo( const media = new window.chrome.cast.media.MediaInfo(
link, link,
window.CONFIG.mime[extname(filename)], getConfig("mime", {})[extname(filename)],
); );
media.metadata = new window.chrome.cast.media.PhotoMediaMetadata(); media.metadata = new window.chrome.cast.media.PhotoMediaMetadata();
media.metadata.title = filename; media.metadata.title = filename;