elias/strudel-docker
1
0
Fork 0
mirror of https://github.com/eliasstepanik/strudel-docker.git synced 2026-01-11 05:38:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1297 from daslyfe/jade/fix/importerror

Browse Source 
Hotfix: prevent undefined pattern code from crashing strudel on load
This commit is contained in:
Jade (Rose) Rowland 2025-02-27 20:53:41 -05:00 committed by GitHub
commit c0b3187029
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
website/src/metadata_parser.js
View File

@ -1,6 +1,11 @@
const ALLOW_MANY = ['by', 'url', 'genre', 'license'];
import { defaultCode } from './user_pattern_utils.mjs';
export function getMetadata(raw_code) {
if (raw_code == null) {
console.error('could not extract metadata from missing pattern code');
raw_code = defaultCode;
}
const comment_regexp = /\/\*([\s\S]*?)\*\/|\/\/(.*)$/gm;
const comments = [...raw_code.matchAll(comment_regexp)].map((c) => (c[1] || c[2] || '').trim());
const tags = {};

8
website/src/repl/components/panel/PatternsTab.jsx
View File

@ -27,14 +27,10 @@ export function PatternLabel({ pattern } /* : { pattern: Tables<'code'> } */) {
const date = new Date(pattern.created_at);
if (!isNaN(date)) {
title = date.toLocaleDateString();
} else {
title = 'unnamed';
}
}
if (title == null) {
title = pattern.hash;
}
if (title == null) {
title = 'unnamed';
}
const author = Array.isArray(meta.by) ? meta.by.join(',') : 'Anonymous';
return <>{`${pattern.id}: ${title} by ${author.slice(0, 100)}`.slice(0, 60)}</>;

2
website/src/user_pattern_utils.mjs
View File

@ -111,7 +111,7 @@ export function useActivePattern() {
export const setLatestCode = (code) => settingsMap.setKey('latestCode', code);
const defaultCode = '';
export const defaultCode = '';
export const userPattern = {
collection: patternFilterName.user,
getAll() {