From 605a7e04f8c7c3d5ed9accd6b8647474db6bda18 Mon Sep 17 00:00:00 2001 From: Stef Coenen Date: Tue, 10 Sep 2024 14:39:17 +0200 Subject: [PATCH] Added drives equals (#259) * Added drivesEqual; * Rename image resize method; * Fix ref; * Fixes after linting; --- .../src/providers/CommunityDefinitionProvider.ts | 1 - packages/feed-app/src/hooks/useLiveFeedProcessor.ts | 2 +- .../js-lib/src/core/WebsocketData/WebsocketProvider.ts | 8 +------- packages/js-lib/src/helpers/DataUtil.ts | 8 ++++++-- packages/js-lib/src/media/Video/VideoSegmenterFfmpeg.tsx | 2 +- .../src/components/Drives/FileBrowser/FileCard.tsx | 2 +- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/packages/community-app/src/providers/CommunityDefinitionProvider.ts b/packages/community-app/src/providers/CommunityDefinitionProvider.ts index 07920a276..e458c7918 100644 --- a/packages/community-app/src/providers/CommunityDefinitionProvider.ts +++ b/packages/community-app/src/providers/CommunityDefinitionProvider.ts @@ -28,7 +28,6 @@ import { getNewId, getRandom16ByteArray, jsonStringify64, - stringGuidsEqual, stringToUint8Array, } from '@homebase-id/js-lib/helpers'; diff --git a/packages/feed-app/src/hooks/useLiveFeedProcessor.ts b/packages/feed-app/src/hooks/useLiveFeedProcessor.ts index 439133b71..8de60a405 100644 --- a/packages/feed-app/src/hooks/useLiveFeedProcessor.ts +++ b/packages/feed-app/src/hooks/useLiveFeedProcessor.ts @@ -2,7 +2,7 @@ import { useCallback } from 'react'; import { useQuery, useQueryClient } from '@tanstack/react-query'; import { TypedConnectionNotification } from '@homebase-id/js-lib/core'; -import { drivesEqual, stringGuidsEqual } from '@homebase-id/js-lib/helpers'; +import { drivesEqual } from '@homebase-id/js-lib/helpers'; import { useWebsocketSubscriber } from '@homebase-id/common-app'; import { BlogConfig } from '@homebase-id/js-lib/public'; import { processInbox } from '@homebase-id/js-lib/peer'; diff --git a/packages/js-lib/src/core/WebsocketData/WebsocketProvider.ts b/packages/js-lib/src/core/WebsocketData/WebsocketProvider.ts index c18e4e43c..8b37dc31f 100644 --- a/packages/js-lib/src/core/WebsocketData/WebsocketProvider.ts +++ b/packages/js-lib/src/core/WebsocketData/WebsocketProvider.ts @@ -1,10 +1,4 @@ -import { - hasDebugFlag, - jsonStringify64, - tryJsonParse, - stringGuidsEqual, - drivesEqual, -} from '../../helpers/helpers'; +import { hasDebugFlag, jsonStringify64, tryJsonParse, drivesEqual } from '../../helpers/helpers'; import { ApiType, DotYouClient } from '../DotYouClient'; import { decryptData, encryptData, getRandomIv } from '../InterceptionEncryptionUtil'; import { TargetDrive } from '../core'; diff --git a/packages/js-lib/src/helpers/DataUtil.ts b/packages/js-lib/src/helpers/DataUtil.ts index 229dce084..6b10229db 100644 --- a/packages/js-lib/src/helpers/DataUtil.ts +++ b/packages/js-lib/src/helpers/DataUtil.ts @@ -1,8 +1,12 @@ import { Guid } from 'guid-typescript'; import md5 from './md5/md5'; -import { AccessControlList, EncryptedKeyHeader, PayloadDescriptor } from '../core/core'; -import { TargetDrive } from '../../dist/core/DriveData/File/DriveFileTypes'; +import { + AccessControlList, + EncryptedKeyHeader, + PayloadDescriptor, + TargetDrive, +} from '../core/core'; const OdinBlob: typeof Blob = (typeof window !== 'undefined' && 'CustomBlob' in window && (window.CustomBlob as typeof Blob)) || Blob; diff --git a/packages/js-lib/src/media/Video/VideoSegmenterFfmpeg.tsx b/packages/js-lib/src/media/Video/VideoSegmenterFfmpeg.tsx index 8e6843426..bacd2712e 100644 --- a/packages/js-lib/src/media/Video/VideoSegmenterFfmpeg.tsx +++ b/packages/js-lib/src/media/Video/VideoSegmenterFfmpeg.tsx @@ -68,7 +68,7 @@ const toHexString = (byteArray: Uint8Array) => { }).join(''); }; -const MB = 1000000; +// const MB = 1000000; export const segmentVideoFileWithFfmpeg = async ( file: File | Blob, keyHeader?: KeyHeader diff --git a/packages/owner-app/src/components/Drives/FileBrowser/FileCard.tsx b/packages/owner-app/src/components/Drives/FileBrowser/FileCard.tsx index a60d0bee3..9251d9262 100644 --- a/packages/owner-app/src/components/Drives/FileBrowser/FileCard.tsx +++ b/packages/owner-app/src/components/Drives/FileBrowser/FileCard.tsx @@ -26,7 +26,7 @@ import { ContactConfig } from '@homebase-id/js-lib/network'; import { formatDateExludingYearIfCurrent } from '@homebase-id/common-app'; import { useFile } from '../../../hooks/files/useFiles'; import { useAuth } from '../../../hooks/auth/useAuth'; -import { drivesEqual, stringGuidsEqual } from '@homebase-id/js-lib/helpers'; +import { drivesEqual } from '@homebase-id/js-lib/helpers'; export const FileCard = ({ targetDrive,