mirror of
https://github.com/sparkle-project/Sparkle
synced 2026-11-22 04:30:47 +00:00
Compare commits
17
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
47d3d90aee | ||
|
|
9a29d14b7b | ||
|
|
7a7fb9ecd9 | ||
|
|
4ad2b0d945 | ||
|
|
2afa08405c | ||
|
|
ed1bc2fdc8 | ||
|
|
1f07f4096e | ||
|
|
679d3568c2 | ||
|
|
bd90fb7b18 | ||
|
|
9684a433ee | ||
|
|
ff4d4f53a8 | ||
|
|
469f423e28 | ||
|
|
846838c90b | ||
|
|
f6a86f52b3 | ||
|
|
f0ceaf5cc9 | ||
|
|
569f69b463 | ||
|
|
7cc751ff4f |
No files matched your search
@@ -29,4 +29,4 @@ https://github.com/sparkle-project/Sparkle#troubleshooting
|
||||
|
||||
## Version
|
||||
|
||||
[please specify versions of Sparkle this is applicable to; note the old 1.x (master) branch is only taking fixes to regressions and security fixes now.]
|
||||
[please specify versions of Sparkle this is applicable to]
|
||||
@@ -1,36 +0,0 @@
|
||||
---
|
||||
name: Sparkle 1.x doesn't work in my app
|
||||
about: Problems with integration, unexpected errors using Sparkle 1
|
||||
title: ''
|
||||
labels: '1.x'
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
<!--
|
||||
|
||||
The answer to your issue is probably already in Console.app on your computer.
|
||||
Please use Console.app and search for Sparkle.
|
||||
|
||||
Please try troubleshooting steps:
|
||||
https://github.com/sparkle-project/Sparkle#troubleshooting
|
||||
|
||||
-->
|
||||
|
||||
### Description of the problem
|
||||
|
||||
|
||||
### Do you use Sandboxing in your app?
|
||||
|
||||
### Version of `Sparkle.framework` in the latest version of your app
|
||||
|
||||
### Version of `Sparkle.framework` in the old version of app that your users have (or N/A)
|
||||
|
||||
### Sparkle's output from Console.app
|
||||
```
|
||||
|
||||
```
|
||||
|
||||
### Steps to reproduce the behavior
|
||||
|
||||
[The more information provided and pasted verbatim, the easier it will be to diagnose an issue. If you can provide the affected application/binary and XML feed to reproduce an issue, share them]
|
||||
+2
-3
@@ -1,8 +1,7 @@
|
||||
---
|
||||
name: Sparkle 2.x doesn't work in my app
|
||||
about: Problems with integration, unexpected errors using Sparkle 2
|
||||
name: Sparkle doesn't work in my app
|
||||
about: Problems with integration, unexpected errors using Sparkle
|
||||
title: ''
|
||||
labels: '2.x'
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
@@ -7,8 +7,6 @@ Fixes # (issue)
|
||||
- [ ] My change requires a documentation update on [Sparkle's website repository](https://github.com/sparkle-project/sparkle-project.github.io)
|
||||
- [ ] My change requires changes to generate_appcast, generate_keys, or sign_update
|
||||
|
||||
Only bug fixes to regressions or security fixes are being backported to the 1.x (master) branch now. If you believe your change is significant enough to backport, please also create a separate pull request against the master branch.
|
||||
|
||||
## Testing
|
||||
|
||||
I tested and verified my change by using one or multiple of these methods:
|
||||
|
||||
@@ -25,6 +25,7 @@ static NSArray <NSString *> * _Nullable _commandAndArgumentsConformingToTypeOfPa
|
||||
NSArray <NSString *> *extractTBZ = @[@"/usr/bin/tar", @"-jxC"];
|
||||
NSArray <NSString *> *extractTXZ = extractTGZ;
|
||||
|
||||
// Note: keep this list in sync with generate_appcast's unarchiveUpdates()
|
||||
NSDictionary <NSString *, NSArray<NSString *> *> *extractCommandDictionary =
|
||||
@{
|
||||
@".zip" : @[@"/usr/bin/ditto", @"-x",@"-k",@"-"],
|
||||
|
||||
+5
-1
@@ -28,7 +28,11 @@ int main(int __unused argc, const char __unused *argv[])
|
||||
|
||||
dispatch_source_t sigtermSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_SIGNAL, SIGTERM, 0, dispatch_get_main_queue());
|
||||
dispatch_source_set_event_handler(sigtermSource, ^{
|
||||
[appInstaller cleanupAndExitWithStatus:SIGTERM error:nil];
|
||||
// Don't clear the update directory because the installer may be in middle of installing an update
|
||||
// We still need to set an event handler for receiving SIGTERM though, otherwise our job may not terminate
|
||||
// (This is also recommended from the developer documentation).
|
||||
// Simply exit with SIGTERM if we recieve this signal
|
||||
exit(SIGTERM);
|
||||
});
|
||||
dispatch_resume(sigtermSource);
|
||||
|
||||
|
||||
@@ -1,3 +1,16 @@
|
||||
# 2.5.2
|
||||
|
||||
* Don't clean up update directory when Autoupdate receives SIGTERM (#2479) (Zorg)
|
||||
* Update Japanese localization (#2475) (1024jp)
|
||||
* Improve Turkish translations (#2464) (Emir SARI)
|
||||
* Update Spanish translation for 'You are currently running version %@.' and 'Version History' (#2463) (Billy Gray)
|
||||
|
||||
# 2.5.1
|
||||
|
||||
* Default to English for XML nodes when no xml:lang is present (#2440) (Zorg)
|
||||
* Filter for archive files in generate_appcast more intelligently (#2448) (Zorg)
|
||||
* Use correct entitlements and dsym files when using custom bundle id and XPC names in ConfigCommon (#2446) (floorish)
|
||||
|
||||
# 2.5.0
|
||||
|
||||
* Add ability to adapt release notes based on the currently installed version (#2373) (Nathan Manceaux-Panot)
|
||||
@@ -12,6 +25,7 @@
|
||||
* Replace CFUUID* with NSUUID (#2395) (Eitot)
|
||||
* Report an error when detecting duplicate updates in generate_appcast (#2407) (Zorg)
|
||||
* Improve error for rejecting xattr based code signing for delta updates (#2408) (Zorg)
|
||||
* Fail gracefully when auxiliary tool cannot be located (#2436) (Zorg)
|
||||
|
||||
# 2.4.2
|
||||
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
{"1.27.1": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.1/Sparkle-1.27.1.tar.xz", "2.0.0-beta.6": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-beta.6/Sparkle-2.0.0-beta.6.tar.xz", "2.0.0-rc.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-rc.1/Sparkle-2.0.0-rc.1.tar.xz", "2.0.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0/Sparkle-2.0.0.tar.xz", "2.1.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.1/Sparkle-2.1.0-beta.1.tar.xz", "2.1.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.2/Sparkle-2.1.0-beta.2.tar.xz", "2.1.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0/Sparkle-2.1.0.tar.xz", "2.2.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.1/Sparkle-2.2.0-beta.1.tar.xz", "2.2.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.2/Sparkle-2.2.0-beta.2.tar.xz", "2.2.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0/Sparkle-2.2.0.tar.xz", "2.2.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.1/Sparkle-2.2.1.tar.xz", "2.2.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.2/Sparkle-2.2.2.tar.xz", "2.3.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.1/Sparkle-2.3.0-beta.1.tar.xz", "2.3.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.2/Sparkle-2.3.0-beta.2.tar.xz", "2.3.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0/Sparkle-2.3.0.tar.xz", "2.3.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.1/Sparkle-2.3.1.tar.xz", "2.3.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.2/Sparkle-2.3.2.tar.xz", "2.4.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.1/Sparkle-2.4.0-beta.1.tar.xz", "2.4.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.2/Sparkle-2.4.0-beta.2.tar.xz", "2.4.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0/Sparkle-2.4.0.tar.xz", "2.4.1-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1-beta.1/Sparkle-2.4.1-beta.1.tar.xz", "2.4.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1/Sparkle-2.4.1.tar.xz", "2.4.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.2/Sparkle-2.4.2.tar.xz", "2.5.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.1/Sparkle-2.5.0-beta.1.tar.xz", "2.5.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.2/Sparkle-2.5.0-beta.2.tar.xz"}
|
||||
{"1.27.1": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.1/Sparkle-1.27.1.tar.xz", "2.0.0-beta.6": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-beta.6/Sparkle-2.0.0-beta.6.tar.xz", "2.0.0-rc.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-rc.1/Sparkle-2.0.0-rc.1.tar.xz", "2.0.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0/Sparkle-2.0.0.tar.xz", "2.1.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.1/Sparkle-2.1.0-beta.1.tar.xz", "2.1.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.2/Sparkle-2.1.0-beta.2.tar.xz", "2.1.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0/Sparkle-2.1.0.tar.xz", "2.2.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.1/Sparkle-2.2.0-beta.1.tar.xz", "2.2.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.2/Sparkle-2.2.0-beta.2.tar.xz", "2.2.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0/Sparkle-2.2.0.tar.xz", "2.2.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.1/Sparkle-2.2.1.tar.xz", "2.2.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.2/Sparkle-2.2.2.tar.xz", "2.3.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.1/Sparkle-2.3.0-beta.1.tar.xz", "2.3.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.2/Sparkle-2.3.0-beta.2.tar.xz", "2.3.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0/Sparkle-2.3.0.tar.xz", "2.3.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.1/Sparkle-2.3.1.tar.xz", "2.3.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.2/Sparkle-2.3.2.tar.xz", "2.4.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.1/Sparkle-2.4.0-beta.1.tar.xz", "2.4.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.2/Sparkle-2.4.0-beta.2.tar.xz", "2.4.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0/Sparkle-2.4.0.tar.xz", "2.4.1-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1-beta.1/Sparkle-2.4.1-beta.1.tar.xz", "2.4.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1/Sparkle-2.4.1.tar.xz", "2.4.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.2/Sparkle-2.4.2.tar.xz", "2.5.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.1/Sparkle-2.5.0-beta.1.tar.xz", "2.5.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.2/Sparkle-2.5.0-beta.2.tar.xz", "2.5.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0/Sparkle-2.5.0.tar.xz", "2.5.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.1/Sparkle-2.5.1.tar.xz", "2.5.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.2/Sparkle-2.5.2.tar.xz"}
|
||||
@@ -92,12 +92,12 @@ SPARKLE_ICON_NAME = AppIcon
|
||||
// These variables must have a space after the '=' too
|
||||
SPARKLE_VERSION_MAJOR = 2
|
||||
SPARKLE_VERSION_MINOR = 5
|
||||
SPARKLE_VERSION_PATCH = 0
|
||||
SPARKLE_VERSION_PATCH = 2
|
||||
|
||||
// This should be in SemVer format or empty, ie. "-beta.1"
|
||||
// These variables must have a space after the '=' too
|
||||
SPARKLE_VERSION_SUFFIX = -beta.2
|
||||
CURRENT_PROJECT_VERSION = 2030
|
||||
SPARKLE_VERSION_SUFFIX =
|
||||
CURRENT_PROJECT_VERSION = 2033
|
||||
|
||||
MARKETING_VERSION = $(SPARKLE_VERSION_MAJOR).$(SPARKLE_VERSION_MINOR).$(SPARKLE_VERSION_PATCH)$(SPARKLE_VERSION_SUFFIX)
|
||||
ALWAYS_SEARCH_USER_PATHS = NO
|
||||
|
||||
@@ -4,6 +4,6 @@ INFOPLIST_FILE = Downloader/Info.plist
|
||||
WRAPPER_EXTENSION = xpc
|
||||
PRODUCT_BUNDLE_IDENTIFIER = ${DOWNLOADER_BUNDLE_ID}
|
||||
PRODUCT_NAME = ${DOWNLOADER_NAME}
|
||||
CODE_SIGN_ENTITLEMENTS = Downloader/${DOWNLOADER_BUNDLE_ID}.entitlements
|
||||
CODE_SIGN_ENTITLEMENTS = Downloader/org.sparkle-project.Downloader.entitlements
|
||||
GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) BUILDING_SPARKLE_SOURCES_EXTERNALLY=1
|
||||
CLANG_MODULES_AUTOLINK = NO
|
||||
@@ -7,7 +7,7 @@ rm -rd "$BUILT_PRODUCTS_DIR/Sparkle.xcframework"
|
||||
xcodebuild archive -scheme Sparkle -archivePath "$BUILT_PRODUCTS_DIR/Sparkle.xcarchive" BUILD_LIBRARY_FOR_DISTRIBUTION=YES SKIP_INSTALL=NO
|
||||
|
||||
if [ $XCODE_VERSION_MAJOR -ge "1200" ]; then
|
||||
xcodebuild -create-xcframework -framework "$BUILT_PRODUCTS_DIR/Sparkle.xcarchive/Products/Library/Frameworks/Sparkle.framework" -debug-symbols "$BUILT_PRODUCTS_DIR/Sparkle.xcarchive/dSYMs/Sparkle.framework.dSYM" -debug-symbols "$BUILT_PRODUCTS_DIR/Sparkle.xcarchive/dSYMs/Autoupdate.dSYM" -debug-symbols "$BUILT_PRODUCTS_DIR/Sparkle.xcarchive/dSYMs/Updater.app.dSYM" -debug-symbols "$BUILT_PRODUCTS_DIR/Sparkle.xcarchive/dSYMs/Installer.xpc.dSYM" -debug-symbols "$BUILT_PRODUCTS_DIR/Sparkle.xcarchive/dSYMs/Downloader.xpc.dSYM" -output "$BUILT_PRODUCTS_DIR/Sparkle.xcframework"
|
||||
xcodebuild -create-xcframework -framework "$BUILT_PRODUCTS_DIR/Sparkle.xcarchive/Products/Library/Frameworks/Sparkle.framework" -debug-symbols "$BUILT_PRODUCTS_DIR/Sparkle.xcarchive/dSYMs/Sparkle.framework.dSYM" -debug-symbols "$BUILT_PRODUCTS_DIR/Sparkle.xcarchive/dSYMs/Autoupdate.dSYM" -debug-symbols "$BUILT_PRODUCTS_DIR/Sparkle.xcarchive/dSYMs/Updater.app.dSYM" -debug-symbols "$BUILT_PRODUCTS_DIR/Sparkle.xcarchive/dSYMs/$INSTALLER_LAUNCHER_NAME.xpc.dSYM" -debug-symbols "$BUILT_PRODUCTS_DIR/Sparkle.xcarchive/dSYMs/$DOWNLOADER_NAME.xpc.dSYM" -output "$BUILT_PRODUCTS_DIR/Sparkle.xcframework"
|
||||
else
|
||||
echo "warning: Your Xcode version does not support bundling dSYMs in XCFrameworks directly. You should copy them manually into the XCFramework."
|
||||
echo "note: cp '$BUILT_PRODUCTS_DIR/Sparkle.xcarchive/dSYMs/Sparkle.framework.dSYM' '$BUILT_PRODUCTS_DIR/Sparkle.xcframework/your_architecture/dSYMs'"
|
||||
|
||||
@@ -326,10 +326,17 @@
|
||||
} else {
|
||||
auxiliaryToolURL = [bundle URLForAuxiliaryExecutable:nameWithExtension];
|
||||
}
|
||||
assert(auxiliaryToolURL != nil);
|
||||
|
||||
if (auxiliaryToolURL == nil) {
|
||||
SULog(SULogLevelError, @"Error: Cannot retrieve path for auxiliary tool: %@", nameWithExtension);
|
||||
return nil;
|
||||
}
|
||||
|
||||
NSURL *resolvedAuxiliaryToolURL = [auxiliaryToolURL URLByResolvingSymlinksInPath];
|
||||
assert(resolvedAuxiliaryToolURL != nil);
|
||||
if (resolvedAuxiliaryToolURL == nil) {
|
||||
SULog(SULogLevelError, @"Error: Cannot retrieve resolved path for auxiliary tool path: %@", auxiliaryToolURL.path);
|
||||
return nil;
|
||||
}
|
||||
|
||||
return resolvedAuxiliaryToolURL.path;
|
||||
}
|
||||
|
||||
+3
-3
@@ -2,10 +2,10 @@
|
||||
import PackageDescription
|
||||
|
||||
// Version is technically not required here, SPM doesn't check
|
||||
let version = "2.5.0-beta.2"
|
||||
let version = "2.5.2"
|
||||
// Tag is required to point towards the right asset. SPM requires the tag to follow semantic versioning to be able to resolve it.
|
||||
let tag = "2.5.0-beta.2"
|
||||
let checksum = "8efa53590e1c49a2e12e472cf078ca4f263bc61c80412a8ea564939050d864ce"
|
||||
let tag = "2.5.2"
|
||||
let checksum = "48ffac5d4477bf8be814c369b5c1b5a6b35e05f5e4fa473bd5b5c41d90846a99"
|
||||
let url = "https://github.com/sparkle-project/Sparkle/releases/download/\(tag)/Sparkle-for-Swift-Package-Manager.zip"
|
||||
|
||||
let package = Package(
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "Sparkle"
|
||||
s.version = "2.5.0-beta.2"
|
||||
s.version = "2.5.2"
|
||||
s.summary = "A software update framework for macOS"
|
||||
s.description = "Sparkle is an easy-to-use software update framework for macOS."
|
||||
s.homepage = "https://sparkle-project.org"
|
||||
|
||||
Vendored
+30
-12
@@ -115,7 +115,7 @@
|
||||
}
|
||||
|
||||
for (NSString *name in nodesDict) {
|
||||
node = [self bestNodeInNodes:[nodesDict objectForKey:name]];
|
||||
node = [self bestNodeInNodes:[nodesDict objectForKey:name] name:name];
|
||||
if ([name isEqualToString:SURSSElementEnclosure] || [name isEqualToString:SUAppcastElementCriticalUpdate]) {
|
||||
// These are flattened as a separate dictionary for some reason
|
||||
NSDictionary *innerDict = [self attributesOfNode:(NSXMLElement *)node];
|
||||
@@ -205,7 +205,7 @@
|
||||
return appcastItems;
|
||||
}
|
||||
|
||||
- (NSXMLNode *)bestNodeInNodes:(NSArray *)nodes SPU_OBJC_DIRECT
|
||||
- (NSXMLNode *)bestNodeInNodes:(NSArray *)nodes name:(NSString *)name SPU_OBJC_DIRECT
|
||||
{
|
||||
// We use this method to pick out the localized version of a node when one's available.
|
||||
if ([nodes count] == 1)
|
||||
@@ -213,19 +213,37 @@
|
||||
else if ([nodes count] == 0)
|
||||
return nil;
|
||||
|
||||
NSMutableArray *languages = [NSMutableArray array];
|
||||
NSString *lang;
|
||||
NSUInteger i;
|
||||
// Now that we reached here, we are dealing with multiple nodes
|
||||
NSMutableArray<NSString *> *languages = [NSMutableArray array];
|
||||
for (NSXMLElement *node in nodes) {
|
||||
lang = [[node attributeForName:@"xml:lang"] stringValue];
|
||||
[languages addObject:(lang ? lang : @"")];
|
||||
NSString *nodeLanguage = [[node attributeForName:SUXMLLanguage] stringValue];
|
||||
NSString *language;
|
||||
if (nodeLanguage.length == 0) {
|
||||
language = @"en";
|
||||
|
||||
SULog(SULogLevelError, @"Error: Multiple nodes for %@ element are present and one of them does not have %@ attribute specified. Defaulting to %@=\"en\" but not all versions of Sparkle handle an implicit set language. Please specify the %@ attribute explicitly for all %@ elements.", name, SUXMLLanguage, SUXMLLanguage, SUXMLLanguage, name);
|
||||
} else {
|
||||
language = nodeLanguage;
|
||||
}
|
||||
|
||||
[languages addObject:language];
|
||||
}
|
||||
lang = [[NSBundle preferredLocalizationsFromArray:languages] objectAtIndex:0];
|
||||
i = [languages indexOfObject:([languages containsObject:lang] ? lang : @"")];
|
||||
if (i == NSNotFound) {
|
||||
i = 0;
|
||||
|
||||
NSString *preferredLanguage = [[NSBundle preferredLocalizationsFromArray:languages] objectAtIndex:0];
|
||||
if (preferredLanguage == nil) {
|
||||
SULog(SULogLevelError, @"Error: Failed to obtain preferred localizations from %@ for node %@.", languages, name);
|
||||
|
||||
return [nodes objectAtIndex:0];
|
||||
}
|
||||
return [nodes objectAtIndex:i];
|
||||
|
||||
NSUInteger preferredLanguageIndex = [languages indexOfObject:preferredLanguage];
|
||||
if (preferredLanguageIndex == NSNotFound) {
|
||||
SULog(SULogLevelError, @"Error: Failed to find preferred language index for %@ for node %@.", preferredLanguage, name);
|
||||
|
||||
return [nodes objectAtIndex:0];
|
||||
}
|
||||
|
||||
return [nodes objectAtIndex:preferredLanguageIndex];
|
||||
}
|
||||
|
||||
- (SUAppcast *)copyByFilteringItems:(BOOL (^)(SUAppcastItem *))filterBlock
|
||||
|
||||
Vendored
+4
-1
@@ -2,7 +2,7 @@
|
||||
"%@ %@ is currently the newest version available." = "%1$@ %2$@ es la versión más nueva disponible.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ es la versión más nueva disponible.\n(You are currently running version %3$@.)";
|
||||
"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ es la versión más nueva disponible.\n(Actualmente estás corriendo la versión %3$@.)";
|
||||
|
||||
/* Description text for SUUpdateAlert when the update is downloadable. */
|
||||
"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ ya está disponible (tienes la %3$@). ¿Quisieras descargarla ahora?";
|
||||
@@ -88,5 +88,8 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Usa Finder para copiar %1$@ a la carpeta Aplicaciones, vuélvela a abrir desde ahí e inténtalo de nuevo.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Version History" = "Historial de versiones";
|
||||
|
||||
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
|
||||
"You’re up to date!" = "¡Está actualizado!";
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
"170.title" = "リリースノート:";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
|
||||
"171.title" = "後で通知";
|
||||
"171.title" = "あとで通知";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
|
||||
"172.title" = "このバージョンはスキップ";
|
||||
|
||||
@@ -18,3 +18,6 @@
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
|
||||
"OhZ-1K-DmA.title" = "自動で確認";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Automatically download and install updates"; ObjectID = "AUc-33-qGN"; */
|
||||
"AUc-33-qGN.title" = "アップデートを自動でダウンロードしてインストール";
|
||||
Vendored
+3
-3
@@ -29,7 +29,7 @@
|
||||
"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@がダウンロードされました! これは重要なアップデートです。今すぐ%1$@をインストールして再起動しますか?";
|
||||
|
||||
/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
|
||||
"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@がダウンロードされました! 今すぐ %1$@ をインストールして再起動しますか?";
|
||||
"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@がダウンロードされました! 今すぐ%1$@をインストールして再起動しますか?";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%1$@ %2$@ is available but your macOS version is too new for this update. This update only supports up to macOS %3$@." = "%1$@ %2$@が入手可能ですが、インストールするにはmacOSのバージョンが新しすぎます。このアップデートはmacOS %3$@までしか対応していません。";
|
||||
@@ -38,10 +38,10 @@
|
||||
"%1$@ %2$@ is available but your macOS version is too old to install it. At least macOS %3$@ is required." = "%1$@ %2$@が入手可能ですが、インストールするにはmacOSのバージョンが古すぎます。macOS %3$@以降が必要です。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "この場所ではダウンロードされたアップデータを%1$@に適用できません。";
|
||||
"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "この場所ではダウンロードされたアップデートを%1$@に適用できません。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@は読み出し専用またはテンポラリな場所で開かれているためアップデートできません。";
|
||||
"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@は読み出し専用または一時的な場所で開かれているためアップデートできません。";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"A new version of %@ is available!" = "新しいバージョンの%@が入手できます!";
|
||||
|
||||
+6
-6
@@ -1,17 +1,17 @@
|
||||
/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */
|
||||
"5.title" = "Software-Aktualisierung";
|
||||
"5.title" = "Yazılım Güncelleme";
|
||||
|
||||
/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */
|
||||
"170.title" = "Sürüm Hakkında:";
|
||||
"170.title" = "Sürüm notları:";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */
|
||||
"171.title" = "Sonra Hatırlat";
|
||||
"171.title" = "Daha Sonra Anımsat";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */
|
||||
"172.title" = "Bu Sürümü Geç";
|
||||
"172.title" = "Bu Sürümü Atla";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */
|
||||
"173.title" = "Kur";
|
||||
"173.title" = "Yükle";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */
|
||||
"175.title" = "Bundan sonra güncellemeleri kendiliğinden indir ve kur";
|
||||
"175.title" = "Gelecekte güncellemeleri otomatik olarak indir ve yükle";
|
||||
+6
-6
@@ -5,19 +5,19 @@
|
||||
"45.title" = "Text Cell";
|
||||
|
||||
/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
|
||||
"183.title" = "Gönderdiğiniz anonim sistem bilgileri bu yazılımın geliştirilmesi için kullanılacaktır. Konu ile ilgili ayrıntılı bilgi için lütfen bizimle bağlantıya geçiniz. Göndereceğiniz Bilgiler:";
|
||||
"183.title" = "Gönderdiğiniz anonim sistem bilgileri bu yazılımın geliştirilmesi için kullanılacaktır. Konu ile ilgili ayrıntılı bilgi için lütfen bizimle iletişime geçin. Gönderilecek bilgiler:";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
|
||||
"cCJ-V0-aTi.title" = "Arama";
|
||||
"cCJ-V0-aTi.title" = "Denetleme";
|
||||
|
||||
/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
|
||||
"gmh-T4-BO0.title" = "Güncellemeler otomatik olarak aransın mı?";
|
||||
"gmh-T4-BO0.title" = "Güncellemeler otomatik olarak denetlensin mi?";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
|
||||
"gz7-LM-gNf.title" = "Sistem bilgilerini kimlik gizlenmiş olarak gönder";
|
||||
"gz7-LM-gNf.title" = "Anonim sistem profilini içer";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Automatically download and install updates"; ObjectID = "AUc-33-qGN"; */
|
||||
"AUc-33-qGN.title" = "Güncellemeleri kendiliğinden indir ve kur";
|
||||
"AUc-33-qGN.title" = "Güncellemeleri otomatik olarak indir ve yükle";
|
||||
|
||||
/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
|
||||
"OhZ-1K-DmA.title" = "Otomatik Olarak Ara";
|
||||
"OhZ-1K-DmA.title" = "Otomatik Olarak Denetle";
|
||||
Vendored
+17
-17
@@ -1,11 +1,11 @@
|
||||
/* No comment provided by engineer. */
|
||||
"%@ %@ is currently the newest version available." = "%1$@ %2$@ mevcut en yeni sürümdür.";
|
||||
"%@ %@ is currently the newest version available." = "%1$@ %2$@, kullanılabilir en yeni sürümdür.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ mevcut en yeni sürümdür.\n(Şu anda %3$@ sürümünü kullanıyorsunuz.)";
|
||||
"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@, kullanılabilir en yeni sürümdür.\n(Şu anda %3$@ sürümünü kullanıyorsunuz.)";
|
||||
|
||||
/* Description text for SUUpdateAlert when the update is downloadable. */
|
||||
"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ çıktı (Kullandığınız Sürüm: %3$@). Şimdi yeni sürümü indirmek ister misiniz?";
|
||||
"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ çıktı (kullandığınız sürüm: %3$@). Şimdi yeni sürümü indirmek ister misiniz?";
|
||||
|
||||
/* Description text for SUUpdateAlert when the update informational with no download. */
|
||||
"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ çıktı (kullandığınız sürüm: %3$@). Bu güncelleme ile ilgili olarak web sayfasından daha fazla bilgi almak ister misiniz?";
|
||||
@@ -20,43 +20,43 @@
|
||||
"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ indirildi ve kullanıma hazır! Şimdi yüklemek ister misiniz? Uygulama yeniden başlatılacaktır.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@ uygulaması geçici veya salt okunur bir konumdan açıldığı için güncellenemedi.";
|
||||
"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@ uygulaması geçici veya salt okunur bir konumdan açıldığı için güncellenemiyor.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"A new version of %@ is available!" = "%@ uygulaması için yeni bir sürüm var!";
|
||||
"A new version of %@ is available!" = "%@ uygulaması için yeni bir sürüm kullanılabilir!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"A new version of %@ is ready to install!" = "%@ uygulamasının yeni bir sürümü yüklenmeye hazır!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred in retrieving update information. Please try again later." = "Güncelleme bilgilerini alırken bir hata oluştu. Lütfen daha sonra tekrar deneyiniz.";
|
||||
"An error occurred in retrieving update information. Please try again later." = "Güncelleme bilgilerini alırken bir hata oluştu. Lütfen daha sonra yeniden deneyin.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred while downloading the update. Please try again later." = "Güncelleme indirilirken bir hata oluştu. Lütfen sonra tekrar deneyiniz.";
|
||||
"An error occurred while downloading the update. Please try again later." = "Güncelleme indirilirken bir hata oluştu. Lütfen daha sonra yeniden deneyin.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred while extracting the archive. Please try again later." = "İndirilen arşivi açarken bir hata oluştu. Lütfen daha sonra tekrar deneyiniz.";
|
||||
"An error occurred while extracting the archive. Please try again later." = "İndirilen arşivi açarken bir hata oluştu. Lütfen daha sonra yeniden deneyin.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred while parsing the update feed." = "Güncelleme kaynağını incelerken bir hata oluştu.";
|
||||
"An error occurred while parsing the update feed." = "Güncelleme kaynağı ayrıştırılırken bir hata oluştu.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel" = "Vazgeç";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Cancel Update" = "Güncellemeyi iptal et";
|
||||
"Cancel Update" = "Güncellemeden Vazgeç";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Checking for updates…" = "Güncellemelere bakılıyor…";
|
||||
"Checking for updates…" = "Güncellemeler denetleniyor…";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
"Downloading update…" = "Güncelleme indiriliyor…";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
"Extracting update…" = "Güncelleme ayıklanıyor…";
|
||||
"Extracting update…" = "Güncelleme çıkarılıyor…";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Install and Relaunch" = "Kur ve yeniden başlat";
|
||||
"Install and Relaunch" = "Yükle ve Yeniden Başlat";
|
||||
|
||||
/* Take care not to overflow the status window. */
|
||||
"Installing update…" = "Güncelleme kuruluyor…";
|
||||
@@ -65,19 +65,19 @@
|
||||
"OK" = "Tamam";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Ready to Install" = "Kuruluma hazır";
|
||||
"Ready to Install" = "Yüklemeye Hazır";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "%1$@ uygulaması için güncellemeler otomatik olarak aransın mı? Güncelleme işlemini el ile uygulama menüsünden de başlatabilirsiniz.";
|
||||
"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "%1$@ uygulaması güncellemeleri otomatik olarak denetlensin mi? Güncelleme işlemini el ile uygulama menüsünden de başlatabilirsiniz.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Update Error!" = "Güncelleme hatası.";
|
||||
"Update Error!" = "Güncelleme Hatası!";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Updating %@" = "%@ güncelleniyor";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Lütfen %1$@ uygulamasını Uygulamalar dizinine kopyalayıp yeniden başlatınız.";
|
||||
"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "%1$@ uygulamasını Uygulamalar klasörüne kopyalamak için Finder'ı kullanın, onu oradan başlatın ve yeniden deneyin.";
|
||||
|
||||
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
|
||||
"You’re up to date!" = "Uygulama güncel!";
|
||||
@@ -2,16 +2,53 @@
|
||||
<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle">
|
||||
<channel>
|
||||
<title>For unit test only</title>
|
||||
<!-- A release testing localized release notes -->
|
||||
<!-- Releases testing localized release notes -->
|
||||
|
||||
<!-- test other localization before implicit English !-->
|
||||
<item>
|
||||
<title>Version 6.3</title>
|
||||
<sparkle:version>6.3</sparkle:version>
|
||||
<sparkle:channel>english-later-implicit</sparkle:channel>
|
||||
<pubDate>Sat, 26 Jul 2019 15:20:13 +0000</pubDate>
|
||||
<enclosure url="http://localhost:1337/Sparkle_Test_App.zip" />
|
||||
<sparkle:releaseNotesLink xml:lang="es">https://sparkle-project.org/notes.es.html</sparkle:releaseNotesLink>
|
||||
<sparkle:releaseNotesLink>https://sparkle-project.org/notes.en.html</sparkle:releaseNotesLink>
|
||||
<sparkle:minimumSystemVersion>2.0.0</sparkle:minimumSystemVersion>
|
||||
</item>
|
||||
|
||||
<!-- test implicit English before other localization !-->
|
||||
<item>
|
||||
<title>Version 6.2</title>
|
||||
<sparkle:version>6.2</sparkle:version>
|
||||
<sparkle:channel>english-first-implicit</sparkle:channel>
|
||||
<pubDate>Sat, 26 Jul 2019 15:20:13 +0000</pubDate>
|
||||
<enclosure url="http://localhost:1337/Sparkle_Test_App.zip" />
|
||||
<sparkle:releaseNotesLink>https://sparkle-project.org/notes.en.html</sparkle:releaseNotesLink>
|
||||
<sparkle:releaseNotesLink xml:lang="es">https://sparkle-project.org/notes.es.html</sparkle:releaseNotesLink>
|
||||
<sparkle:minimumSystemVersion>2.0.0</sparkle:minimumSystemVersion>
|
||||
</item>
|
||||
|
||||
<!-- test English before other localization !-->
|
||||
<item>
|
||||
<title>Version 6.1</title>
|
||||
<sparkle:version>6.1</sparkle:version>
|
||||
<sparkle:channel>english-first</sparkle:channel>
|
||||
<pubDate>Sat, 26 Jul 2019 15:20:13 +0000</pubDate>
|
||||
<enclosure url="http://localhost:1337/Sparkle_Test_App.zip" />
|
||||
<sparkle:releaseNotesLink xml:lang="en">https://sparkle-project.org/notes.en.html</sparkle:releaseNotesLink>
|
||||
<sparkle:releaseNotesLink xml:lang="es">https://sparkle-project.org/notes.es.html</sparkle:releaseNotesLink>
|
||||
<sparkle:minimumSystemVersion>2.0.0</sparkle:minimumSystemVersion>
|
||||
</item>
|
||||
|
||||
<!-- test other localization before English !-->
|
||||
<item>
|
||||
<title>Version 6.0</title>
|
||||
<sparkle:version>6.0</sparkle:version>
|
||||
<sparkle:channel>english-later</sparkle:channel>
|
||||
<pubDate>Sat, 26 Jul 2019 15:20:13 +0000</pubDate>
|
||||
<enclosure url="http://localhost:1337/Sparkle_Test_App.zip" />
|
||||
<sparkle:releaseNotesLink>https://sparkle-project.org/#works</sparkle:releaseNotesLink>
|
||||
<sparkle:releaseNotesLink xml:lang='en'>
|
||||
https://sparkle-project.org/#localized_notes_link_works
|
||||
</sparkle:releaseNotesLink>
|
||||
<sparkle:releaseNotesLink xml:lang="es">https://sparkle-project.org/notes.es.html</sparkle:releaseNotesLink>
|
||||
<sparkle:releaseNotesLink xml:lang="en">https://sparkle-project.org/notes.en.html</sparkle:releaseNotesLink>
|
||||
<sparkle:minimumSystemVersion>2.0.0</sparkle:minimumSystemVersion>
|
||||
</item>
|
||||
</channel>
|
||||
|
||||
@@ -869,15 +869,51 @@ class SUAppcastTest: XCTestCase {
|
||||
ofType: "xml")!
|
||||
let testFileUrl = URL(fileURLWithPath: testFile)
|
||||
XCTAssertNotNil(testFileUrl)
|
||||
|
||||
let preferredLanguage = Bundle.preferredLocalizations(from: ["en", "es"])[0]
|
||||
|
||||
NSLog("Using preferred locale %@", preferredLanguage)
|
||||
|
||||
let expectedReleaseNotesLink = (preferredLanguage == "es") ? "https://sparkle-project.org/notes.es.html" : "https://sparkle-project.org/notes.en.html"
|
||||
|
||||
do {
|
||||
let testFileData = try Data(contentsOf: testFileUrl)
|
||||
|
||||
let stateResolver = SPUAppcastItemStateResolver(hostVersion: "1.0", applicationVersionComparator: SUStandardVersionComparator.default, standardVersionComparator: SUStandardVersionComparator.default)
|
||||
|
||||
let appcast = try SUAppcast(xmlData: testFileData, relativeTo: testFileUrl, stateResolver: stateResolver)
|
||||
let items = appcast.items
|
||||
XCTAssertEqual("https://sparkle-project.org/#localized_notes_link_works", items[0].releaseNotesURL!.absoluteString)
|
||||
let fullAppcast = try SUAppcast(xmlData: testFileData, relativeTo: testFileUrl, stateResolver: stateResolver)
|
||||
|
||||
do {
|
||||
let appcast = SUAppcastDriver.filterAppcast(fullAppcast, forMacOSAndAllowedChannels: ["english-later"])
|
||||
let items = appcast.items
|
||||
XCTAssertEqual(items.count, 1)
|
||||
XCTAssertEqual(items[0].versionString, "6.0")
|
||||
XCTAssertEqual(expectedReleaseNotesLink, items[0].releaseNotesURL!.absoluteString)
|
||||
}
|
||||
|
||||
do {
|
||||
let appcast = SUAppcastDriver.filterAppcast(fullAppcast, forMacOSAndAllowedChannels: ["english-first"])
|
||||
let items = appcast.items
|
||||
XCTAssertEqual(items.count, 1)
|
||||
XCTAssertEqual(items[0].versionString, "6.1")
|
||||
XCTAssertEqual(expectedReleaseNotesLink, items[0].releaseNotesURL!.absoluteString)
|
||||
}
|
||||
|
||||
do {
|
||||
let appcast = SUAppcastDriver.filterAppcast(fullAppcast, forMacOSAndAllowedChannels: ["english-first-implicit"])
|
||||
let items = appcast.items
|
||||
XCTAssertEqual(items.count, 1)
|
||||
XCTAssertEqual(items[0].versionString, "6.2")
|
||||
XCTAssertEqual(expectedReleaseNotesLink, items[0].releaseNotesURL!.absoluteString)
|
||||
}
|
||||
|
||||
do {
|
||||
let appcast = SUAppcastDriver.filterAppcast(fullAppcast, forMacOSAndAllowedChannels: ["english-later-implicit"])
|
||||
let items = appcast.items
|
||||
XCTAssertEqual(items.count, 1)
|
||||
XCTAssertEqual(items[0].versionString, "6.3")
|
||||
XCTAssertEqual(expectedReleaseNotesLink, items[0].releaseNotesURL!.absoluteString)
|
||||
}
|
||||
} catch let err as NSError {
|
||||
NSLog("%@", err)
|
||||
XCTFail(err.localizedDescription)
|
||||
|
||||
@@ -56,7 +56,18 @@ func unarchiveUpdates(archivesSourceDir: URL, archivesDestDir: URL, disableNeste
|
||||
// so we can ignore duplicate archive entries before trying to unarchive archives in parallel
|
||||
var fileEntries: [URL: URL] = [:]
|
||||
let dir = try fileManager.contentsOfDirectory(atPath: archivesSourceDir.path)
|
||||
for item in dir.filter({ !$0.hasPrefix(".") && !$0.hasSuffix(".delta") && !$0.hasSuffix(".xml") && !$0.hasSuffix(".html") && !$0.hasSuffix(".txt") }) {
|
||||
for item in dir {
|
||||
if item.hasPrefix(".") {
|
||||
continue
|
||||
}
|
||||
|
||||
let itemURL = archivesSourceDir.appendingPathComponent(item)
|
||||
let fileExtension = itemURL.pathExtension
|
||||
// Note: keep this list in sync with SUPipedUnarchiver
|
||||
guard ["zip", "tar", "gz", "tgz", "bz2", "tbz", "xz", "txz", "lzma", "dmg"].contains(fileExtension) else {
|
||||
continue
|
||||
}
|
||||
|
||||
let itemPath = archivesSourceDir.appendingPathComponent(item)
|
||||
|
||||
// Ignore directories
|
||||
|
||||
Reference in new issue
Block a user