No longer use </> to construct REST requests, it'll insert backslashe…

…s on Windows
blitzcode · Mar 20, 2017 · c8e8f6b · c8e8f6b
1 parent 1b15a40
commit c8e8f6b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/HueREST.hs b/HueREST.hs
@@ -16,7 +16,6 @@ import Control.Monad.IO.Class
 import Control.Monad.Catch
 import Data.Aeson
 import Data.Monoid
-import System.FilePath ((</>))
 import Network.HTTP.Simple
 
 import Util
@@ -49,8 +48,8 @@ bridgeRequest :: forall m a body. (MonadIO m, MonadThrow m, FromJSON a, ToJSON b
               -> String
               -> m a
 bridgeRequest method bridgeIP mbBody userID apiEndPoint = do
-    request' <- parseRequest $ show method <> " http://" <> fromIPAddress bridgeIP </> "api"
-                               </> fromBridgeUserID userID </> apiEndPoint
+    request' <- parseRequest $ show method <> " http://" <> fromIPAddress bridgeIP <> "/api/"
+                               <> fromBridgeUserID userID <> "/" <> apiEndPoint
     let request = case mbBody of
                       Just j  -> setRequestBodyJSON j request'
                       Nothing -> request'

diff --git a/WebUIREST.hs b/WebUIREST.hs
@@ -13,6 +13,7 @@ module WebUIREST ( lightsSetState
                  , switchAllLights
                  ) where
 
+import Data.Monoid
 import Data.Aeson
 import Data.Vector ()
 import qualified Data.HashMap.Strict as HM
@@ -21,7 +22,6 @@ import Control.Concurrent.Async
 import Control.Lens hiding ((<.>))
 import Control.Monad
 import Control.Monad.Reader
-import System.FilePath
 
 import Util
 import PersistConfig
@@ -48,7 +48,7 @@ lightsSetState bridgeIP userID lightIDs body =
                 bridgeIP
                 (Just body)
                 userID
-                ("lights" </> fromLightID lightID </> "state")
+                ("lights/" <> fromLightID lightID <> "/state")
 
 lightsSetScene :: MonadIO m
                => IPAddress
@@ -64,7 +64,7 @@ lightsSetScene bridgeIP userID scene =
                 bridgeIP
                 (Just lightState)
                 userID
-                ("lights" </> fromLightID lightID </> "state")
+                ("lights/" <> fromLightID lightID <> "/state")
 
 lightsSwitchOnOff :: MonadIO m => IPAddress -> BridgeUserID -> [LightID] -> Bool -> m ()
 lightsSwitchOnOff bridgeIP userID lightIDs onOff =
@@ -180,5 +180,5 @@ switchAllLights bridgeIP userID onOff =
                 bridgeIP
                 (Just body)
                 userID
-                ("groups" </> "0" </> "action") -- Special group 0, all lights
+                "groups/0/action" -- Special group 0, all lights