Merge FilesystemAPI and FilesystemUtil to avoid circular dependencies

This commit is contained in:
2024-08-30 16:17:48 +02:00
parent 2c0d7d81ac
commit ef8023c40f
27 changed files with 297 additions and 254 deletions

View File

@@ -1,8 +1,8 @@
<script>
import { onMount } from 'svelte'
import { fs_encode_path, fs_node_icon, fs_path_url } from '../FilesystemUtil';
import FileTitle from '../../file_viewer/viewers/FileTitle.svelte';
import TextBlock from '../../file_viewer/viewers/TextBlock.svelte';
import { fs_path_url, fs_encode_path, fs_node_icon } from "./../FilesystemAPI"
import FileTitle from './../../file_viewer/viewers/FileTitle.svelte';
import TextBlock from './../../file_viewer/viewers/TextBlock.svelte';
export let nav
let player

View File

@@ -1,7 +1,7 @@
<script>
import { createEventDispatcher } from "svelte";
import IconBlock from "../../file_viewer/viewers/IconBlock.svelte";
import { fs_thumbnail_url } from "../FilesystemUtil";
import { fs_thumbnail_url } from "../FilesystemAPI";
import TextBlock from "../../file_viewer/viewers/TextBlock.svelte";
let dispatch = createEventDispatcher()

View File

@@ -1,7 +1,7 @@
<script>
import { onMount, tick } from "svelte";
import Spinner from "../../util/Spinner.svelte";
import { fs_node_type } from "../FilesystemUtil";
import { fs_node_type } from "./../FilesystemAPI";
import FileManager from "../filemanager/FileManager.svelte";
import Audio from "./Audio.svelte";
import File from "./File.svelte";

View File

@@ -1,14 +1,14 @@
<script>
import { createEventDispatcher } from "svelte";
import { swipe_nav } from "../../file_viewer/viewers/SwipeNavigate.ts";
import { fs_path_url } from "../FilesystemUtil";
import { swipe_nav } from "./../../file_viewer/viewers/SwipeNavigate";
import { fs_path_url } from "./../FilesystemAPI";
let dispatch = createEventDispatcher()
let dispatch = createEventDispatcher();
export let nav
let container
let zoom = false
let x, y = 0
let x = 0, y = 0
let dragging = false
export const update = () => {
@@ -65,7 +65,6 @@ const mouseup = (e) => {
<!-- svelte-ignore a11y-no-noninteractive-element-interactions -->
<img
on:dblclick={() => {zoom = !zoom}}
on:doubletap={() => {zoom = !zoom}}
on:mousedown={mousedown}
on:load={on_load}
on:error={on_load}

View File

@@ -1,5 +1,5 @@
<script>
import { fs_path_url } from "../FilesystemUtil";
import { fs_path_url } from "../FilesystemAPI";
export let nav
</script>

View File

@@ -1,6 +1,6 @@
<script>
import { tick } from "svelte";
import { fs_path_url } from "../FilesystemUtil";
import { fs_path_url } from "../FilesystemAPI";
export let nav
let text_type = "text"

View File

@@ -5,7 +5,7 @@ import { formatDate } from "../../util/Formatting.svelte"
import TorrentItem from "./TorrentItem.svelte"
import IconBlock from "../../file_viewer/viewers/IconBlock.svelte";
import TextBlock from "../../file_viewer/viewers/TextBlock.svelte";
import { fs_node_icon, fs_path_url } from "../FilesystemUtil";
import { fs_node_icon, fs_path_url } from "../FilesystemAPI";
import CopyButton from "../../layout/CopyButton.svelte";
let dispatch = createEventDispatcher()

View File

@@ -1,6 +1,6 @@
<script>
import { onMount, createEventDispatcher, tick } from "svelte";
import { fs_path_url } from "../FilesystemUtil";
import { fs_path_url } from "../FilesystemAPI";
let dispatch = createEventDispatcher()
export let nav

View File

@@ -4,7 +4,7 @@ import { formatDataVolume, formatDate } from "../../util/Formatting.svelte"
import ZipItem from "../../file_viewer/viewers/ZipItem.svelte";
import IconBlock from "../../file_viewer/viewers/IconBlock.svelte";
import TextBlock from "../../file_viewer/viewers/TextBlock.svelte";
import { fs_node_icon, fs_path_url } from "../FilesystemUtil";
import { fs_node_icon, fs_path_url } from "../FilesystemAPI";
let dispatch = createEventDispatcher()