Compare text

Find the difference between two text files

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

Tools

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

Untitled diff

Created 10 years agoDiff never expires

Lines
Total
Removed

Words
Total
Removed

To continue using this feature, upgrade to Diffchecker Pro View Pricing

48 lines

Lines
Total
Added

Words
Total
Added

To continue using this feature, upgrade to Diffchecker Pro View Pricing

80 lines

import Control.Concurrent.STM

import Control.Concurrent.STM.TVar

import System.Directory

import System.Environment (getArgs)

import System.INotify

import System.IO

data Config =

Config

{ confCabalFile :: FilePath

, confWorking :: Bool

} deriving (Show,Read)

main = do

args <- getArgs

let dir = head args

putStrLn $ "Watching directory: " ++ dir

contents <- getDirectoryContents dir

let contents' = filter filterCabal contents

case contents' of

(x:_) -> runThread x dir

[] -> do

putStrLn "No cabal file found!"

putStrLn "Exiting"

runThread cabal dir = do

config <- newTVarIO $ Config cabal False

n <- initINotify

putStrLn "Press <Enter> to exit"

print n

wd <- addWatch n

[ Modify, CloseWrite, Create, Delete, MoveIn, MoveOut ]

dir

eventHandler

(eventHandler config)

print wd

getLine

removeWatch wd

killINotify n

eventHandler :: Event -> IO ()

eventHandler :: TVar Config -> Event -> IO ()

eventHandler x@(Modified _ (Just fp)) = handleFilteredFile x fp

eventHandler conf x@(Modified _ (Just fp)) = handleFilteredFile conf x fp

eventHandler x@(MovedIn _ fp _) = handleFilteredFile x fp

eventHandler conf x@(MovedIn _ fp _) = handleFilteredFile conf x fp

eventHandler x@(MovedOut _ fp _) = handleFilteredFile x fp

eventHandler conf x@(MovedOut _ fp _) = handleFilteredFile conf x fp

eventHandler x@(Created _ fp) = handleFilteredFile x fp

eventHandler conf x@(Created _ fp) = handleFilteredFile conf x fp

eventHandler x@(Deleted _ fp) = handleFilteredFile x fp

eventHandler conf x@(Deleted _ fp) = handleFilteredFile conf x fp

eventHandler _ = return ()

eventHandler _ _ = return ()

handleFilteredFile evt fp = do

handleFilteredFile conf evt fp = do

if filterHS fp

then print evt >> doWork fp

then print evt >> doWork conf fp

else return ()

filterHS fp = (== "hs")

filterHS fp = fileExt fp == "hs"

$ reverse

filterCabal fp = fileExt fp == "cabal"

$ takeWhile (/= '.')

$ reverse fp

doWork :: FilePath -> IO ()

fileExt = reverse

doWork fp = return ()

. takeWhile (/= '.')

. reverse

doWork :: TVar Config -> FilePath -> IO ()

doWork conf fp = do

config <- readTVarIO conf

if confWorking config

then do

print "Already working!"

return ()

else do

print "New work available!"

atomically $ writeTVar conf (config { confWorking = True })

return ()

Saved diffs

Original text

Open file

import System.Directory
import System.Environment (getArgs)
import System.INotify
import System.IO

main = do
  args <- getArgs
  let dir = head args
  putStrLn $ "Watching directory: " ++ dir
  n <- initINotify
  putStrLn "Press <Enter> to exit"
  print n
  wd <- addWatch n
                 [ Modify, CloseWrite, Create, Delete, MoveIn, MoveOut ]
                 dir
                 eventHandler
  print wd
  getLine
  removeWatch wd
  killINotify n

eventHandler :: Event -> IO ()
eventHandler x@(Modified _ (Just fp)) = handleFilteredFile x fp
eventHandler x@(MovedIn _ fp _) = handleFilteredFile x fp
eventHandler x@(MovedOut _ fp _) = handleFilteredFile x fp
eventHandler x@(Created _ fp) = handleFilteredFile x fp
eventHandler x@(Deleted _ fp) = handleFilteredFile x fp
eventHandler _ = return ()

handleFilteredFile evt fp = do
  if filterHS fp
    then print evt >> doWork fp
    else return ()

filterHS fp = (== "hs")
            $ reverse
            $ takeWhile (/= '.')
            $ reverse fp

doWork :: FilePath -> IO ()
doWork fp = return ()

Changed text

Open file

import Control.Concurrent.STM
import Control.Concurrent.STM.TVar
import System.Directory
import System.Environment (getArgs)
import System.INotify
import System.IO

data Config =
  Config
    { confCabalFile :: FilePath
    , confWorking :: Bool
    } deriving (Show,Read)

main = do
  args <- getArgs
  let dir = head args
  putStrLn $ "Watching directory: " ++ dir
  contents <- getDirectoryContents dir
  let contents' = filter filterCabal contents
  case contents' of
    (x:_) -> runThread x dir
    [] -> do
      putStrLn "No cabal file found!"
      putStrLn "Exiting"

runThread cabal dir = do
  config <- newTVarIO $ Config cabal False
  n <- initINotify
  putStrLn "Press <Enter> to exit"
  print n
  wd <- addWatch n
                 [ Modify, CloseWrite, Create, Delete, MoveIn, MoveOut ]
                 dir
                 (eventHandler config)
  print wd
  getLine
  removeWatch wd
  killINotify n

eventHandler :: TVar Config -> Event -> IO ()
eventHandler conf x@(Modified _ (Just fp)) = handleFilteredFile conf x fp
eventHandler conf x@(MovedIn _ fp _) = handleFilteredFile conf x fp
eventHandler conf x@(MovedOut _ fp _) = handleFilteredFile conf x fp
eventHandler conf x@(Created _ fp) = handleFilteredFile conf x fp
eventHandler conf x@(Deleted _ fp) = handleFilteredFile conf x fp
eventHandler _ _ = return ()

handleFilteredFile conf evt fp = do
  if filterHS fp
    then print evt >> doWork conf fp
    else return ()

filterHS fp = fileExt fp == "hs"
filterCabal fp = fileExt fp == "cabal"

fileExt = reverse
        . takeWhile (/= '.')
        . reverse

doWork :: TVar Config -> FilePath -> IO ()
doWork conf fp = do
  config <- readTVarIO conf
  if confWorking config
    then do
      print "Already working!"
      return ()
    else do
      print "New work available!"
      atomically $ writeTVar conf (config { confWorking = True })
      return ()