Compare commits
	
		
			14 Commits
		
	
	
		
			e20b04189f
			...
			v0.6.0
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 62388eb555 | ||
|   | 53778543bf | ||
|   | 8dda230510 | ||
|   | 696e3ab568 | ||
|   | 85ac12ad33 | ||
|   | e56cc47105 | ||
|   | ebbd96bc94 | ||
|   | a9b6d04361 | ||
|   | 5808fe17ad | ||
|   | 671359e327 | ||
|   | ba9495eb65 | ||
|   | de482afd60 | ||
|   | a547052e29 | ||
|   | 07c2ff4c15 | 
| @@ -16,7 +16,7 @@ from sanic.exceptions import Forbidden, NotFound | ||||
| from sanic.log import logger | ||||
| from stream_zip import ZIP_AUTO, stream_zip | ||||
|  | ||||
| from cista import auth, config, session, watching | ||||
| from cista import auth, config, preview, session, watching | ||||
| from cista.api import bp | ||||
| from cista.util.apphelpers import handle_sanic_exception | ||||
|  | ||||
| @@ -25,6 +25,7 @@ sanic.helpers._ENTITY_HEADERS = frozenset() | ||||
|  | ||||
| app = Sanic("cista", strict_slashes=True) | ||||
| app.blueprint(auth.bp) | ||||
| app.blueprint(preview.bp) | ||||
| app.blueprint(bp) | ||||
| app.exception(Exception)(handle_sanic_exception) | ||||
|  | ||||
|   | ||||
							
								
								
									
										52
									
								
								cista/preview.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										52
									
								
								cista/preview.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,52 @@ | ||||
| import asyncio | ||||
| import io | ||||
| from pathlib import PurePosixPath | ||||
| from urllib.parse import unquote | ||||
|  | ||||
| from PIL import Image | ||||
| from sanic import Blueprint, raw | ||||
| from sanic.exceptions import Forbidden, NotFound | ||||
| from sanic.log import logger | ||||
|  | ||||
| from cista import config | ||||
| from cista.util.filename import sanitize | ||||
|  | ||||
| bp = Blueprint("preview", url_prefix="/preview") | ||||
|  | ||||
|  | ||||
| @bp.get("/<path:path>") | ||||
| async def preview(req, path): | ||||
|     """Preview a file""" | ||||
|     width = int(req.query_string) if req.query_string else 1024 | ||||
|     rel = PurePosixPath(sanitize(unquote(path))) | ||||
|     path = config.config.path / rel | ||||
|     if not path.is_file(): | ||||
|         raise NotFound("File not found") | ||||
|     size = path.lstat().st_size | ||||
|     if size > 20 * 10**6: | ||||
|         raise Forbidden("File too large") | ||||
|     img = await asyncio.get_event_loop().run_in_executor( | ||||
|         req.app.ctx.threadexec, process_image, path, width | ||||
|     ) | ||||
|     return raw(img, content_type="image/webp") | ||||
|  | ||||
|  | ||||
| def process_image(path, maxsize): | ||||
|     img = Image.open(path) | ||||
|     w, h = img.size | ||||
|     img.thumbnail((min(w, maxsize), min(h, maxsize))) | ||||
|     # Fix rotation based on EXIF data | ||||
|     try: | ||||
|         rotate_values = {3: 180, 6: 270, 8: 90} | ||||
|         exif = img._getexif() | ||||
|         if exif: | ||||
|             orientation = exif.get(274) | ||||
|             if orientation in rotate_values: | ||||
|                 logger.debug(f"Rotating preview {path} by {rotate_values[orientation]}") | ||||
|                 img = img.rotate(rotate_values[orientation], expand=True) | ||||
|     except Exception as e: | ||||
|         logger.error(f"Error rotating preview image: {e}") | ||||
|     # Save as webp | ||||
|     imgdata = io.BytesIO() | ||||
|     img.save(imgdata, format="webp", quality=70, method=6) | ||||
|     return imgdata.getvalue() | ||||
| @@ -21,6 +21,7 @@ import { useMainStore } from '@/stores/main' | ||||
|  | ||||
| import { computed } from 'vue' | ||||
| import Router from '@/router/index' | ||||
| import type { SortOrder } from './utils/docsort' | ||||
|  | ||||
| interface Path { | ||||
|   path: string | ||||
| @@ -61,23 +62,14 @@ const globalShortcutHandler = (event: KeyboardEvent) => { | ||||
|       event.key === 'ArrowRight' || | ||||
|       (c && event.code === 'Space') | ||||
|     ) { | ||||
|       event.preventDefault() | ||||
|       if (!input) event.preventDefault() | ||||
|     } | ||||
|     return | ||||
|   } | ||||
|   //console.log("key pressed", event) | ||||
|   // For up/down implement custom fast repeat | ||||
|   let stride = 1 | ||||
|   if (store.gallery) { | ||||
|     const grid = document.querySelector('.gallery') as HTMLElement | ||||
|     stride = getComputedStyle(grid).gridTemplateColumns.split(' ').length | ||||
|   } | ||||
|   else if (event.altKey) stride *= 10 | ||||
|   // Long if-else machina for all keys we handle here | ||||
|   if (event.key === 'ArrowUp') vert = stride * (keyup ? 0 : -1) | ||||
|   else if (event.key === 'ArrowDown') vert = stride * (keyup ? 0 : 1) | ||||
|   else if (event.key === 'ArrowLeft') vert = keyup ? 0 : -1 | ||||
|   else if (event.key === 'ArrowRight') vert = keyup ? 0 : 1 | ||||
|   /// Long if-else machina for all keys we handle here | ||||
|   let arrow = '' | ||||
|   if (event.key.startsWith("Arrow")) arrow = event.key.slice(5).toLowerCase() | ||||
|   // Find: process on keydown so that we can bypass the built-in search hotkey | ||||
|   else if (!keyup && event.key === 'f' && (event.ctrlKey || event.metaKey)) { | ||||
|     headerMain.value!.toggleSearchInput() | ||||
| @@ -86,25 +78,30 @@ const globalShortcutHandler = (event: KeyboardEvent) => { | ||||
|   else if (keyup && !input && event.key === '/') { | ||||
|     headerMain.value!.toggleSearchInput() | ||||
|   } | ||||
|   // Globally close search on Escape | ||||
|   // Globally close search, clear errors on Escape | ||||
|   else if (keyup && event.key === 'Escape') { | ||||
|     store.error = '' | ||||
|     headerMain.value!.closeSearch(event) | ||||
|     store.focusBreadcrumb() | ||||
|   } | ||||
|   // Select all (toggle); keydown to prevent builtin | ||||
|   else if (!input && keyup && event.key === 'Backspace') { | ||||
|     Router.back() | ||||
|   } | ||||
|   // Select all (toggle); keydown to precede and prevent builtin | ||||
|   else if (!keyup && event.key === 'a' && (event.ctrlKey || event.metaKey)) { | ||||
|     fileExplorer.toggleSelectAll() | ||||
|   } | ||||
|   // G toggles Gallery | ||||
|   else if (keyup && event.key === 'g') { | ||||
|     store.gallery = !store.gallery | ||||
|   else if (!input && keyup && event.key === 'g') { | ||||
|     store.prefs.gallery = !store.prefs.gallery | ||||
|   } | ||||
|   // Keys 1-3 to sort columns | ||||
|   // Keys Backquote-1-2-3 to sort columns | ||||
|   else if ( | ||||
|     !input && | ||||
|     keyup && | ||||
|     (event.key === '1' || event.key === '2' || event.key === '3') | ||||
|     (event.code === 'Backquote' || event.key === '1' || event.key === '2' || event.key === '3') | ||||
|   ) { | ||||
|     fileExplorer.toggleSortColumn(+event.key) | ||||
|     store.sort(['', 'name', 'modified', 'size'][+event.key || 0] as SortOrder) | ||||
|   } | ||||
|   // Rename | ||||
|   else if (c && keyup && !event.ctrlKey && (event.key === 'F2' || event.key === 'r')) { | ||||
| @@ -114,28 +111,26 @@ const globalShortcutHandler = (event: KeyboardEvent) => { | ||||
|   else if (c && event.code === 'Space') { | ||||
|     if (keyup && !event.altKey && !event.ctrlKey) | ||||
|       fileExplorer.cursorSelect() | ||||
|   } else return | ||||
|   } | ||||
|   else return | ||||
|   /// We are handling this! | ||||
|   event.preventDefault() | ||||
|   if (!vert) { | ||||
|   if (timer) { | ||||
|     clearTimeout(timer) // Good for either timeout or interval | ||||
|     timer = null | ||||
|   } | ||||
|     return | ||||
|   let f: any | ||||
|   switch (arrow) { | ||||
|     case 'up': f = () => fileExplorer.up(event); break | ||||
|     case 'down': f = () => fileExplorer.down(event); break | ||||
|     case 'left': f = () => fileExplorer.left(event); break | ||||
|     case 'right': f = () => fileExplorer.right(event); break | ||||
|   } | ||||
|   if (!timer) { | ||||
|   if (f && !keyup) { | ||||
|     // Initial move, then t0 delay until repeats at tr intervals | ||||
|     const select = event.shiftKey | ||||
|     fileExplorer.cursorMove(vert, select) | ||||
|     const t0 = 200, | ||||
|       tr = 30 | ||||
|     timer = setTimeout( | ||||
|       () => | ||||
|         (timer = setInterval(() => { | ||||
|           fileExplorer.cursorMove(vert, select) | ||||
|         }, tr)), | ||||
|       t0 - tr | ||||
|     ) | ||||
|     const t0 = 200, tr = event.altKey ? 20 : 100 | ||||
|     f() | ||||
|     timer = setTimeout(() => { timer = setInterval(f, tr) }, t0 - tr) | ||||
|   } | ||||
| } | ||||
| onMounted(() => { | ||||
|   | ||||
| @@ -92,7 +92,7 @@ | ||||
|   nav, | ||||
|   .menu, | ||||
|   .rename-button { | ||||
|     display: none; | ||||
|     display: none !important; | ||||
|   } | ||||
|   .breadcrumb > a { | ||||
|     color: black !important; | ||||
| @@ -113,6 +113,7 @@ | ||||
|     padding-bottom: 0 !important; | ||||
|   } | ||||
|   thead tr { | ||||
|     font-size: 1rem !important; | ||||
|     position: static !important; | ||||
|     background: none !important; | ||||
|     border-bottom: 1pt solid black !important; | ||||
|   | ||||
| @@ -2,8 +2,8 @@ | ||||
|   <nav | ||||
|     class="breadcrumb" | ||||
|     aria-label="Breadcrumb" | ||||
|     @keyup.left.stop="move(-1)" | ||||
|     @keyup.right.stop="move(1)" | ||||
|     @keydown.left.stop="move(-1)" | ||||
|     @keydown.right.stop="move(1)" | ||||
|     @keyup.enter="move(0)" | ||||
|     @focus=focusCurrent | ||||
|     tabindex=0 | ||||
| @@ -113,11 +113,11 @@ watchEffect(() => { | ||||
|   padding: 0 1em 0 0; | ||||
| } | ||||
| .breadcrumb > a { | ||||
|   flex: 0 4 auto; | ||||
|   display: flex; | ||||
|   align-items: center; | ||||
|   margin: 0 -0.5em 0 -0.5em; | ||||
|   padding: 0; | ||||
|   max-width: 8em; | ||||
|   white-space: nowrap; | ||||
|   text-overflow: ellipsis; | ||||
|   overflow: hidden; | ||||
| @@ -126,13 +126,13 @@ watchEffect(() => { | ||||
|   clip-path: polygon(0 0, 1em 50%, 0 100%, 100% 100%, 100% 0, 0 0); | ||||
|   transition: all var(--breadcrumb-transtime); | ||||
| } | ||||
| .breadcrumb a:first-child { | ||||
| .breadcrumb > a:first-child { | ||||
|   flex: 0 0 auto; | ||||
|   padding-left: 1.5em; | ||||
|   padding-right: 1.7em; | ||||
|   clip-path: none; | ||||
| } | ||||
| .breadcrumb a:last-child { | ||||
|   max-width: none; | ||||
| .breadcrumb > a:last-child { | ||||
|   clip-path: polygon( | ||||
|     0 0, | ||||
|     calc(100% - 1em) 0, | ||||
| @@ -143,7 +143,7 @@ watchEffect(() => { | ||||
|     0 0 | ||||
|   ); | ||||
| } | ||||
| .breadcrumb a:only-child { | ||||
| .breadcrumb > a:only-child { | ||||
|   clip-path: polygon( | ||||
|     0 0, | ||||
|     calc(100% - 1em) 0, | ||||
| @@ -177,6 +177,6 @@ watchEffect(() => { | ||||
| } | ||||
| .breadcrumb a:hover { color: var(--breadcrumb-hover-color) } | ||||
| .breadcrumb a:hover svg { fill: var(--breadcrumb-hover-color) } | ||||
| .breadcrumb a.current { color: var(--accent-color) } | ||||
| .breadcrumb a.current { color: var(--accent-color); max-width: none; flex: 0 1 auto; } | ||||
| .breadcrumb a.current svg { fill: var(--accent-color) } | ||||
| </style> | ||||
|   | ||||
| @@ -49,15 +49,9 @@ | ||||
|               <FileRenameInput :doc="doc" :rename="rename" :exit="() => {editing = null}" /> | ||||
|             </template> | ||||
|             <template v-else> | ||||
|               <a | ||||
|                 :href="doc.url" | ||||
|                 tabindex="-1" | ||||
|                 @contextmenu.prevent | ||||
|                 @focus.stop="store.cursor = doc.key" | ||||
|                 @keyup.left="router.back()" | ||||
|                 @keyup.right.stop="ev => { if (doc.dir) (ev.target as HTMLElement).click() }" | ||||
|                 >{{ doc.name }}</a | ||||
|               > | ||||
|               <a :href=doc.url tabindex=-1 @contextmenu.stop @focus.stop="store.cursor = doc.key"> | ||||
|                 {{ doc.name }} | ||||
|               </a> | ||||
|               <button tabindex=-1 v-if="store.cursor == doc.key" class="rename-button" @click="() => (editing = doc)">🖊️</button> | ||||
|             </template> | ||||
|           </td> | ||||
| @@ -137,15 +131,11 @@ defineExpose({ | ||||
|     console.log('Select') | ||||
|     allSelected.value = !allSelected.value | ||||
|   }, | ||||
|   toggleSortColumn(column: number) { | ||||
|     const order = ['', 'name', 'modified', 'size', ''][column] | ||||
|     if (order) store.toggleSort(order as SortOrder) | ||||
|   }, | ||||
|   isCursor() { | ||||
|     return store.cursor && editing.value === null | ||||
|   }, | ||||
|   cursorRename() { | ||||
|     editing.value = store.cursor | ||||
|     editing.value = props.documents.find(doc => doc.key === store.cursor) ?? null | ||||
|   }, | ||||
|   cursorSelect() { | ||||
|     const key = store.cursor | ||||
| @@ -155,9 +145,17 @@ defineExpose({ | ||||
|     } else { | ||||
|       store.selected.add(key) | ||||
|     } | ||||
|     this.cursorMove(1) | ||||
|     this.cursorMove(1, null) | ||||
|   }, | ||||
|   cursorMove(d: number, select = false) { | ||||
|   up(ev: KeyboardEvent) { this.cursorMove(-1, ev) }, | ||||
|   down(ev: KeyboardEvent) { this.cursorMove(1, ev) }, | ||||
|   left(ev: KeyboardEvent) { router.back() }, | ||||
|   right(ev: KeyboardEvent) { | ||||
|     const a = document.querySelector(`#file-${store.cursor} a`) as HTMLAnchorElement | null | ||||
|     if (a) a.click() | ||||
|   }, | ||||
|   cursorMove(d: number, ev: KeyboardEvent | null) { | ||||
|     const select = !!ev?.shiftKey | ||||
|     // Move cursor up or down (keyboard navigation) | ||||
|     const docs = props.documents | ||||
|     if (docs.length === 0) { | ||||
| @@ -168,7 +166,7 @@ defineExpose({ | ||||
|     const mod = (a: number, b: number) => ((a % b) + b) % b | ||||
|     const increment = (i: number, d: number) => mod(i + d, N + 1) | ||||
|     const index = | ||||
|       store.cursor ? docs.find(doc => doc.key === store.cursor) : docs.length | ||||
|       store.cursor ? docs.findIndex(doc => doc.key === store.cursor) : docs.length | ||||
|     const moveto = increment(index, d) | ||||
|     store.cursor = docs[moveto]?.key ?? '' | ||||
|     const tr = store.cursor ? document.getElementById(`file-${store.cursor}`) : '' | ||||
| @@ -309,29 +307,36 @@ tbody tr { | ||||
|   position: relative; | ||||
|   z-index: auto; | ||||
| } | ||||
| table thead input[type='checkbox'] { | ||||
| table thead .selection input[type='checkbox'] { | ||||
|   position: inherit; | ||||
|   width: 1em; | ||||
|   height: 1em; | ||||
|   padding: 0.5rem 0.5em; | ||||
|   width: 1rem; | ||||
|   height: 1rem; | ||||
|   padding: 0; | ||||
|   margin: auto; | ||||
| } | ||||
| table tbody input[type='checkbox'] { | ||||
| table tbody .selection input[type='checkbox'] { | ||||
|   width: 2rem; | ||||
|   height: 2rem; | ||||
| } | ||||
| table .selection { | ||||
|   width: 2rem; | ||||
|   width: 3rem; | ||||
|   text-align: center; | ||||
|   text-overflow: clip; | ||||
|   padding: 0; | ||||
| } | ||||
| table .selection input { | ||||
|   margin: auto; | ||||
| } | ||||
| table .modified { | ||||
|   width: 9em; | ||||
|   width: 10rem; | ||||
|   text-overflow: clip; | ||||
| } | ||||
| table .size { | ||||
|   width: 5em; | ||||
|   width: 7rem; | ||||
|   text-overflow: clip; | ||||
| } | ||||
| table .menu { | ||||
|   width: 1rem; | ||||
|   width: 2rem; | ||||
| } | ||||
| tbody td { | ||||
|   font-size: 1.2rem; | ||||
| @@ -366,7 +371,7 @@ table td { | ||||
|   } | ||||
| } | ||||
| thead tr { | ||||
|   font-size: var(--header-font-size); | ||||
|   font-size: 0.8rem; | ||||
|   background: linear-gradient(to bottom, #eee, #fff 30%, #ddd); | ||||
|   color: #000; | ||||
|   box-shadow: 0 0 .2rem black; | ||||
| @@ -387,9 +392,11 @@ tbody tr.cursor { | ||||
|   padding-right: 1.5rem; | ||||
| } | ||||
| .sortcolumn::after { | ||||
|   font-size: 1rem; | ||||
|   content: '▸'; | ||||
|   color: #888; | ||||
|   margin-left: 0.5em; | ||||
|   margin-left: 0.5rem; | ||||
|   margin-top: -.2rem; | ||||
|   position: absolute; | ||||
|   transition: all var(--transition-time) linear; | ||||
| } | ||||
|   | ||||
| @@ -1,15 +1,13 @@ | ||||
| <template> | ||||
|   <div v-if="props.documents.length || editing" class="gallery"> | ||||
|     <template v-for="(doc, index) in documents" :key="doc.key"> | ||||
|       <GalleryFigure :doc="doc" :index="index"> | ||||
|   <div v-if="props.documents.length || editing" class="gallery" ref="gallery"> | ||||
|     <GalleryFigure v-for="(doc, index) in documents" :key="doc.key" :doc="doc" :index="index"> | ||||
|       <BreadCrumb :path="doc.loc ? doc.loc.split('/') : []" v-if="showFolderBreadcrumb(index)" class="folder-change"/> | ||||
|     </GalleryFigure> | ||||
|     </template> | ||||
|   </div> | ||||
| </template> | ||||
|  | ||||
| <script setup lang="ts"> | ||||
| import { ref, computed, watchEffect, shallowRef, onMounted, onUnmounted } from 'vue' | ||||
| import { ref, computed, watchEffect, shallowRef, onMounted, onUnmounted, nextTick } from 'vue' | ||||
| import { useMainStore } from '@/stores/main' | ||||
| import { Doc } from '@/repositories/Document' | ||||
| import FileRenameInput from './FileRenameInput.vue' | ||||
| @@ -51,6 +49,11 @@ const rename = (doc: Doc, newName: string) => { | ||||
|   } | ||||
|   doc.name = newName // We should get an update from watch but this is quicker | ||||
| } | ||||
| const gallery = ref<HTMLElement>() | ||||
| const columns = computed(() => { | ||||
|   if (!gallery.value) return 1 | ||||
|   return getComputedStyle(gallery.value).gridTemplateColumns.split(' ').length | ||||
| }) | ||||
| defineExpose({ | ||||
|   newFolder() { | ||||
|     const now = Math.floor(Date.now() / 1000) | ||||
| @@ -85,9 +88,14 @@ defineExpose({ | ||||
|     } else { | ||||
|       store.selected.add(key) | ||||
|     } | ||||
|     this.cursorMove(1) | ||||
|     this.cursorMove(1, null) | ||||
|   }, | ||||
|   cursorMove(d: number, select = false) { | ||||
|   up(ev: KeyboardEvent) { this.cursorMove(-columns.value, ev) }, | ||||
|   down(ev: KeyboardEvent) { this.cursorMove(columns.value, ev) }, | ||||
|   left(ev: KeyboardEvent) { this.cursorMove(-1, ev) }, | ||||
|   right(ev: KeyboardEvent) { this.cursorMove(1, ev) }, | ||||
|   cursorMove(d: number, ev: KeyboardEvent | null) { | ||||
|     const select = !!ev?.shiftKey | ||||
|     // Move cursor up or down (keyboard navigation) | ||||
|     const docs = props.documents | ||||
|     if (docs.length === 0) { | ||||
| @@ -98,8 +106,15 @@ defineExpose({ | ||||
|     const mod = (a: number, b: number) => ((a % b) + b) % b | ||||
|     const increment = (i: number, d: number) => mod(i + d, N + 1) | ||||
|     const index = | ||||
|       store.cursor ? docs.findIndex(doc => doc.key === store.cursor) : docs.length | ||||
|     const moveto = increment(index, d) | ||||
|       store.cursor ? docs.findIndex(doc => doc.key === store.cursor) : N | ||||
|     let moveto | ||||
|     if (index === N) moveto = d > 0 ? 0 : N - 1 | ||||
|     else { | ||||
|       moveto = increment(index, d) | ||||
|       // Wrapping either end, just land outside the list | ||||
|       if (Math.abs(d) >= N || Math.sign(d) !== Math.sign(moveto - index)) moveto = N | ||||
|     } | ||||
|     console.log("Gallery cursorMove", d, index, moveto, moveto - index) | ||||
|     store.cursor = docs[moveto]?.key ?? '' | ||||
|     const tr = store.cursor ? document.getElementById(`file-${store.cursor}`) : '' | ||||
|     if (select) { | ||||
| @@ -134,10 +149,8 @@ watchEffect(() => { | ||||
|   if (store.cursor && store.cursor !== editing.value?.key) editing.value = null | ||||
|   if (editing.value) store.cursor = editing.value.key | ||||
|   if (store.cursor) { | ||||
|     const a = document.querySelector( | ||||
|       `#file-${store.cursor} a` | ||||
|     ) as HTMLAnchorElement | null | ||||
|     if (a) a.focus() | ||||
|     const a = document.querySelector(`#file-${store.cursor}`) as HTMLAnchorElement | null | ||||
|     if (a) { a.focus(); a.scrollIntoView({ block: 'center', behavior: 'smooth' }) } | ||||
|   } | ||||
| }) | ||||
| watchEffect(() => { | ||||
|   | ||||
| @@ -1,19 +1,16 @@ | ||||
| <template> | ||||
|   <a | ||||
|     :id="`file-${doc.key}`" | ||||
|     :href="doc.url" | ||||
|     tabindex=0 | ||||
|   <a :id="`file-${doc.key}`" :href=doc.url tabindex=-1 | ||||
|     :class="{ file: !doc.dir, folder: doc.dir, cursor: store.cursor === doc.key }" | ||||
|     @contextmenu.prevent | ||||
|     @contextmenu.stop | ||||
|     @focus.stop="store.cursor = doc.key" | ||||
|     @click="ev => { | ||||
|       store.cursor = store.cursor === doc.key ? '' : doc.key | ||||
|       if (media) { media.play(); ev.preventDefault() } | ||||
|       if (m!.play()) ev.preventDefault() | ||||
|       store.cursor = doc.key | ||||
|     }" | ||||
|   > | ||||
|     <figure> | ||||
|       <slot></slot> | ||||
|       <MediaPreview ref=media :doc="doc" /> | ||||
|       <MediaPreview ref=m :doc="doc" :tabindex=-1 /> | ||||
|       <caption> | ||||
|         <label> | ||||
|           <SelectBox :doc=doc /> | ||||
| @@ -25,7 +22,7 @@ | ||||
| </template> | ||||
|  | ||||
| <script setup lang=ts> | ||||
| import { defineProps, ref } from 'vue' | ||||
| import { ref } from 'vue' | ||||
| import { useMainStore } from '@/stores/main' | ||||
| import { Doc } from '@/repositories/Document' | ||||
| import MediaPreview from '@/components/MediaPreview.vue' | ||||
| @@ -35,7 +32,7 @@ const props = defineProps<{ | ||||
|   doc: Doc | ||||
|   index: number | ||||
| }>() | ||||
| const media = ref<typeof MediaPreview | null>(null) | ||||
| const m = ref<typeof MediaPreview | null>(null) | ||||
| </script> | ||||
|  | ||||
| <style scoped> | ||||
|   | ||||
| @@ -18,11 +18,12 @@ | ||||
|         type="search" | ||||
|         :value="query" | ||||
|         @input="updateSearch" | ||||
|         placeholder="Search words" | ||||
|         placeholder="Find files" | ||||
|         class="margin-input" | ||||
|       /> | ||||
|     </template> | ||||
|     <SvgButton ref="searchButton" name="find" @click.prevent="toggleSearchInput" /> | ||||
|     <SvgButton name="eye" @click="store.prefs.gallery = !store.prefs.gallery" /> | ||||
|     <SvgButton name="cog" @click="settingsMenu" /> | ||||
|   </nav> | ||||
| </template> | ||||
| @@ -72,7 +73,6 @@ watchEffect(() => { | ||||
| const settingsMenu = (e: Event) => { | ||||
|   // show the context menu | ||||
|   const items = [] | ||||
|   items.push({ label: 'Gallery', onClick: () => store.gallery = !store.gallery }) | ||||
|   if (store.user.isLoggedIn) { | ||||
|     items.push({ label: `Logout ${store.user.username ?? ''}`, onClick: () => store.logout() }) | ||||
|   } else { | ||||
|   | ||||
| @@ -150,6 +150,6 @@ const download = async () => { | ||||
|   white-space: nowrap; | ||||
|   overflow: hidden; | ||||
|   text-overflow: ellipsis; | ||||
|   margin: 0; | ||||
| } | ||||
| </style> | ||||
| @/stores/main | ||||
|   | ||||
| @@ -1,19 +1,19 @@ | ||||
| <template> | ||||
|   <img v-if=doc.img :src=doc.url alt=""> | ||||
|   <img v-if=doc.img :src="preview() ? doc.previewurl : doc.url" alt=""> | ||||
|   <span v-else-if=doc.dir class="folder icon"></span> | ||||
|   <video v-else-if=video() ref=media :src=doc.url controls preload=metadata @click.prevent>📄</video> | ||||
|   <audio v-else-if=audio() ref=media :src=doc.url controls preload=metadata @click.stop>📄</audio> | ||||
|   <embed v-else-if=embed() :src=doc.url type=text/plain @click.stop @scroll.prevent> | ||||
|   <video ref=vid v-else-if=video() :src=doc.url controls preload=none @click.prevent>📄</video> | ||||
|   <audio ref=aud v-else-if=audio() :src=doc.url controls preload=metadata @click.stop>📄</audio> | ||||
|   <span v-else-if=archive() class="archive icon"></span> | ||||
|   <span v-else class="file icon" :class="`ext-${doc.ext}`"></span> | ||||
| </template> | ||||
|  | ||||
| <script setup lang=ts> | ||||
| import { defineProps, ref } from 'vue' | ||||
| import { compile, computed, ref } from 'vue' | ||||
| import type { Doc } from '@/repositories/Document' | ||||
|  | ||||
| const media = ref<HTMLAudioElement | HTMLVideoElement | null>(null) | ||||
|  | ||||
| const aud = ref<HTMLAudioElement | null>(null) | ||||
| const vid = ref<HTMLVideoElement | null>(null) | ||||
| const media = computed(() => aud.value || vid.value) | ||||
| const props = defineProps<{ | ||||
|   doc: Doc | ||||
| }>() | ||||
| @@ -21,16 +21,22 @@ const props = defineProps<{ | ||||
| defineExpose({ | ||||
|   play() { | ||||
|     if (media.value) { | ||||
|       media.value.play() | ||||
|     } | ||||
|       if (media.value.paused) media.value.play() | ||||
|       else media.value.pause() | ||||
|       return true | ||||
|     } | ||||
|     return false | ||||
|   }, | ||||
| }) | ||||
|  | ||||
|  | ||||
| const video = () => ['mkv', 'mp4', 'webm', 'mov', 'avi'].includes(props.doc.ext) | ||||
| const audio = () => ['mp3', 'flac', 'ogg', 'aac'].includes(props.doc.ext) | ||||
| const embed = () => ['txt', 'py', 'html', 'css', 'js', 'json', 'xml', 'csv', 'tsv'].includes(props.doc.ext) | ||||
| const archive = () => ['zip', 'tar', 'gz', 'bz2', 'xz', '7z', 'rar'].includes(props.doc.ext) | ||||
| const preview = () => ( | ||||
|   props.doc.size > 500000 && | ||||
|   ['png', 'bmp', 'ico', 'webp', 'avif', 'jpg', 'jpeg'].includes(props.doc.ext) | ||||
| ) | ||||
| </script> | ||||
|  | ||||
| <style scoped> | ||||
|   | ||||
| @@ -11,7 +11,6 @@ | ||||
| </template> | ||||
|  | ||||
| <script setup lang=ts> | ||||
| import { defineProps } from 'vue' | ||||
| import { useMainStore } from '@/stores/main' | ||||
| import type { Doc } from '@/repositories/Document' | ||||
|  | ||||
|   | ||||
| @@ -6,7 +6,7 @@ | ||||
| </template> | ||||
|  | ||||
| <script setup lang="ts"> | ||||
| import { defineAsyncComponent, defineProps } from 'vue' | ||||
| import { defineAsyncComponent } from 'vue' | ||||
|  | ||||
| const props = defineProps<{ | ||||
|   name: string | ||||
|   | ||||
| @@ -40,6 +40,9 @@ export class Doc { | ||||
|     const ext = this.name.split('.').pop()?.toLowerCase() | ||||
|     return ['jpg', 'jpeg', 'png', 'gif', 'webp', 'avif', 'svg'].includes(ext || '') | ||||
|   } | ||||
|   get previewurl(): string { | ||||
|     return this.url.replace(/^\/files/, '/preview') | ||||
|   } | ||||
|   get ext(): string { | ||||
|     const ext = this.name.split('.').pop() | ||||
|     return ext ? ext.toLowerCase() : '' | ||||
|   | ||||
| @@ -23,10 +23,10 @@ export const useMainStore = defineStore({ | ||||
|     fileExplorer: null as any, | ||||
|     error: '' as string, | ||||
|     connected: false, | ||||
|     gallery: false, | ||||
|     cursor: '' as string, | ||||
|     server: {} as Record<string, any>, | ||||
|     prefs: { | ||||
|       gallery: false, | ||||
|       sortListing: '' as SortOrder, | ||||
|       sortFiltered: '' as SortOrder, | ||||
|     }, | ||||
| @@ -79,6 +79,13 @@ export const useMainStore = defineStore({ | ||||
|       if (this.query) this.prefs.sortFiltered = this.prefs.sortFiltered === name ? '' : name | ||||
|       else this.prefs.sortListing = this.prefs.sortListing === name ? '' : name | ||||
|     }, | ||||
|     sort(name: SortOrder | '') { | ||||
|       if (this.query) this.prefs.sortFiltered = name | ||||
|       else this.prefs.sortListing = name | ||||
|     }, | ||||
|     focusBreadcrumb() { | ||||
|       (document.querySelector('.breadcrumb') as HTMLAnchorElement).focus() | ||||
|     } | ||||
|   }, | ||||
|   getters: { | ||||
|     sortOrder(): SortOrder { return this.query ? this.prefs.sortFiltered : this.prefs.sortListing }, | ||||
|   | ||||
| @@ -2,13 +2,13 @@ | ||||
|   <div v-if="!props.path || documents.length === 0" class="empty-container"> | ||||
|     <component :is="cog" class="cog"/> | ||||
|     <p v-if="!store.connected">No Connection</p> | ||||
|     <p v-else-if="store.document.length === 0">Waiting for Files</p> | ||||
|     <p v-else-if="store.document.length === 0">Waiting for File List</p> | ||||
|     <p v-else-if="store.query">No matches!</p> | ||||
|     <p v-else-if="!store.document.find(doc => doc.loc.length + 1 === props.path.length && [...doc.loc, doc.name].join('/') === props.path.join('/'))">Folder not found.</p> | ||||
|     <p v-else-if="!store.document.some(doc => (doc.loc ? `${doc.loc}/${doc.name}` : doc.name) === props.path.join('/'))">Folder not found.</p> | ||||
|     <p v-else>Empty folder</p> | ||||
|   </div> | ||||
|   <Gallery | ||||
|     v-else-if="store.gallery" | ||||
|     v-else-if="store.prefs.gallery" | ||||
|     ref="fileExplorer" | ||||
|     :key="`gallery-${Router.currentRoute.value.path}`" | ||||
|     :path="props.path" | ||||
| @@ -21,9 +21,9 @@ | ||||
|     :path="props.path" | ||||
|     :documents="documents" | ||||
|   /> | ||||
|   <div v-if="!store.gallery && documents.some(doc => doc.img)" class="suggest-gallery"> | ||||
|   <div v-if="!store.prefs.gallery && documents.some(doc => doc.img)" class="suggest-gallery"> | ||||
|     <p>Media files found. Would you like a gallery view?</p> | ||||
|     <SvgButton name="eye" taborder=0 @click="() => { store.gallery = true }">Gallery</SvgButton> | ||||
|     <SvgButton name="eye" taborder=0 @click="() => { store.prefs.gallery = true }">Gallery</SvgButton> | ||||
|   </div> | ||||
| </template> | ||||
|  | ||||
|   | ||||
| @@ -45,6 +45,7 @@ export default defineConfig({ | ||||
|       "/login": dev_backend, | ||||
|       "/logout": dev_backend, | ||||
|       "/zip": dev_backend, | ||||
|       "/preview": dev_backend, | ||||
|     } | ||||
|   }, | ||||
|   build: { | ||||
|   | ||||
| @@ -22,6 +22,7 @@ dependencies = [ | ||||
|     "msgspec", | ||||
|     "natsort", | ||||
|     "pathvalidate", | ||||
|     "pillow", | ||||
|     "pyjwt", | ||||
|     "sanic", | ||||
|     "stream-zip", | ||||
|   | ||||
		Reference in New Issue
	
	Block a user