Merge branch 'main' of https://github.com/DenDmitriev/grabshot

DenDmitriev · Apr 4, 2024 · fba6bf9 · fba6bf9
2 parents c996863 + 78c786d
commit fba6bf9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/GrabShot.xcodeproj/project.pbxproj b/GrabShot.xcodeproj/project.pbxproj
@@ -2143,7 +2143,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 41;
+				CURRENT_PROJECT_VERSION = 42;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "GrabShot/Preview\\ Content";
 				DEVELOPMENT_TEAM = TNTX3799P3;
@@ -2166,7 +2166,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.3;
-				MARKETING_VERSION = 2.0;
+				MARKETING_VERSION = 2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = DenisDmitriev.GrabShot;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2190,7 +2190,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 41;
+				CURRENT_PROJECT_VERSION = 42;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "GrabShot/Preview\\ Content";
 				DEVELOPMENT_TEAM = TNTX3799P3;
@@ -2213,7 +2213,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.3;
-				MARKETING_VERSION = 2.0;
+				MARKETING_VERSION = 2.1;
 				PRODUCT_BUNDLE_IDENTIFIER = DenisDmitriev.GrabShot;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/GrabShot/Commands/GrabShotCommands.swift b/GrabShot/Commands/GrabShotCommands.swift
@@ -73,7 +73,10 @@ struct GrabShotCommands: Commands {
             ) { result in
                 switch result {
                 case .success(let success):
-                    imageStore.insertImages(success)
+                    let urls = success.compactMap { url in
+                        url.startAccessingSecurityScopedResource() ? url : nil
+                    }
+                    imageStore.insertImages(urls)
                 case .failure(let failure):
                     if let failure = failure as? LocalizedError {
                         videoStore.presentError(error: failure)

diff --git a/GrabShot/Flow/LinkGrab/Model/YoutubeParser.swift b/GrabShot/Flow/LinkGrab/Model/YoutubeParser.swift
@@ -91,7 +91,7 @@ public class YoutubeParser: NSObject {
             request.setValue(userAgent, forHTTPHeaderField: "User-Agent")
             request.httpMethod = "GET"
 
-            let (data, response) = try await URLSession.shared.data(for: request)
+            let (data, _) = try await URLSession.shared.data(for: request)
             guard let responseString = String(data: data, encoding: .utf8) else { throw NSError() }
 
             let parts = responseString.dictionaryFromQueryStringComponents()
@@ -106,7 +106,7 @@ public class YoutubeParser: NSObject {
                 }
                 if let fmtStreamMap = parts["url_encoded_fmt_stream_map"] as? String {
                     // Live Stream
-                    if let isLivePlayback: AnyObject = parts["live_playback"]{
+                    if let isLivePlayback: AnyObject = parts["live_playback"] {
                         if let hlsvp = parts["hlsvp"] as? String {
                             var videoDictionary: [String: AnyObject] = [:]
                             videoDictionary["url"] = "\(hlsvp)" as AnyObject

diff --git a/GrabShot/Flow/Settings/View/Subviews/ImageStripMethodDefaultSettingsView.swift b/GrabShot/Flow/Settings/View/Subviews/ImageStripMethodDefaultSettingsView.swift
@@ -47,7 +47,7 @@ struct ImageStripMethodDefaultSettingsView: View {
                     Spacer()
                     Picker("", selection: $method) {
                         ForEach(ColorExtractMethod.allCases, id: \.self) { method in
-                            Text(method.name)
+                            Text(NSLocalizedString(method.name, comment: "Settings"))
                         }
                     }
                     .frame(maxWidth: AppGrid.pt192)

diff --git a/GrabShot/Flow/VideoGrab/Model/VideoGrabSidebarModel.swift b/GrabShot/Flow/VideoGrab/Model/VideoGrabSidebarModel.swift
@@ -8,7 +8,7 @@
 import Foundation
 
 class VideoGrabSidebarModel: ObservableObject {
-    weak var dropDelegate: VideoDropDelegate?
+    var dropDelegate: VideoDropDelegate?
     weak var coordinator: GrabCoordinator?
     @Published var error: GrabError?
     @Published var hasError: Bool = false