Merge branch 'develop'

quick-symlink-extension/ru.lproj/Localizable.strings → Base.lproj/Localizable.strings

@@ -1,10 +1,10 @@
-/* 
-  Localizable.strings
-  quick-symlink
-
-  Created by Alexander A. Kropotin on 15/07/2021.
-  Copyright © 2021 Alexander A. Kropotin. All rights reserved.
-*/
+/*
+ Localizable.strings
+ quick-symlink
+ 
+ Created by Alexander A. Kropotin on 15/07/2021.
+ Copyright © 2021 Alexander A. Kropotin. All rights reserved.
+ */
 
 /* Class = "NSMenuItem"; */
 "SOFT_LINK_ACTIONS_EXTENTION_NAME" = "Действия с симлинками";
@@ -29,3 +29,4 @@
 
 /* Class = "NSMenuItem"; */
 "CREATE_LINK_ACTION_NAME" = "Создать ссылку";
+

CHANGELOG.md

@@ -10,6 +10,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 - Refactor application.
 
+## [0.9.0] - 2021-09-17
+
+### Changed
+
+- Change the extention boubdle name from `quick-symlink-extention to `symlink actions`.
+- Change the module name `quick-symlink-extention to `soft-link-actions-name`.
+
 ## [0.8.1] - 2021-09-13
 
 ### Fixed

commons/defaults/QuickSymlinkDefaults.swift

@@ -0,0 +1,49 @@
+//
+//  PathTypeDefaults.swift
+//  quick-symlink
+//
+//  Created by Alexander A. Kropotin on 17/09/2021.
+//  Copyright © 2021 Alexander A. Kropotin. All rights reserved.
+//
+
+import Foundation
+
+public struct QuickSymlinkDefaults<T> {
+    var key: String
+    var defaultValue: T
+}
+
+public extension QuickSymlinkDefaults {
+
+    func get() -> T {
+        guard let valueUntyped = UserDefaults.init(suiteName: "org.ololx.quick-symlink")?.object(forKey: self.key) else {
+            return self.defaultValue;
+        }
+
+        guard let value = valueUntyped as? T else {
+            return self.defaultValue;
+        }
+
+        return value;
+    }
+
+    func set(_ value: T) {
+        UserDefaults.init(suiteName: "org.ololx.quick-symlink")?.set(value, forKey: self.key);
+    }
+}
+
+public enum QuickSymlinkSettings {
+
+    static var relativePath: Bool {
+        get {
+            return pathTypeStrategyDefaults.get();
+
+        }
+        set {
+            pathTypeStrategyDefaults.set(newValue);
+
+        }
+    }
+
+    private static var pathTypeStrategyDefaults = QuickSymlinkDefaults(key: "relative-path-strategy", defaultValue: false);
+}

commons/link/FileLinkManager.swift

@@ -18,6 +18,15 @@ public protocol FileLinkManager {
 
 public extension FileLinkManager {
 
+    public func getDestinationPath(of: URL!, with: URL!) -> URL! {
+        var destinationPath: Path = ResourcePath.of(url: of);
+        if (QuickSymlinkDefaults(key: "relative-path-strategy", defaultValue: true).get()) {
+            destinationPath = destinationPath.relativize(to: ResourcePath.of(url: with?.deletingLastPathComponent()));
+        }
+
+        return destinationPath.toUrl();
+    }
+
     public func getTargetPath(_ from: URL!, to: URL!) -> URL! {
         let originSourceName = from.absoluteURL.deletingPathExtension().lastPathComponent;
         let fileType = from.absoluteURL.pathExtension;
@@ -46,7 +55,8 @@ public class SoftLinkManager: FileLinkManager {
 
     public func linkWith(of: URL!, with: URL!) {
         do {
-            try FileManager.default.createSymbolicLink(at: with!, withDestinationURL: ResourcePath.of(url: of).relativize(to: ResourcePath.of(url: with?.deletingLastPathComponent())).toUrl()!);
+            NSLog("asdasdasd");
+            try FileManager.default.createSymbolicLink(at: with!, withDestinationURL: self.getDestinationPath(of: of, with: with));
         } catch let error as NSError {
             NSLog("FileManager.createSymbolicLink() failed to create file: %@", error.description as NSString);
         }
@@ -56,7 +66,7 @@ public class SoftLinkManager: FileLinkManager {
         do {
             //FIXME: Add checking for existance of file & resolving this case with symply pastle link
             try FileManager.default.moveItem(at: of, to: with);
-            try FileManager.default.createSymbolicLink(at: of, withDestinationURL: ResourcePath.of(url: with).relativize(to: ResourcePath.of(url: of.deletingLastPathComponent())).toUrl()!);
+            try FileManager.default.createSymbolicLink(at: of, withDestinationURL: self.getDestinationPath(of: with, with: of));
         } catch let error as NSError {
             NSLog("FileManager.createSymbolicLink() failed to create file: %@", error.description as NSString);
         }

en-GB.lproj/Localizable.strings

@@ -0,0 +1,33 @@
+/*
+ Localizable.strings
+ quick-symlink
+
+ Created by Alexander A. Kropotin on 15/07/2021.
+ Copyright © 2021 Alexander A. Kropotin. All rights reserved.
+ */
+
+/* Class = "NSMenuItem"; */
+"SOFT_LINK_ACTIONS_EXTENTION_NAME" = "Действия с симлинками";
+
+/* Class = "NSMenuItem"; */
+"SOFT_LINK_ACTIONS_EXTENTION_TOOL_TIP" = "Создать символьные ссылки для выбранных файлов и папок";
+
+/* Class = "NSMenuItem"; */
+"HARD_LINK_ACTIONS_EXTENTION_NAME" = "Действия с псевдонимами";
+
+/* Class = "NSMenuItem"; */
+"HARD_LINK_ACTIONS_EXTENTION_TOOL_TIP" = "Создать псевдонимы для выбранных файлов и папок";
+
+/* Class = "NSMenuItem"; */
+"COPY_PATH_ACTION_NAME" = "Скопировать путь отсюда";
+
+/* Class = "NSMenuItem"; */
+"PASTE_LINK_ACTION_NAME" = "Вставить ссылку сюда";
+
+/* Class = "NSMenuItem"; */
+"REPLACE_WITH_LINK_ACTION_NAME" = "Переместить сюда и заменить ссылкой";
+
+/* Class = "NSMenuItem"; */
+"CREATE_LINK_ACTION_NAME" = "Создать ссылку";
+
+

en.lproj/Localizable.strings

@@ -0,0 +1,33 @@
+/*
+ Localizable.strings
+ quick-symlink
+
+ Created by Alexander A. Kropotin on 15/07/2021.
+ Copyright © 2021 Alexander A. Kropotin. All rights reserved.
+ */
+
+/* Class = "NSMenuItem"; */
+"SOFT_LINK_ACTIONS_EXTENTION_NAME" = "Действия с симлинками";
+
+/* Class = "NSMenuItem"; */
+"SOFT_LINK_ACTIONS_EXTENTION_TOOL_TIP" = "Создать символьные ссылки для выбранных файлов и папок";
+
+/* Class = "NSMenuItem"; */
+"HARD_LINK_ACTIONS_EXTENTION_NAME" = "Действия с псевдонимами";
+
+/* Class = "NSMenuItem"; */
+"HARD_LINK_ACTIONS_EXTENTION_TOOL_TIP" = "Создать псевдонимы для выбранных файлов и папок";
+
+/* Class = "NSMenuItem"; */
+"COPY_PATH_ACTION_NAME" = "Скопировать путь отсюда";
+
+/* Class = "NSMenuItem"; */
+"PASTE_LINK_ACTION_NAME" = "Вставить ссылку сюда";
+
+/* Class = "NSMenuItem"; */
+"REPLACE_WITH_LINK_ACTION_NAME" = "Переместить сюда и заменить ссылкой";
+
+/* Class = "NSMenuItem"; */
+"CREATE_LINK_ACTION_NAME" = "Создать ссылку";
+
+

quick-symlink-extension/Info.plist → hard-link-actions-extension/Info.plist

@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>quick-symlink-extension</string>
+	<string>hard link actions</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>