Skip to content
This repository was archived by the owner on Apr 13, 2023. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: shincurry/Maria
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.2.2beta3
Choose a base ref
...
head repository: shincurry/Maria
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: you-get
Choose a head ref
  • 6 commits
  • 63 files changed
  • 1 contributor

Commits on Dec 13, 2016

  1. NSTouchBar is only available on OS X 10.12.2 or newer.

    @shincurry
    shincurry committed Dec 13, 2016
    Copy the full SHA
    85a524d View commit details

  2. A little improvement 

    - Try to connect to aria2 automatically.
- App launch with Normal Mode or StatusBar Mode.
- Change quick settings button icon.
- Change low speed mode button icon.
    @shincurry
    shincurry committed Dec 13, 2016
    Copy the full SHA
    3a98400 View commit details

Commits on Dec 15, 2016

  1. Enhancement 

    - Add YouGet turn on/off button.
- Change aria2rpc add(uris: [String]) implement.
- URL regex add IP pattern.
- message box change NSTextField to NSTextView.
    @shincurry
    shincurry committed Dec 15, 2016
    Copy the full SHA
    57972ef View commit details

  2. Merge branch 'you-get'

    @shincurry
    shincurry committed Dec 15, 2016
    Copy the full SHA
    17e744f View commit details

Commits on Dec 16, 2016

  1. Aria2RPC framework enhancement 

    - change name to Aria2RPC.
- api method re-implement.
    @shincurry
    shincurry committed Dec 16, 2016
    Copy the full SHA
    487fdd2 View commit details

  2. Today Widget auto reconnect to aria2

    @shincurry
    shincurry committed Dec 16, 2016
    Copy the full SHA
    aa094b7 View commit details
Showing with 1,044 additions and 792 deletions.
  1. +1 −1 Aria2Core.xcodeproj/project.pbxproj
  2. +2 −0 Aria2Core/Aria2Core.h
  3. +4 −4 Aria2Core/Aria2Core.mm
  4. +67 −58 {Aria2.xcodeproj → Aria2RPC.xcodeproj}/project.pbxproj
  5. 0 {Aria2 → Aria2RPC}/Aria2.h
  6. 0 {Aria2 → Aria2RPC}/Aria2GlobalStatus.swift
  7. +2 −1 {Aria2 → Aria2RPC}/Aria2Method.swift
  8. +128 −91 Aria2/Aria2.swift → Aria2RPC/Aria2RPC.swift
  9. 0 {Aria2 → Aria2RPC}/Aria2Speed.swift
  10. 0 {Aria2 → Aria2RPC}/Aria2Task.swift
  11. 0 {Aria2 → Aria2RPC}/Info.plist
  12. +4 −3 Maria Widget/Base.lproj/TodayViewController.xib
  13. +3 −3 Maria Widget/Maria.swift
  14. +1 −1 Maria Widget/TodayTaskCellView.swift
  15. +34 −13 Maria Widget/TodayViewController.swift
  16. +10 −8 Maria.xcodeproj/project.pbxproj
  17. +2 −5 Maria.xcworkspace/contents.xcworkspacedata
  18. +44 −40 Maria/AppDelegate.swift
  19. +12 −0 Maria/Assets.xcassets/Speedmeter.imageset/Contents.json
  20. BIN Maria/Assets.xcassets/Speedmeter.imageset/Speedmeter.pdf
  21. BIN Maria/Assets.xcassets/TortoiseColorful.imageset/TortoiseColorful.pdf
  22. BIN Maria/Assets.xcassets/TortoiseGray.imageset/TortoiseGray.pdf
  23. +15 −0 Maria/Assets.xcassets/YouGetIcon.imageset/Contents.json
  24. BIN Maria/Assets.xcassets/YouGetIcon.imageset/YouGet.pdf
  25. +2 −1 Maria/Base.lproj/Localizable.strings
  26. +84 −42 Maria/Base.lproj/Main.storyboard
  27. +4 −6 Maria/Base.lproj/Settings.storyboard
  28. +0 −2 Maria/Info.plist
  29. +11 −11 Maria/MainWindowController.swift
  30. +39 −10 Maria/Maria.swift
  31. +3 −3 Maria/MariaUserDefault.swift
  32. +78 −42 Maria/NewTaskViewController.swift
  33. +2 −2 Maria/QuickSettingsViewController.swift
  34. +2 −2 Maria/SettingsBandwidthViewController.swift
  35. +4 −4 Maria/SettingsGeneralViewController.swift
  36. +6 −6 Maria/TaskCellView.swift
  37. +56 −17 Maria/TaskListViewController.swift
  38. +3 −1 Maria/zh-Hans.lproj/Localizable.strings
  39. +2 −2 Maria/zh-Hans.lproj/Main.strings
  40. +2 −2 Maria/zh-Hans.lproj/Settings.strings
  41. +2 −1 Maria/zh-Hant.lproj/Localizable.strings
  42. +2 −2 Maria/zh-Hant.lproj/Main.strings
  43. +2 −2 Maria/zh-Hant.lproj/Settings.strings
  44. +2 −2 Podfile
  45. +1 −1 Podfile.lock
  46. +1 −1 Pods/Manifest.lock
  47. +384 −384 Pods/Pods.xcodeproj/project.pbxproj
  48. +0 −5 Pods/Target Support Files/Pods-Aria2/Pods-Aria2-dummy.m
  49. +0 −6 Pods/Target Support Files/Pods-Aria2/Pods-Aria2.modulemap
  50. 0 Pods/Target Support Files/{Pods-Aria2 → Pods-Aria2RPC}/Info.plist
  51. 0 ...ia2/Pods-Aria2-acknowledgements.markdown → Pods-Aria2RPC/Pods-Aria2RPC-acknowledgements.markdown}
  52. 0 ...ods-Aria2/Pods-Aria2-acknowledgements.plist → Pods-Aria2RPC/Pods-Aria2RPC-acknowledgements.plist}
  53. +5 −0 Pods/Target Support Files/Pods-Aria2RPC/Pods-Aria2RPC-dummy.m
  54. 0 ...get Support Files/{Pods-Aria2/Pods-Aria2-resources.sh → Pods-Aria2RPC/Pods-Aria2RPC-resources.sh}
  55. +2 −2 .../Target Support Files/{Pods-Aria2/Pods-Aria2-umbrella.h → Pods-Aria2RPC/Pods-Aria2RPC-umbrella.h}
  56. 0 ...Support Files/{Pods-Aria2/Pods-Aria2.debug.xcconfig → Pods-Aria2RPC/Pods-Aria2RPC.debug.xcconfig}
  57. +6 −0 Pods/Target Support Files/Pods-Aria2RPC/Pods-Aria2RPC.modulemap
  58. 0 ...ort Files/{Pods-Aria2/Pods-Aria2.release.xcconfig → Pods-Aria2RPC/Pods-Aria2RPC.release.xcconfig}
  59. +1 −1 Pods/Target Support Files/Pods-Maria/Pods-Maria.debug.xcconfig
  60. +1 −1 Pods/Target Support Files/Pods-Maria/Pods-Maria.release.xcconfig
  61. +3 −2 README.md
  62. +4 −1 YouGet.xcodeproj/project.pbxproj
  63. +1 −0 YouGet/YouGet.swift
2 changes: 1 addition & 1 deletion Aria2Core.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
@@ -160,7 +160,7 @@
88DAEE731D912A8900FF6E35 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0810;
LastUpgradeCheck = 0820;
ORGANIZATIONNAME = ShinCurry;
TargetAttributes = {
88DAEE7B1D912A8900FF6E35 = {
2 changes: 2 additions & 0 deletions Aria2Core/Aria2Core.h
View file
Original file line number Diff line number Diff line change
@@ -45,6 +45,8 @@ typedef enum {

- (instancetype)initWithOptions: (NSDictionary *)options;

- (void)stop;

#pragma mark - Aria2Core Interface

- (ACGid *)addUri: (ACUris *)uris
8 changes: 4 additions & 4 deletions Aria2Core/Aria2Core.mm
View file
Original file line number Diff line number Diff line change
@@ -63,18 +63,18 @@ - (instancetype)initWithOptions: (ACKeyVals *)options {
return self;
}

- (void)dealloc {
- (void)stop {
Gids tasks = aria2::getActiveDownload(session);
for (auto it = tasks.begin(); it != tasks.end(); ++it) {
aria2::pauseDownload(session, *it);
}
while (aria2::getGlobalStat(session).numActive > 0) {
std::this_thread::sleep_for(std::chrono::duration<double, std::milli>(100));
}
aria2::shutdown(session);
dispatch_sync(aria2Queue, ^{
aria2::sessionFinal(session);
dispatch_async(aria2Queue, ^{
aria2::shutdown(session);
});
aria2::sessionFinal(session);
aria2::libraryDeinit();
}

125 changes: 67 additions & 58 deletions Aria2.xcodeproj/project.pbxproj → Aria2RPC.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
@@ -7,35 +7,35 @@
objects = {

/* Begin PBXBuildFile section */
156783852650DAE5D696EC40 /* Pods_Aria2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDA08EBD2CDAA86158160FF1 /* Pods_Aria2.framework */; };
887AE45A1CC0CE7700AAD3E3 /* Aria2Method.swift in Sources */ = {isa = PBXBuildFile; fileRef = 887AE4591CC0CE7700AAD3E3 /* Aria2Method.swift */; };
8897835B1CBE105400C12387 /* Aria2.h in Headers */ = {isa = PBXBuildFile; fileRef = 8897835A1CBE105400C12387 /* Aria2.h */; settings = {ATTRIBUTES = (Public, ); }; };
889783691CBE105C00C12387 /* Aria2.swift in Sources */ = {isa = PBXBuildFile; fileRef = 889783681CBE105C00C12387 /* Aria2.swift */; };
88D6CDCE1CE44B9200450E0C /* Aria2Task.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88D6CDCD1CE44B9200450E0C /* Aria2Task.swift */; };
88D6CDD01CE479E900450E0C /* Aria2GlobalStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88D6CDCF1CE479E900450E0C /* Aria2GlobalStatus.swift */; };
88D6CDD21CE47A1B00450E0C /* Aria2Speed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88D6CDD11CE47A1B00450E0C /* Aria2Speed.swift */; };
0111B7A9D16B3D88FCF28B78 /* Pods_Aria2RPC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55378921CC48E8E389847503 /* Pods_Aria2RPC.framework */; };
8860B6AD1E02AE0A001B5E8C /* Aria2.h in Headers */ = {isa = PBXBuildFile; fileRef = 8860B6A71E02AE0A001B5E8C /* Aria2.h */; };
8860B6AE1E02AE0A001B5E8C /* Aria2GlobalStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8860B6A81E02AE0A001B5E8C /* Aria2GlobalStatus.swift */; };
8860B6AF1E02AE0A001B5E8C /* Aria2Method.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8860B6A91E02AE0A001B5E8C /* Aria2Method.swift */; };
8860B6B01E02AE0A001B5E8C /* Aria2RPC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8860B6AA1E02AE0A001B5E8C /* Aria2RPC.swift */; };
8860B6B11E02AE0A001B5E8C /* Aria2Speed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8860B6AB1E02AE0A001B5E8C /* Aria2Speed.swift */; };
8860B6B21E02AE0A001B5E8C /* Aria2Task.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8860B6AC1E02AE0A001B5E8C /* Aria2Task.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
887AE4591CC0CE7700AAD3E3 /* Aria2Method.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Aria2Method.swift; sourceTree = "<group>"; };
889783571CBE105400C12387 /* Aria2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Aria2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8897835A1CBE105400C12387 /* Aria2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Aria2.h; sourceTree = "<group>"; };
8897835C1CBE105400C12387 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
889783681CBE105C00C12387 /* Aria2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Aria2.swift; sourceTree = "<group>"; };
88D6CDCD1CE44B9200450E0C /* Aria2Task.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Aria2Task.swift; sourceTree = "<group>"; };
88D6CDCF1CE479E900450E0C /* Aria2GlobalStatus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Aria2GlobalStatus.swift; sourceTree = "<group>"; };
88D6CDD11CE47A1B00450E0C /* Aria2Speed.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Aria2Speed.swift; sourceTree = "<group>"; };
C3E763E58751C6B447F349D8 /* Pods-Aria2.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Aria2.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Aria2/Pods-Aria2.debug.xcconfig"; sourceTree = "<group>"; };
D560C11E59F7932E17B01274 /* Pods-Aria2.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Aria2.release.xcconfig"; path = "Pods/Target Support Files/Pods-Aria2/Pods-Aria2.release.xcconfig"; sourceTree = "<group>"; };
DDA08EBD2CDAA86158160FF1 /* Pods_Aria2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Aria2.framework; sourceTree = BUILT_PRODUCTS_DIR; };
55378921CC48E8E389847503 /* Pods_Aria2RPC.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Aria2RPC.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6223B11273725B9FCD5E9F92 /* Pods-Aria2RPC.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Aria2RPC.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Aria2RPC/Pods-Aria2RPC.debug.xcconfig"; sourceTree = "<group>"; };
8860B6A51E02ADED001B5E8C /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Aria2RPC/Info.plist; sourceTree = "<group>"; };
8860B6A71E02AE0A001B5E8C /* Aria2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Aria2.h; path = Aria2RPC/Aria2.h; sourceTree = SOURCE_ROOT; };
8860B6A81E02AE0A001B5E8C /* Aria2GlobalStatus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Aria2GlobalStatus.swift; path = Aria2RPC/Aria2GlobalStatus.swift; sourceTree = SOURCE_ROOT; };
8860B6A91E02AE0A001B5E8C /* Aria2Method.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Aria2Method.swift; path = Aria2RPC/Aria2Method.swift; sourceTree = SOURCE_ROOT; };
8860B6AA1E02AE0A001B5E8C /* Aria2RPC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Aria2RPC.swift; path = Aria2RPC/Aria2RPC.swift; sourceTree = SOURCE_ROOT; };
8860B6AB1E02AE0A001B5E8C /* Aria2Speed.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Aria2Speed.swift; path = Aria2RPC/Aria2Speed.swift; sourceTree = SOURCE_ROOT; };
8860B6AC1E02AE0A001B5E8C /* Aria2Task.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Aria2Task.swift; path = Aria2RPC/Aria2Task.swift; sourceTree = SOURCE_ROOT; };
889783571CBE105400C12387 /* Aria2RPC.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Aria2RPC.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9D9A85C0E5B98F1B3ED7C7D0 /* Pods-Aria2RPC.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Aria2RPC.release.xcconfig"; path = "Pods/Target Support Files/Pods-Aria2RPC/Pods-Aria2RPC.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
889783531CBE105400C12387 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
156783852650DAE5D696EC40 /* Pods_Aria2.framework in Frameworks */,
0111B7A9D16B3D88FCF28B78 /* Pods_Aria2RPC.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -45,24 +45,25 @@
62F5BD2B4D1B6A0BB85CF3D0 /* Pods */ = {
isa = PBXGroup;
children = (
C3E763E58751C6B447F349D8 /* Pods-Aria2.debug.xcconfig */,
D560C11E59F7932E17B01274 /* Pods-Aria2.release.xcconfig */,
6223B11273725B9FCD5E9F92 /* Pods-Aria2RPC.debug.xcconfig */,
9D9A85C0E5B98F1B3ED7C7D0 /* Pods-Aria2RPC.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
880980151D2F850900237D8E /* Frameworks */ = {
isa = PBXGroup;
children = (
DDA08EBD2CDAA86158160FF1 /* Pods_Aria2.framework */,
55378921CC48E8E389847503 /* Pods_Aria2RPC.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
8897834D1CBE105400C12387 = {
isa = PBXGroup;
children = (
889783591CBE105400C12387 /* Aria2 */,
889783591CBE105400C12387 /* Aria2RPC */,
8860B6A51E02ADED001B5E8C /* Info.plist */,
889783581CBE105400C12387 /* Products */,
880980151D2F850900237D8E /* Frameworks */,
62F5BD2B4D1B6A0BB85CF3D0 /* Pods */,
@@ -72,29 +73,29 @@
889783581CBE105400C12387 /* Products */ = {
isa = PBXGroup;
children = (
889783571CBE105400C12387 /* Aria2.framework */,
889783571CBE105400C12387 /* Aria2RPC.framework */,
);
name = Products;
sourceTree = "<group>";
};
889783591CBE105400C12387 /* Aria2 */ = {
889783591CBE105400C12387 /* Aria2RPC */ = {
isa = PBXGroup;
children = (
8897835A1CBE105400C12387 /* Aria2.h */,
887AE4591CC0CE7700AAD3E3 /* Aria2Method.swift */,
889783681CBE105C00C12387 /* Aria2.swift */,
8860B6A71E02AE0A001B5E8C /* Aria2.h */,
8860B6A91E02AE0A001B5E8C /* Aria2Method.swift */,
8860B6AA1E02AE0A001B5E8C /* Aria2RPC.swift */,
88CAFFE31CFB43A900D83FF3 /* Model */,
8897835C1CBE105400C12387 /* Info.plist */,
);
name = Aria2RPC;
path = Aria2;
sourceTree = "<group>";
};
88CAFFE31CFB43A900D83FF3 /* Model */ = {
isa = PBXGroup;
children = (
88D6CDCD1CE44B9200450E0C /* Aria2Task.swift */,
88D6CDCF1CE479E900450E0C /* Aria2GlobalStatus.swift */,
88D6CDD11CE47A1B00450E0C /* Aria2Speed.swift */,
8860B6A81E02AE0A001B5E8C /* Aria2GlobalStatus.swift */,
8860B6AB1E02AE0A001B5E8C /* Aria2Speed.swift */,
8860B6AC1E02AE0A001B5E8C /* Aria2Task.swift */,
);
name = Model;
sourceTree = "<group>";
@@ -106,16 +107,16 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
8897835B1CBE105400C12387 /* Aria2.h in Headers */,
8860B6AD1E02AE0A001B5E8C /* Aria2.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */

/* Begin PBXNativeTarget section */
889783561CBE105400C12387 /* Aria2 */ = {
889783561CBE105400C12387 /* Aria2RPC */ = {
isa = PBXNativeTarget;
buildConfigurationList = 8897835F1CBE105400C12387 /* Build configuration list for PBXNativeTarget "Aria2" */;
buildConfigurationList = 8897835F1CBE105400C12387 /* Build configuration list for PBXNativeTarget "Aria2RPC" */;
buildPhases = (
6C379AC9196C68F4954D2389 /* [CP] Check Pods Manifest.lock */,
889783521CBE105400C12387 /* Sources */,
@@ -128,9 +129,9 @@
);
dependencies = (
);
name = Aria2;
name = Aria2RPC;
productName = Aria2;
productReference = 889783571CBE105400C12387 /* Aria2.framework */;
productReference = 889783571CBE105400C12387 /* Aria2RPC.framework */;
productType = "com.apple.product-type.framework";
};
/* End PBXNativeTarget section */
@@ -139,17 +140,18 @@
8897834E1CBE105400C12387 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0800;
LastUpgradeCheck = 0820;
ORGANIZATIONNAME = ShinCurry;
TargetAttributes = {
889783561CBE105400C12387 = {
CreatedOnToolsVersion = 7.3;
LastSwiftMigration = 0800;
DevelopmentTeam = 8D95HCDEJR;
LastSwiftMigration = 0820;
ProvisioningStyle = Automatic;
};
};
};
buildConfigurationList = 889783511CBE105400C12387 /* Build configuration list for PBXProject "Aria2" */;
buildConfigurationList = 889783511CBE105400C12387 /* Build configuration list for PBXProject "Aria2RPC" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
@@ -161,7 +163,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
889783561CBE105400C12387 /* Aria2 */,
889783561CBE105400C12387 /* Aria2RPC */,
);
};
/* End PBXProject section */
@@ -204,7 +206,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Aria2/Pods-Aria2-resources.sh\"\n";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Aria2RPC/Pods-Aria2RPC-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
@@ -214,11 +216,11 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
88D6CDD21CE47A1B00450E0C /* Aria2Speed.swift in Sources */,
887AE45A1CC0CE7700AAD3E3 /* Aria2Method.swift in Sources */,
889783691CBE105C00C12387 /* Aria2.swift in Sources */,
88D6CDD01CE479E900450E0C /* Aria2GlobalStatus.swift in Sources */,
88D6CDCE1CE44B9200450E0C /* Aria2Task.swift in Sources */,
8860B6AF1E02AE0A001B5E8C /* Aria2Method.swift in Sources */,
8860B6AE1E02AE0A001B5E8C /* Aria2GlobalStatus.swift in Sources */,
8860B6B01E02AE0A001B5E8C /* Aria2RPC.swift in Sources */,
8860B6B11E02AE0A001B5E8C /* Aria2Speed.swift in Sources */,
8860B6B21E02AE0A001B5E8C /* Aria2Task.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -239,8 +241,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "-";
@@ -287,8 +291,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "-";
@@ -315,46 +321,49 @@
};
889783601CBE105400C12387 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = C3E763E58751C6B447F349D8 /* Pods-Aria2.debug.xcconfig */;
baseConfigurationReference = 6223B11273725B9FCD5E9F92 /* Pods-Aria2RPC.debug.xcconfig */;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Mac Developer";
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = 8D95HCDEJR;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = Aria2/Info.plist;
INFOPLIST_FILE = "$(SRCROOT)/Aria2RPC/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_BUNDLE_IDENTIFIER = com.windisco.Aria2;
PRODUCT_BUNDLE_IDENTIFIER = com.windisco.Aria2RPC;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
889783611CBE105400C12387 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D560C11E59F7932E17B01274 /* Pods-Aria2.release.xcconfig */;
baseConfigurationReference = 9D9A85C0E5B98F1B3ED7C7D0 /* Pods-Aria2RPC.release.xcconfig */;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CODE_SIGN_IDENTITY = "Mac Developer";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "";
COMBINE_HIDPI_IMAGES = YES;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = 8D95HCDEJR;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = Aria2/Info.plist;
INFOPLIST_FILE = "$(SRCROOT)/Aria2RPC/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_BUNDLE_IDENTIFIER = com.windisco.Aria2;
PRODUCT_BUNDLE_IDENTIFIER = com.windisco.Aria2RPC;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -365,7 +374,7 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
889783511CBE105400C12387 /* Build configuration list for PBXProject "Aria2" */ = {
889783511CBE105400C12387 /* Build configuration list for PBXProject "Aria2RPC" */ = {
isa = XCConfigurationList;
buildConfigurations = (
8897835D1CBE105400C12387 /* Debug */,
@@ -374,7 +383,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
8897835F1CBE105400C12387 /* Build configuration list for PBXNativeTarget "Aria2" */ = {
8897835F1CBE105400C12387 /* Build configuration list for PBXNativeTarget "Aria2RPC" */ = {
isa = XCConfigurationList;
buildConfigurations = (
889783601CBE105400C12387 /* Debug */,
0 Aria2/Aria2.h → Aria2RPC/Aria2.h
View file
File renamed without changes.
0 Aria2/Aria2GlobalStatus.swift → Aria2RPC/Aria2GlobalStatus.swift
View file
File renamed without changes.
3 changes: 2 additions & 1 deletion Aria2/Aria2Method.swift → Aria2RPC/Aria2Method.swift
View file
Original file line number Diff line number Diff line change
@@ -17,6 +17,7 @@ public enum Aria2Method: String {
case tellWaiting
case tellStopped
case shutdown
case forceShutdown

case addUri
case addTorrent
@@ -42,4 +43,4 @@ public enum Aria2Method: String {
case onBtDownloadComplete
case onDownloadError

}
}
Loading