Skip to content
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

fix symlinks #89

Merged
merged 2 commits into from
Jan 29, 2024
+4 −4
Merged

fix symlinks #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dffdaa4
fix symlinks
vahtos Jan 26, 2024
6a9f951
utils.rmdir() use fs.rm(), works with symlinks. Req node 14.14.0
vahtos Jan 26, 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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"preferGlobal": true,
"private": true,
"engines": {
"node": ">= 12.10.0"
"node": ">= 14.14.0"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Happy to raise this, but we'll need to do a major version update, i'll add that in

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense. Do you think you'd do a major version update with the three PRs I submitted today? I was planning to use Droppy for a hobby project, which is why I was testing and fixing things. Just trying to gauge if I should do a temporary workaround in my other project or not. Thanks!

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can sort it out quickly I'm just a bit busy with work lately :) I'll look more in depth soon

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem, not trying to rush you. Not sure if this is the best place for this conversation, but some thoughts:

I'm not sure what my availability will be in the near future, but just so we aren't overlapping on work here, I was going to focus on more bug fixes before considering working on new features. For bug fixes, I was thinking these three would be next: #92, #74 and #18. As for features, the most impactful one (in my opinion) is #16, so I might switch to that at some point.

Longer term I might look into adding more testing to support a UI or framework overhaul. Some clearer documentation for contributing/dev might be nice too, there seems to be some strewn about tooling that isn't necessarily used and old documentation from the legacy project? I saw that some things were kept for reference, and potentially to be fixed (like docker builds, which I am happy to do at some point). It might be worth considering taking a "snapshot" of that with a branch for reference, then dump any dead code/docs.

},
"scripts": {
"build": "DROPPY_CACHE_PATH=$PWD/packages/cli/dist/cache.json lerna run --stream build --",
Expand Down
4 changes: 2 additions & 2 deletions packages/server/lib/services/filetree.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,13 @@ filetree.updateDir = async function(dir) {
if (initial) { // sync walk for performance
initial = false;
try {
entries = rrdir.sync(fullDir, {stats: true, exclude: cfg.ignorePatterns});
entries = rrdir.sync(fullDir, {stats: true, exclude: cfg.ignorePatterns, followSymlinks: true});
} catch (err) {
log.error(err);
}
} else {
try {
entries = await rrdir.async(fullDir, {stats: true, exclude: cfg.ignorePatterns});
entries = await rrdir.async(fullDir, {stats: true, exclude: cfg.ignorePatterns, followSymlinks: true});
} catch (err) {
log.error(err);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/server/lib/services/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ utils.rm = function(p, cb) {
};

utils.rmdir = function(p, cb) {
fs.rmdir(p, {recursive: true}, cb);
fs.rm(p, {recursive: true}, cb);
};

utils.move = function(src, dst, cb) {
Expand Down
Loading