81b381d · jsaddle · git.iko.soy

git.iko.soy/jsaddle

on master help sign in

iOS and Mac OS mainBundleResourcePath

81b381dHamish Mackenzie10 years ago

jsaddle-wkwebview/cbits/WKWebView.m+8

compare with master

unifiedsplit

@@ -53,6 +53,14 @@ void loadHTMLString(WKWebView *webView, const char * _Nonnull html) {

53 [webView loadHTMLString:[NSString stringWithCString:html encoding:NSUTF8StringEncoding] baseURL:NULL];

54}

56+const char * mainBundleResourcePathC() {

57+ NSBundle *main = [NSBundle mainBundle];

58+ if(!main) return NULL;

59+ NSString *path = main.resourcePath;

60+ if(!path) return NULL;

61+ return [path UTF8String];

62+}

63+

56void loadBundleFile(WKWebView *webView, const char * _Nonnull file, const char * _Nonnull allowing) {

64void loadBundleFile(WKWebView *webView, const char * _Nonnull file, const char * _Nonnull allowing) {

57 NSBundle *main = [NSBundle mainBundle];

65 NSBundle *main = [NSBundle mainBundle];

58 if(main) {

66 if(main) {

jsaddle-wkwebview/src-ghc/Language/Javascript/JSaddle/WKWebView.hs+2−1

@@ -4,10 +4,11 @@ module Language.Javascript.JSaddle.WKWebView

4 , WKWebView(..)

5 , run

6 , runFile

7+ , mainBundleResourcePath

7 ) where

8 ) where

9import Data.ByteString (ByteString)

10import Data.ByteString (ByteString)

10−import Language.Javascript.JSaddle.WKWebView.Internal (jsaddleMain, jsaddleMainFile, WKWebView(..))

11+import Language.Javascript.JSaddle.WKWebView.Internal (jsaddleMain, jsaddleMainFile, WKWebView(..), mainBundleResourcePath)

11import System.Environment (getProgName)

12import System.Environment (getProgName)

12import Foreign.C.String (CString, withCString)

13import Foreign.C.String (CString, withCString)

13import Foreign.StablePtr (StablePtr, newStablePtr)

14import Foreign.StablePtr (StablePtr, newStablePtr)

jsaddle-wkwebview/src/Language/Javascript/JSaddle/WKWebView/Internal.hs+10−1

@@ -3,6 +3,7 @@ module Language.Javascript.JSaddle.WKWebView.Internal

3 ( jsaddleMain

4 , jsaddleMainFile

5 , WKWebView(..)

6+ , mainBundleResourcePath

6 ) where

7 ) where

8import Control.Monad (void, join)

9import Control.Monad (void, join)

@@ -15,7 +16,7 @@ import Data.ByteString.Lazy (ByteString, toStrict, fromStrict)

15import Data.Aeson (encode, decode)

16import Data.Aeson (encode, decode)

17import Foreign.C.String (CString)

18import Foreign.C.String (CString)

18−import Foreign.Ptr (Ptr)

19+import Foreign.Ptr (Ptr, nullPtr)

19import Foreign.StablePtr (StablePtr, newStablePtr, deRefStablePtr)

20import Foreign.StablePtr (StablePtr, newStablePtr, deRefStablePtr)

21import Language.Javascript.JSaddle (Results, JSM)

22import Language.Javascript.JSaddle (Results, JSM)

@@ -31,6 +32,7 @@ foreign import ccall addJSaddleHandler :: WKWebView -> StablePtr (IO ()) -> Stab

31foreign import ccall loadHTMLString :: WKWebView -> CString -> IO ()

32foreign import ccall loadHTMLString :: WKWebView -> CString -> IO ()

32foreign import ccall loadBundleFile :: WKWebView -> CString -> CString -> IO ()

33foreign import ccall loadBundleFile :: WKWebView -> CString -> CString -> IO ()

33foreign import ccall evaluateJavaScript :: WKWebView -> CString -> IO ()

34foreign import ccall evaluateJavaScript :: WKWebView -> CString -> IO ()

35+foreign import ccall mainBundleResourcePathC :: IO CString

35-- | Run JSaddle in WKWebView

37-- | Run JSaddle in WKWebView

36jsaddleMain :: JSM () -> WKWebView -> IO ()

38jsaddleMain :: JSM () -> WKWebView -> IO ()

@@ -99,3 +101,10 @@ indexHtml =

99 \<body>\n\

101 \<body>\n\

100 \</body>\n\

102 \</body>\n\

101 \</html>"

103 \</html>"

104+

105+mainBundleResourcePath :: IO (Maybe BS.ByteString)

106+mainBundleResourcePath = do

107+ bs <- mainBundleResourcePathC

108+ if bs == nullPtr

109+ then return Nothing

110+ else Just <$> packCString bs