Explorar o código

refactor: slight rewrite of log messages

Jocelyn Boullier %!s(int64=4) %!d(string=hai) anos
pai
achega
ae06920d3b

+ 14 - 7
src/Background.purs

@@ -75,17 +75,17 @@ initializeBackground ref = do
 
 onWindowCreated :: StateRef -> Window -> Effect Unit
 onWindowCreated ref { id: winId } = do
-  log $ "bg: created window " <> (show winId)
+  log $ "[bg] created window " <> (show winId)
   ref # Ref.modify_ (GS.addEmptyWindow winId)
 
 onWindowRemoved :: StateRef -> WindowId -> Effect Unit
 onWindowRemoved ref winId = do
-  log $ "bg: deleted window " <> (show winId)
+  log $ "[bg] deleted window " <> (show winId)
   ref # Ref.modify_ (GS.deleteWindow winId)
 
 onTabCreated :: StateRef -> Tab -> Effect Unit
 onTabCreated stateRef tab = do
-  log $ "bg: created tab " <> (BT.showTabId tab) 
+  log $ "[bg] created tab " <> (BT.showTabId tab) 
   state <- Ref.modify (GS.createTab tab) stateRef
   liftEffect $ GS.sendToTabPort tab state $ BgTabCreated tab
 
@@ -201,6 +201,7 @@ onNewWindowId port stateRef listenerRef winId = do
 
     in
       launchAff_ do
+         liftEffect $ log $ "[bg] initializing tabs"
          groups <- initialWindowGroups
          tabsWithGroup <- initialTabsGroups tabs groups
          liftEffect $ Runtime.postMessageJson port $ BgInitialTabList groups tabsWithGroup
@@ -267,10 +268,16 @@ manageSidebar ref winId port = case _ of
      updateGroupsMapping winId $ deleteGroup gid
 
   SbChangeTabGroup tid Nothing -> launchAff_ $ removeTabValue tid "groupId"
-  SbChangeTabGroup tid (Just gid) -> launchAff_ $ setTabValue tid "groupId" gid
-
-  SbCreatedGroup gid name -> launchAff_ $ updateGroupsMapping winId $ createGroup gid name
-  SbRenamedGroup gid name -> launchAff_ $ updateGroupsMapping winId $ renameGroup gid name
+  SbChangeTabGroup tid (Just gid) -> launchAff_ do
+    liftEffect $ log $ "[bg] moving tab " <> (show tid) <> " to group " <> (show gid) 
+    setTabValue tid "groupId" gid
+
+  SbCreatedGroup gid name -> launchAff_ do
+     liftEffect $ log $ "[bg] creating group " <> name <> " [" <> (show gid) <> "]"
+     updateGroupsMapping winId $ createGroup gid name
+  SbRenamedGroup gid name -> launchAff_ do
+     liftEffect $ log $ "[bg] renaming group to " <> name <> " [" <> (show gid) <> "]"
+     updateGroupsMapping winId $ renameGroup gid name
   SbMovedGroup gid pos -> launchAff_ $ updateGroupsMapping winId $ moveGroup gid pos
 
   SbDetacheTab -> pure unit

+ 3 - 3
src/Model/GlobalState.purs

@@ -162,13 +162,13 @@ sendToTabPort :: Tab -> GlobalState -> BackgroundEvent -> Effect Unit
 sendToTabPort tab state msg =
   case (preview (_portFromWindow tab) state) of 
        Just port -> postMessageJson port msg
-       Nothing -> error $ "bg: no port found for tab id " <> (showTabId tab)
+       Nothing -> error $ "[bg] no port found for tab id " <> (showTabId tab)
 
 sendToWindowPort :: WindowId -> GlobalState -> BackgroundEvent -> Effect Unit
 sendToWindowPort wid state event =
   case (preview (_portFromWindowId wid) state) of
     Just port -> postMessageJson port event
-    Nothing -> error $ "bg: no port found for window id " <> (show wid)
+    Nothing -> error $ "[bg] no port found for window id " <> (show wid)
 
 initialTabsToGlobalState :: Array Tab -> GlobalState
 initialTabsToGlobalState tabs = { windows: windows, detached: Nothing }
@@ -255,7 +255,7 @@ moveTab fromIndex toIndex windowId state =
     unsafeUpdatePositions =
       (moveElement fromIndex toIndex)
       -- The indexes should exist, we need to revisit the code if it doesn't
-      >>> (maybe' (\_ -> unsafeThrow "bg: invalid indexes during moveTab") identity)
+      >>> (maybe' (\_ -> unsafeThrow "[bg] invalid indexes during moveTab") identity)
 
     -- | Update the index of the tab given the positions.
     -- | This is done by folding over a map of index update function applied to all tabs.

+ 3 - 3
src/Sidebar/Components/Bar.purs

@@ -185,14 +185,14 @@ handleAction =
              dataTransfer = DE.dataTransfer dragEvent
          dragData <- H.liftEffect $ DT.getData textPlain dataTransfer
          case fromString dragData of
-              Nothing -> H.liftEffect $ log $ "sb: group drag over, got something else than a number: " <> dragData
+              Nothing -> H.liftEffect $ log $ "[sb] group drag over, got something else than a number: " <> dragData
               Just tid -> do 
                  H.modify_ _ { draggedCurrentGroup = Just gid }
-                 H.liftEffect $ log $ "sb: dragging " <> (show tid) <> " over " <> (show gid)
+                 H.liftEffect $ log $ "[sb] dragging " <> (show tid) <> " over " <> (show gid)
 
        DragEnd evt -> do 
           H.modify_ _ { draggedCurrentGroup = Nothing }
-          H.liftEffect $ log $ "sb: drag end from bar component"
+          H.liftEffect $ log $ "[sb] drag end from bar component"
 
        HandleTabsOutput gid output -> 
          case output of 

+ 7 - 7
src/Sidebar/Components/Tabs.purs

@@ -287,7 +287,7 @@ handleAction = case _ of
       $ do
           Event.preventDefault ev
           Event.stopPropagation ev
-          log "sb: closed a tab"
+          log "[sb] closed a tab"
     H.raise $ TabsSidebarAction $ SbDeleteTab tid
 
   UserActivatedTab tid ev -> do
@@ -295,7 +295,7 @@ handleAction = case _ of
       $ do
           Event.preventDefault ev
           Event.stopPropagation ev
-          log "sb: activated a tab"
+          log "[sb] activated a tab"
     H.raise $ TabsSidebarAction $ SbActivateTab tid
 
   UserOpenedTab tid ev -> do
@@ -303,7 +303,7 @@ handleAction = case _ of
       $ do
           Event.preventDefault ev
           Event.stopPropagation ev
-          log "sb: created a tab"
+          log "[sb] created a tab"
     H.raise $ TabsSidebarAction $ SbCreateTab tid
 
   -- Drag actions
@@ -315,7 +315,7 @@ handleAction = case _ of
           DT.setData textPlain (showTabId tab) dataTransfer
           DT.setDropEffect DT.Move dataTransfer
     H.modify_ _ { selectedElem = Just { tab: tab, originalIndex: index, overIndex: Just index } }
-    H.liftEffect $ log $ "sb: drag start from " <> (show index)
+    H.liftEffect $ log $ "[sb] drag start from " <> (show index)
 
   TabDragOver event index -> do
     -- prevent the ghost from flying back to its (wrong) place
@@ -351,12 +351,12 @@ handleAction = case _ of
       Just { tab: (Tab t), originalIndex, overIndex: (Just overIndex) } -> do
         H.raise $ TabsSidebarAction (SbMoveTab t.id overIndex)
         H.raise $ OutputTabDragEnd Nothing
-        H.liftEffect $ log "sb: drag end (asking to do a move)"
+        H.liftEffect $ log "[sb] drag end (asking to do a move)"
 
       Just { tab: (Tab t), overIndex: Nothing } -> do
         H.modify_ _ { selectedElem = Nothing }
         H.raise $ OutputTabDragEnd $ Just t.id
-        H.liftEffect $ log "sb: drag end (doing nothing)"
+        H.liftEffect $ log "[sb] drag end (doing nothing)"
 
   TabDragLeave event -> runDebounce $ TabDragLeaveRun event
 
@@ -419,7 +419,7 @@ handleQuery = case _ of
     handleQuery $ TabDeleted tid \_ -> reply
 
   TabAttached tab a -> do
-    H.liftEffect (log $ "sb: tab attached " <> (showTabId tab))
+    H.liftEffect (log $ "[sb] tab attached " <> (showTabId tab))
     handleQuery $ TabCreated tab a