Merge pull request #13 from ololx/develop

Bug fixes and some changes items
ololx · Oct 10, 2021 · 37bdcfb · 37bdcfb
2 parents d0ca8a8 + 4eec07e
commit 37bdcfb
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 - Refactor application.
 
+## [0.10.4] - 2021-10-10
+
+### Fixed
+
+- Fix  incorrect link location after creation.
+
 ## [0.10.3] - 2021-10-07
 
 ### Added

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 The Quick Symlink is a `Finder extension`  which provides a `contextual menu item` for the symbolic links creation on macOS. 
 
-[![status](https://img.shields.io/badge/status-active-active?style=flat-square)](BADGES_GUIDE.md#status) [![version](https://img.shields.io/badge/version-0.10.3-informational?style=flat-square)](BADGES_GUIDE.md#version) [![oss lifecycle](https://img.shields.io/badge/oss_lifecycle-active-important?style=flat-square)](BADGES_GUIDE.md#oss-lifecycle) [![maintenance](https://img.shields.io/badge/maintenance-yes-informational?style=flat-square)](BADGES_GUIDE.md#maintenance) [![last release](https://img.shields.io/badge/last_release-October_05,_2021-informational?style=flat-square)](BADGES_GUIDE.md#release-date) [![last commit](https://img.shields.io/badge/last_commit-October_07,_2021-informational?style=flat-square)](BADGES_GUIDE.md#commit-date)
+[![status](https://img.shields.io/badge/status-active-active?style=flat-square)](BADGES_GUIDE.md#status) [![version](https://img.shields.io/badge/version-0.10.4-informational?style=flat-square)](BADGES_GUIDE.md#version) [![oss lifecycle](https://img.shields.io/badge/oss_lifecycle-active-important?style=flat-square)](BADGES_GUIDE.md#oss-lifecycle) [![maintenance](https://img.shields.io/badge/maintenance-yes-informational?style=flat-square)](BADGES_GUIDE.md#maintenance) [![last release](https://img.shields.io/badge/last_release-October_10,_2021-informational?style=flat-square)](BADGES_GUIDE.md#release-date) [![last commit](https://img.shields.io/badge/last_commit-October_10,_2021-informational?style=flat-square)](BADGES_GUIDE.md#commit-date)
 
 [![license](https://img.shields.io/badge/license-MIT-informational?style=flat-square)](LICENSE) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg?style=flat-square)](CODE_OF_CONDUCT.md)
 

diff --git a/commons/link/action/CopyPathAction.swift b/commons/link/action/CopyPathAction.swift
@@ -35,6 +35,7 @@ public class CopyPathAction: QuickSymlinkAction {
             paths.append(contentsOf: path.relativePath);
             paths.append(";");
         }
+
         if (!paths.isEmpty) {
             paths.removeLast();
         }

diff --git a/commons/link/action/CreateLinkAction.swift b/commons/link/action/CreateLinkAction.swift
@@ -22,20 +22,18 @@ public class CreateLinkAction: QuickSymlinkAction {
 
     public func execute() {
         //Get all selected path
-        guard let target = self.finderController.selectedItemURLs() else {
+        guard var target = self.finderController.selectedItemURLs() else {
             NSLog("FinderSync() failed to obtain targeted URLs: %@");
 
             return;
         }
 
-        for path in target {
-            let targetPath = self.fileLinkManager.getTargetPath(path, to: path.deletingLastPathComponent());
-            self.fileLinkManager.linkWith(of: path, with: targetPath);
+        if (target.isEmpty) {
+            target.append(self.finderController.targetedURL()!);
         }
 
-        if (target.isEmpty) {
-            let path = self.finderController.targetedURL()!;
-            let targetPath = self.fileLinkManager.getTargetPath(path, to: path);
+        for path in target {
+            let targetPath = self.fileLinkManager.getTargetPath(path, to: path == self.finderController.targetedURL()! ? path :  path.deletingLastPathComponent());
             self.fileLinkManager.linkWith(of: path, with: targetPath);
         }
     }

diff --git a/hard-link-actions-extension/FinderSync.swift b/hard-link-actions-extension/FinderSync.swift
@@ -26,7 +26,7 @@ class FinderSync: FIFinderSync {
         let finderSync = FIFinderSyncController.default();
 
         // Shared group preferences required
-        _ = UserDefaults.init(suiteName: "org.ololx.quick-symlink")
+        //_ = UserDefaults.init(suiteName: "org.ololx.QuickSymlink")
 
         if let mountedVolumes = FileManager.default.mountedVolumeURLs(includingResourceValuesForKeys: nil,
                                                                       options: .skipHiddenVolumes) {

diff --git a/soft-link-actions-extension/FinderSync.swift b/soft-link-actions-extension/FinderSync.swift
@@ -27,7 +27,7 @@ class FinderSync: FIFinderSync {
         let finderSync = FIFinderSyncController.default();
 
         // Shared group preferences required
-        _ = UserDefaults.init(suiteName: "org.ololx.quick-symlink")
+        //_ = UserDefaults.init(suiteName: "org.ololx.QuickSymlink")
 
         if let mountedVolumes = FileManager.default.mountedVolumeURLs(includingResourceValuesForKeys: nil,
                                                                       options: .skipHiddenVolumes) {