Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add support for symbolic links #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sandakan merged 3 commits into from
Jun 7, 2024
Merged

Add support for symbolic links #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a8ca83
add support for symbolic links
Brunight Jun 3, 2024
3b9a878
fix misstype
Brunight Jun 6, 2024
6bc7e74
add try catch block so the function doesn't throw with broken symlinks
Brunight Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/filesystem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
import { encrypt } from './utils/safeStorage';
import { LastFMSessionData } from '../@types/last_fm_api';
import { DEFAULT_SONG_PALETTE } from './other/generatePalette';
import isPathADir from './utils/isPathADir';

export const DEFAULT_ARTWORK_SAVE_LOCATION = path.join(app.getPath('userData'), 'song_covers');
export const DEFAULT_FILE_URL = 'nora://localfiles/';
Expand Down Expand Up @@ -569,7 +570,7 @@ function flattenPathArrays<Type extends string[][]>(lists: Type) {
export const getDirectories = async (srcpath: string) => {
try {
const dirs = await fs.readdir(srcpath, { withFileTypes: true });
const filteredDirs = dirs.filter((dir) => dir.isDirectory());
const filteredDirs = dirs.filter((dir) => isPathADir(dir));
const dirsWithFullPaths = filteredDirs.map((dir) => path.join(srcpath, dir.name));

return dirsWithFullPaths;
Expand Down
3 changes: 2 additions & 1 deletion src/main/utils/copyDir.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import fs from 'fs/promises';

import log from '../log';
import makeDir from './makeDir';
import isPathADir from './isPathADir';

async function copyDir(src: string, dest: string) {
try {
Expand All @@ -16,7 +17,7 @@ async function copyDir(src: string, dest: string) {
const srcPath = path.join(src, entry.name);
const destPath = path.join(dest, entry.name);

if (entry.isDirectory()) await copyDir(srcPath, destPath);
if (isPathADir(entry)) await copyDir(srcPath, destPath);
else await fs.copyFile(srcPath, destPath);
}
} catch (error) {
Expand Down
3 changes: 2 additions & 1 deletion src/main/utils/getDirSize.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import fs from 'fs/promises';
import path from 'path';
import { isAnErrorWithCode } from './isAnErrorWithCode';
import isPathADir from './isPathADir';

const getDirSize = async (dir: string) => {
try {
Expand All @@ -10,7 +11,7 @@ const getDirSize = async (dir: string) => {
try {
const filepath = path.join(dir, file.name);

if (file.isDirectory()) return getDirSize(filepath);
if (isPathADir(file)) return getDirSize(filepath);
if (file.isFile()) {
const { size } = await fs.stat(filepath);
return size;
Expand Down
35 changes: 35 additions & 0 deletions src/main/utils/isPathADir.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import path from 'path';
import fs, { Dirent } from 'fs';

const isPathADir = (pathOrDir: string | Dirent) => {
try {
if (typeof pathOrDir === 'string') {
const stat = fs.statSync(pathOrDir);

if (stat.isDirectory()) return true;

if (!stat.isSymbolicLink()) return false;

const symlinkTarget = fs.readlinkSync(pathOrDir);

const symlinkStat = fs.statSync(symlinkTarget);

return symlinkStat.isDirectory();
}

if (pathOrDir.isDirectory()) return true;

if (!pathOrDir.isSymbolicLink()) return false;

const symlinkPath = path.join(pathOrDir.path, pathOrDir.name);

const symlinkStat = fs.statSync(symlinkPath);

return symlinkStat.isDirectory();
} catch {
return false;
}
};

export default isPathADir;