fix rap downloads. resolves #64

.gitignore

@@ -1,18 +1,16 @@
-# Created by https://www.gitignore.io/api/swift,xcode,cocoapods
 
-.DS_Store
-
-.idea/
+# Created by https://www.gitignore.io/api/xcode,swift,carthage
+# Edit at https://www.gitignore.io/?templates=xcode,swift,carthage
 
 ### Carthage ###
 # Carthage
-
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
 Carthage/Checkouts
 Carthage/Build
 
 ### Swift ###
 # Xcode
-#
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
 
 ## Build generated
@@ -46,46 +44,60 @@ timeline.xctimeline
 playground.xcworkspace
 
 # Swift Package Manager
-#
 # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
 # Packages/
 # Package.pins
+# Package.resolved
 .build/
 
-# CocoaPods - Refactored to standalone file
+# CocoaPods
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+# Pods/
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+# *.xcworkspace
+
 
-# Carthage - Refactored to standalone file
+# Accio dependency management
+Dependencies/
+.accio/
 
 # fastlane
-#
 # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
 # screenshots whenever they are needed.
 # For more information about the recommended setup visit:
 # https://docs.fastlane.tools/best-practices/source-control/#source-control
 
 fastlane/report.xml
 fastlane/Preview.html
-fastlane/screenshots
+fastlane/screenshots/**/*.png
 fastlane/test_output
 
+# Code Injection
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/
+
 ### Xcode ###
 # Xcode
-#
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
 
-## Build generated
+## User settings
 
-## Various settings
+## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
 
-## Other
+## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
 
-### Xcode Patch ###
+## Xcode Patch
 *.xcodeproj/*
-*.xcworkspace/*
 !*.xcodeproj/project.pbxproj
 !*.xcodeproj/xcshareddata/
-#*.xcworkspace/contents.xcworkspacedata
+!*.xcworkspace/contents.xcworkspacedata
 /*.gcno
 
+### Xcode Patch ###
+**/xcshareddata/WorkspaceSettings.xcsettings
 
-# End of https://www.gitignore.io/api/swift,xcode,cocoapods
+# End of https://www.gitignore.io/api/xcode,swift,carthage

CHANGELOG.md

@@ -1,4 +1,9 @@
 # Changelog
+## v1.4.5
+### Fixed
+- Merged an update to fix localization files (@L1cardo)
+- Merged a fix for PSV Themes throwing an error about a missing update URL (@AnalogMan151)
+
 ## v1.4.4
 ### Added
 - Simplified Chinese localization (Thanks L1cardo!)

Cartfile.resolved

@@ -1,9 +1,9 @@
-github "Alamofire/Alamofire" "4.8.2"
-github "Alamofire/AlamofireImage" "3.5.2"
-github "FabrizioBrancati/Queuer" "2.1.0"
-github "SwiftyBeaver/SwiftyBeaver" "1.7.0"
+github "Alamofire/Alamofire" "4.9.1"
+github "Alamofire/AlamofireImage" "3.6.0"
+github "FabrizioBrancati/Queuer" "2.1.1"
+github "SwiftyBeaver/SwiftyBeaver" "1.9.1"
 github "cezheng/Fuzi" "2.2.1"
-github "google/promises" "1.2.8"
+github "google/promises" "1.2.9"
 github "marmelroy/Zip" "1.1.0"
 github "radex/SwiftyUserDefaults" "4.0.0"
-github "realm/realm-cocoa" "v3.16.2"
+github "realm/realm-cocoa" "v3.21.0"

NPS Browser.xcodeproj/project.pbxproj

@@ -421,7 +421,7 @@
 			attributes = {
 				CLASSPREFIX = "";
 				LastSwiftUpdateCheck = 0930;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1110;
 				ORGANIZATIONNAME = JK3Y;
 				TargetAttributes = {
 					51EBE81A2094E094005D44DC = {
@@ -586,7 +586,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies";
@@ -644,7 +644,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_SWIFT_FLAGS = "-Xfrontend -debug-time-function-bodies";
 				SDKROOT = macosx;
@@ -663,7 +663,7 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = "";
+				CURRENT_PROJECT_VERSION = 69;
 				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -676,7 +676,8 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MARKETING_VERSION = 1.4.6;
 				OTHER_SWIFT_FLAGS = "$(inherited)\n$(inherited)\n$(inherited)\n \"-D\"\n \"COCOAPODS\"";
 				PRODUCT_BUNDLE_IDENTIFIER = "JK3Y.NPS-Browser";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -697,7 +698,7 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = "";
+				CURRENT_PROJECT_VERSION = 69;
 				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -710,7 +711,8 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MARKETING_VERSION = 1.4.6;
 				OTHER_SWIFT_FLAGS = "$(inherited)\n$(inherited)\n$(inherited)\n \"-D\"\n \"COCOAPODS\"";
 				PRODUCT_BUNDLE_IDENTIFIER = "JK3Y.NPS-Browser";
 				PRODUCT_NAME = "$(TARGET_NAME)";

NPS Browser/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.4</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>68</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSAppTransportSecurity</key>

NPS Browser/models/TSVData.swift

@@ -55,13 +55,13 @@ struct TSVData {
             default: break
             }
         case .PS3:
-            let baseURL = "https://nopaystation.com/rap2file/?"
+            let baseURL = "https://nopaystation.com/tools/rap2file"
             name                      = values[2]
             pkgDirectLink             = values[3]
             rap                       = values[4]
             contentId                 = values[5]
             lastModificationDate      = parseDate(dateString: values[6])
-            downloadRapFile           = "\(baseURL)&contentid=\(values[5])&rap=\(values[4])"
+            downloadRapFile           = "\(baseURL)/\(values[5])/\(values[4])"
             fileSize                  = Int64(values[8])
             sha256                    = values[9]
         case .PSP: