diff --git a/Maria Widget/Info.plist b/Maria Widget/Info.plist index b36eb5e..9b8612c 100644 --- a/Maria Widget/Info.plist +++ b/Maria Widget/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.1.3 + 1.2 CFBundleVersion - 1610174 + 1611016 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSExtension diff --git a/Maria/Aria.swift b/Maria/Aria.swift index e2deb7e..87aafd4 100644 --- a/Maria/Aria.swift +++ b/Maria/Aria.swift @@ -16,8 +16,8 @@ class Aria { static let shared = Aria() private init() { - initRPC() initCore() + initRPC() } private func initRPC() { @@ -38,16 +38,15 @@ class Aria { if !FileManager.default.fileExists(atPath: session) { FileManager.default.createFile(atPath: session, contents: nil, attributes: nil) } - defaults.set("6789", forKey: "RPCServerPort") - defaults.set("maria.rpc.2016", forKey: "RPCServerSecret") + MariaUserDefault.initBuiltIn() defaults.set(conf, forKey: "Aria2ConfPath") } catch { print(error) } } - if let path = Bundle.main.path(forResource: "aria2", ofType: "conf") { - let config = AriaConfig(filePath: path) + if Bundle.main.load() { + let config = AriaConfig(filePath: conf) config.load() config.data.append(("dir", "\(NSHomeDirectory())/Downloads")) config.data.append(("input-file", "\(Bundle.main.resourcePath!)/aria2.session")) diff --git a/Maria/Info.plist b/Maria/Info.plist index 21cfe25..90c3ebb 100644 --- a/Maria/Info.plist +++ b/Maria/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.1.3 + 1.2 CFBundleSignature ???? CFBundleVersion - 1610174 + 1611016 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/README.md b/README.md index 88e809b..3de3d7d 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,13 @@ An OS X app/widget for aria2 download tool. -You can see Maria dev plan [here](https://github.com/ShinCurry/Maria/projects/1). +You can see dev plan [here](https://github.com/ShinCurry/Maria/projects/1). + +More details in [Wiki](https://github.com/ShinCurry/Maria/wiki). #### Main Window -![Maria App](https://obhajdt0c.qnssl.com/Maria/App-2.png) +![Maria App](https://obhajdt0c.qnssl.com/Maria/App-3.png) #### Today Widget @@ -19,15 +21,17 @@ You can see Maria dev plan [here](https://github.com/ShinCurry/Maria/projects/1) ## Features * Native App +* Aria2 Integrated * System Notification Support * Today Widget Support +* Touch Bar Support ## Test Environment -* Xcode 8 (8A218a) +* Xcode 8.1 (8B62) * Swift 3 -* macOS Sierra (16A319) +* macOS Sierra 10.12.1 (16B2657) * CocoaPods 1.1.0.beta.2 ## Thanks @@ -38,8 +42,8 @@ You can see Maria dev plan [here](https://github.com/ShinCurry/Maria/projects/1) #### Special Thanks -* @BlueCocoa -* @Lencerf +* [@BlueCocoa](https://github.com/BlueCocoa) +* [@Lencerf](https://github.com/Lencerf) ## License