Commit: f50eabbc0ef47a37de07bdd0e2fbec5c9868533e - KanColleBrowserForOSX (git)

Commit MetaInfo

• Revision: f50eabbc0ef47a37de07bdd0e2fbec5c9868533e (tree)
• Time: 2018-04-18 00:37:26
• Author: masakih <masakih@user...>
• Commiter: masakih

Log Message

WKWebViewを導入

Change Summary

• modified: KanColleBrowserForOSX.xcodeproj/project.pbxproj
• modified: KanColleBrowserForOSX/AppDelegate.swift
• modified: KanColleBrowserForOSX/Info.plist
• modified: KanColleBrowserForOSX/KCBFOMainWindowController.swift
• modified: KanColleBrowserForOSX/ja.lproj/KCBFOMainWindowController.xib
• modified: KanColleBrowserForOSXTests/Info.plist
• modified: KanColleBrowserForOSXTests/KanColleBrowserForOSXTests.swift

Incremental Difference

--- a/KanColleBrowserForOSX.xcodeproj/project.pbxproj
+++ b/KanColleBrowserForOSX.xcodeproj/project.pbxproj
@@ -164,14 +164,16 @@
 		F4EF18A71B4D36E60021BF8D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0640;
+				LastUpgradeCheck = 0810;
 				ORGANIZATIONNAME = "Hori,Masaki";
 				TargetAttributes = {
 					F4EF18AE1B4D36E60021BF8D = {
 						CreatedOnToolsVersion = 6.4;
+						LastSwiftMigration = 0810;
 					};
 					F4EF18BE1B4D36E60021BF8D = {
 						CreatedOnToolsVersion = 6.4;
+						LastSwiftMigration = 0810;
 						TestTargetID = F4EF18AE1B4D36E60021BF8D;
 					};
 				};
@@ -278,6 +280,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -287,14 +290,17 @@
 				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 = "-";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -310,7 +316,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -322,6 +328,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -331,8 +338,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 = "-";
@@ -348,9 +357,10 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 			};
 			name = Release;
 		};
@@ -361,7 +371,9 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = KanColleBrowserForOSX/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.masakih.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -372,7 +384,9 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = KanColleBrowserForOSX/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.masakih.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -391,7 +405,9 @@
 				);
 				INFOPLIST_FILE = KanColleBrowserForOSXTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.masakih.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/KanColleBrowserForOSX.app/Contents/MacOS/KanColleBrowserForOSX";
 			};
 			name = Debug;
@@ -407,7 +423,9 @@
 				);
 				INFOPLIST_FILE = KanColleBrowserForOSXTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.masakih.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/KanColleBrowserForOSX.app/Contents/MacOS/KanColleBrowserForOSX";
 			};
 			name = Release;
@@ -431,6 +449,7 @@
 				F4EF18CB1B4D36E60021BF8D /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		F4EF18CC1B4D36E60021BF8D /* Build configuration list for PBXNativeTarget "KanColleBrowserForOSXTests" */ = {
 			isa = XCConfigurationList;
@@ -439,6 +458,7 @@
 				F4EF18CE1B4D36E60021BF8D /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};

--- a/KanColleBrowserForOSX/AppDelegate.swift
+++ b/KanColleBrowserForOSX/AppDelegate.swift
@@ -13,8 +13,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 	
 	var mainWindowController: KCBFOMainWindowController!
 	
-	func applicationDidFinishLaunching(aNotification: NSNotification) {
-		mainWindowController = KCBFOMainWindowController.new()
+	func applicationDidFinishLaunching(_ aNotification: Notification) {
+		mainWindowController = KCBFOMainWindowController.makeInstance()
 		mainWindowController.showWindow(nil)
 	}
 }

--- a/KanColleBrowserForOSX/Info.plist
+++ b/KanColleBrowserForOSX/Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>com.masakih.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -22,6 +22,8 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>%%%%REVISION%%%%</string>
+	<key>LSHasLocalizedDisplayName</key>
+	<true/>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>
@@ -30,7 +32,10 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-	<key>LSHasLocalizedDisplayName</key>
-	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoadsInWebContent</key>
+		<true/>
+	</dict>
 </dict>
 </plist>

--- a/KanColleBrowserForOSX/KCBFOMainWindowController.swift
+++ b/KanColleBrowserForOSX/KCBFOMainWindowController.swift
@@ -12,101 +12,80 @@ import WebKit
 class KCBFOMainWindowController: NSWindowController {
 	
 	@IBOutlet var clipView: NSClipView!
-	@IBOutlet var webView: WebView!
+	var webView: WKWebView!
 	
-	var flashTopLeft: NSPoint = NSMakePoint(2600, 145);
+	var flashTopLeft: NSPoint = NSPoint(x: 600, y: 77)
 	
 	let gamePageURL = "http://www.dmm.com/netgame/social/-/gadgets/=/app_id=854854/"
-	
-	override class func new() -> KCBFOMainWindowController {
-		return KCBFOMainWindowController(windowNibName: "KCBFOMainWindowController")
-	}
-	
+    
+    class func makeInstance() -> KCBFOMainWindowController {
+        return KCBFOMainWindowController(windowNibName: "KCBFOMainWindowController")
+    }
+    
+    
     override func windowDidLoad() {
         super.windowDidLoad()
+        
+        let pref = WKPreferences()
+        pref.plugInsEnabled = true
+        let config = WKWebViewConfiguration()
+        config.preferences = pref
+        config.applicationNameForUserAgent = "Version/11.1 Safari/605.1.15"
+        
+        let js = """
+        var style = document.createElement('style');
+        style.innerHTML = 'html { overflow: hidden; }';
+        document.head.appendChild(style);
+"""
+        let script = WKUserScript(source: js, injectionTime: .atDocumentEnd, forMainFrameOnly: false)
+        config.userContentController.addUserScript(script)
+        
+        let frame = CGRect(x: 0, y: 0, width: 2000, height: 2_000)
+        webView = WKWebView(frame: frame, configuration: config)
+        webView.navigationDelegate = self
 		
 		clipView.documentView = webView
 		
 		adjustFlash()
 		
-		webView.mainFrame.frameView.allowsScrolling = false
-		webView.applicationNameForUserAgent = "Version/8.0.6 Safari/600.6.3"
-		webView.mainFrameURL = gamePageURL
+		webView.allowsBackForwardNavigationGestures = false
+        webView.allowsMagnification = false
+        webView.allowsLinkPreview = false
+        
+        loadURLString(urlString: gamePageURL)
+    }
+    
+    func loadURLString(urlString: String) {
+        guard let url = URL(string: urlString) else { return }
+        let req = URLRequest(url: url)
+        webView.load(req)
     }
+    
 	
-	@IBAction func reloadContent(sender: AnyObject?) {
-		if webView.mainFrameURL != gamePageURL {
-			adjustFlash()
-			webView.mainFrameURL = gamePageURL
-			return
-		}
-		adjustFlash()
-		webView.reload(nil)
-	}
-	@IBAction func reloadAndRecache(sender: AnyObject?) {
-		NSURLCache.sharedURLCache().removeAllCachedResponses()
+    @IBAction func reloadContent(_ sender: AnyObject?) {
+        guard let _ = webView.url
+            else {
+                loadURLString(urlString: gamePageURL)
+                return
+        }
+        // ゲームページでない場合はゲームページを表示する
+        if let url = webView?.url, url.absoluteString != gamePageURL {
+            loadURLString(urlString: gamePageURL)
+            return
+        }
+        
+        adjustFlash()
+        
+        webView.reload(sender)
+        
+    }
+	@IBAction func reloadAndRecache(_ sender: AnyObject?) {
+		URLCache.shared.removeAllCachedResponses()
 		reloadContent(sender)
 	}
 	
 	func adjustFlash() {
-		clipView.scrollToPoint(flashTopLeft)
-	}
-	
-	// MARK: - WebFrameLoadDelegate
-	func handler(c: JSContext! , e: JSValue!) {
-		println("caught exception in evaluateScript: -> \(e)")
-	}
-	func adjustIFrame(frame: WebFrame) {
-		let context = frame.javaScriptContext!
-		context.exceptionHandler = handler
-		context.evaluateScript(
-			[	"var emb = document.getElementById('flashWrap');",
-				"var rect = emb.getBoundingClientRect();",
-				"var atop = rect.top;",
-				"var aleft = rect.left;"
-				].reduce(""){ $0 + $1 }
-		)
-		let top = context.objectForKeyedSubscript("atop")
-		let left = context.objectForKeyedSubscript("aleft")
-		let x = CGFloat(left.toDouble())
-		let y = webView.frame.size.height - CGFloat(top.toDouble()) - 480
-		flashTopLeft = NSMakePoint(x, y)
-	}
-	func adjustGameFrame(frame: WebFrame) {
-		let context = frame.javaScriptContext!
-		context.exceptionHandler = handler
-		context.evaluateScript(
-			[	"var iframe = document.getElementById('game_frame');",
-				"var validIframe = 0;",
-				"if(iframe) {",
-				"    validIframe = 1;",
-				"    var rect = iframe.getBoundingClientRect();",
-				"    var atop = rect.top;",
-				"    var aleft = rect.left;",
-				"}"
-				].reduce(""){ $0 + $1 }
-		)
-		if let validIframe = context.objectForKeyedSubscript("validIframe")?.toInt32() {
-			if validIframe == 0 { return }
-			
-			let top = context.objectForKeyedSubscript("atop")
-			let left = context.objectForKeyedSubscript("aleft")
-			let x = flashTopLeft.x + CGFloat(left.toDouble())
-			let y = flashTopLeft.y - CGFloat(top.toDouble())
-			flashTopLeft = NSMakePoint(x, y)
-			adjustFlash()
-		}
-	}
-	override func webView(sender: WebView!, didFinishLoadForFrame frame: WebFrame!) {
-		if let path = frame.dataSource?.initialRequest.URL?.path {
-			if path.hasSuffix("gadgets/ifr") {
-				adjustIFrame(frame)
-			}
-			
-			if path.hasSuffix("app_id=854854") {
-				adjustGameFrame(frame)
-			}
-		}
+		clipView.scroll(to: flashTopLeft)
 	}
 	
 	// MARK: - WebUIDelegate
@@ -119,12 +98,64 @@ class KCBFOMainWindowController: NSWindowController {
 		WebMenuItemTagStop,
 		WebMenuItemTagReload]
 	
-	override func webView(sender: WebView!, contextMenuItemsForElement element: [NSObject : AnyObject]!, defaultMenuItems: [AnyObject]!) -> [AnyObject]! {
+	func webView(_ sender: WebView!, contextMenuItemsForElement element: [AnyHashable: Any]!, defaultMenuItems: [AnyObject]!) -> [Any]! {
 		return defaultMenuItems.flatMap() {
-			if contains(ignoreTags, $0.tag()) {
+			if ignoreTags.contains($0.tag) {
 				return []
 			}
 			return [$0]
 		}
 	}
 }
+
+extension KCBFOMainWindowController: WKNavigationDelegate {
+    func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+        
+        webView.evaluateJavaScript(
+            ["var iframe = document.getElementById('game_frame');",
+             "var validIframe = 0;",
+             "var atop = 0;",
+             "var aleft = 0;",
+             "var aWidth = 0;",
+             "if(iframe) {",
+             "    validIframe = 1;",
+             "    var rect = iframe.getBoundingClientRect();",
+             "    atop = rect.top;",
+             "    aleft = rect.left;",
+             "    aWidth = rect.width;",
+             "}",
+             "var dict = {valid:validIframe, top:atop, left:aleft, width:aWidth};",
+             "dict;"]
+                .reduce("", +)
+        ) { (dict, error) in
+            error.map { print($0) }
+            
+            guard let param = dict as? [String: Any] else {
+                
+                print("can not get dict")
+                return
+            }
+            guard let valid = param["valid"] as? Int else {
+                
+                print("can not get invalid")
+                return
+            }
+            guard valid == 1 else {
+                
+                return
+            }
+            guard let top = param["top"] as? Int,
+                let left = param["left"] as? Int,
+                let width = param["width"] as? Int
+                else { return }
+            
+            DispatchQueue.main.async { [weak self] in
+                guard let `self` = self else { return }
+                
+                self.flashTopLeft = NSPoint(x: CGFloat(left + (width - 800) / 2),
+                                            y: CGFloat(top + 16))
+                self.adjustFlash()
+            }
+        }
+    }
+}

--- a/KanColleBrowserForOSX/ja.lproj/KCBFOMainWindowController.xib
+++ b/KanColleBrowserForOSX/ja.lproj/KCBFOMainWindowController.xib
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
-        <plugIn identifier="com.apple.WebKitIBPlugin" version="7706"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12121"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="KCBFOMainWindowController" customModule="KanColleBrowserForOSX" customModuleProvider="target">
             <connections>
                 <outlet property="clipView" destination="CE2-tS-wOP" id="e59-4N-ABH"/>
-                <outlet property="webView" destination="9oP-vl-4d9" id="S8P-5p-uZ0"/>
                 <outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
             </connections>
         </customObject>
@@ -20,7 +20,7 @@
             <rect key="contentRect" x="196" y="240" width="800" height="480"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1440" height="900"/>
             <view key="contentView" id="se5-gp-TjO">
-                <rect key="frame" x="0.0" y="6" width="800" height="480"/>
+                <rect key="frame" x="0.0" y="0.0" width="800" height="480"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <customView id="CE2-tS-wOP" customClass="NSClipView">
@@ -34,15 +34,5 @@
             </connections>
             <point key="canvasLocation" x="422" y="234"/>
         </window>
-        <webView id="9oP-vl-4d9">
-            <rect key="frame" x="0.0" y="0.0" width="6000" height="700"/>
-            <autoresizingMask key="autoresizingMask"/>
-            <webPreferences key="preferences" defaultFontSize="12" defaultFixedFontSize="12"/>
-            <connections>
-                <outlet property="UIDelegate" destination="-2" id="vms-hm-oFJ"/>
-                <outlet property="frameLoadDelegate" destination="-2" id="Qaq-jw-LUu"/>
-            </connections>
-            <point key="canvasLocation" x="199" y="1063"/>
-        </webView>
     </objects>
 </document>

--- a/KanColleBrowserForOSXTests/Info.plist
+++ b/KanColleBrowserForOSXTests/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.masakih.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

--- a/KanColleBrowserForOSXTests/KanColleBrowserForOSXTests.swift
+++ b/KanColleBrowserForOSXTests/KanColleBrowserForOSXTests.swift
@@ -28,7 +28,7 @@ class KanColleBrowserForOSXTests: XCTestCase {
     
     func testPerformanceExample() {
         // This is an example of a performance test case.
-        self.measureBlock() {
+        self.measure() {
             // Put the code you want to measure the time of here.
         }
     }