Diff
checker
Texte
Texte
Images
Documents
Excel
Dossiers
Legal
Enterprise
Application de bureau
Prix
Se connecter
Télécharger Diffchecker Desktop
Comparer le texte
Trouver la différence entre deux fichiers texte
Outils
Historique
Éditeur live
Cacher identiques
Sans retour à la ligne
Vue
Divisé
Unifié
Niveau de précision
Intelligent
Mot
Caractère
Coloration syntaxique
Choisir la syntaxe
Ignorer
Transformer le texte
Aller au premier écart
Modifier l'entrée
Diffchecker Desktop
La façon la plus sécurisée d'utiliser Diffchecker. Obtenez l'application Diffchecker Desktop : vos diffs ne quittent jamais votre ordinateur !
Obtenir Desktop
Untitled diff
Créé
il y a 11 ans
Le diff n'expire jamais
Effacer
Exporter
Partager
Expliquer
12 suppressions
Lignes
Total
Supprimé
Caractères
Total
Supprimé
Pour continuer à utiliser cette fonctionnalité, passez à
Diff
checker
Pro
Voir les prix
80 lignes
Copier tout
49 ajouts
Lignes
Total
Ajouté
Caractères
Total
Ajouté
Pour continuer à utiliser cette fonctionnalité, passez à
Diff
checker
Pro
Voir les prix
120 lignes
Copier tout
Copier
Copié
Copier
Copié
import Control.Concurrent
import Control.Concurrent.STM
import Control.Concurrent.STM
import Control.Concurrent.STM.TVar
import Control.Concurrent.STM.TVar
Copier
Copié
Copier
Copié
import Control.Monad
import System.Directory
import System.Directory
import System.Environment (getArgs)
import System.Environment (getArgs)
Copier
Copié
Copier
Copié
import System.Exit
import System.INotify
import System.INotify
import System.IO
import System.IO
Copier
Copié
Copier
Copié
import System.Process
data Config =
data Config =
Config
Config
Copier
Copié
Copier
Copié
{
confCabalFile :: FilePath
{
confOutputFile :: FilePath
,
confCabalFile :: FilePath
, confWorking :: Bool
, confWorking :: Bool
} deriving (Show,Read)
} deriving (Show,Read)
main = do
main = do
args <- getArgs
args <- getArgs
let dir = head args
let dir = head args
Copier
Copié
Copier
Copié
let cabalOutput = args !! 1
putStrLn $ "Watching directory: " ++ dir
putStrLn $ "Watching directory: " ++ dir
Copier
Copié
Copier
Copié
putStrLn $ "Cabal output file: " ++ cabalOutput
contents <- getDirectoryContents dir
contents <- getDirectoryContents dir
let contents' = filter filterCabal contents
let contents' = filter filterCabal contents
case contents' of
case contents' of
Copier
Copié
Copier
Copié
(x:_) ->
runThread
x
dir
(x:_) ->
do
let config = Config cabalOutput x False
runThread
config
dir
[] -> do
[] -> do
putStrLn "No cabal file found!"
putStrLn "No cabal file found!"
putStrLn "Exiting"
putStrLn "Exiting"
Copier
Copié
Copier
Copié
runThread
cabal
dir = do
runThread
config
dir = do
config <- newTVarIO
$ C
onfig
cabal False
config <- newTVarIO
c
onfig
n <- initINotify
n <- initINotify
putStrLn "Press <Enter> to exit"
putStrLn "Press <Enter> to exit"
print n
print n
wd <- addWatch n
wd <- addWatch n
[ Modify, CloseWrite, Create, Delete, MoveIn, MoveOut ]
[ Modify, CloseWrite, Create, Delete, MoveIn, MoveOut ]
dir
dir
(eventHandler config)
(eventHandler config)
print wd
print wd
getLine
getLine
removeWatch wd
removeWatch wd
killINotify n
killINotify n
eventHandler :: TVar Config -> Event -> IO ()
eventHandler :: TVar Config -> Event -> IO ()
eventHandler conf x@(Modified _ (Just fp)) = handleFilteredFile conf x fp
eventHandler conf x@(Modified _ (Just fp)) = handleFilteredFile conf x fp
eventHandler conf x@(MovedIn _ 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@(MovedOut _ fp _) = handleFilteredFile conf x fp
eventHandler conf x@(Created _ fp) = handleFilteredFile conf x fp
eventHandler conf x@(Created _ fp) = handleFilteredFile conf x fp
eventHandler conf x@(Deleted _ fp) = handleFilteredFile conf x fp
eventHandler conf x@(Deleted _ fp) = handleFilteredFile conf x fp
eventHandler _ _ = return ()
eventHandler _ _ = return ()
Copier
Copié
Copier
Copié
handleFilteredFile conf evt fp =
do
handleFilteredFile conf evt fp =
if
filterHS fp
when (
filterHS fp
) $
print evt >> doWork conf
then
print evt >> doWork conf
fp
else return ()
filterHS fp = fileExt fp == "hs"
filterHS fp = fileExt fp == "hs"
filterCabal fp = fileExt fp == "cabal"
filterCabal fp = fileExt fp == "cabal"
fileExt = reverse
fileExt = reverse
. takeWhile (/= '.')
. takeWhile (/= '.')
. reverse
. reverse
Copier
Copié
Copier
Copié
doWork :: TVar Config ->
FilePath ->
IO ()
doWork :: TVar Config ->
IO ()
doWork conf
fp
= do
doWork conf
= do
config <- readTVarIO conf
config <- readTVarIO conf
if confWorking config
if confWorking config
then do
then do
print "Already working!"
print "Already working!"
return ()
return ()
else do
else do
print "New work available!"
print "New work available!"
atomically $ writeTVar conf (config { confWorking = True })
atomically $ writeTVar conf (config { confWorking = True })
Copier
Copié
Copier
Copié
_ <- forkIO $ runCI conf
return ()
return ()
Copier
Copié
Copier
Copié
runCI :: TVar Config -> IO ()
runCI conf = do
runCIChain conf
config <- readTVarIO conf
atomically $ writeTVar conf (config { confWorking = False })
return ()
runCIChain :: TVar Config -> IO ()
runCIChain conf = do
cabalBuild <- runCabal conf ["build"]
print $ "*** cabal build result: " ++ show cabalBuild
case cabalBuild of
False -> return ()
True -> do
cabalTest <- runCabal conf ["test"]
print $ "*** cabal test result: " ++ show cabalTest
runCabal :: TVar Config -> [String] -> IO Bool
runCabal conf args = do
(code, out, err) <- readProcessWithExitCode "cabal" args ""
config <- readTVarIO conf
let outputFile = confOutputFile config
_ <- when (out /= []) $ appendFile outputFile out
_ <- when (err /= []) $ appendFile outputFile err
case code of
ExitSuccess -> return True
ExitFailure _ -> return False
Différences enregistrées
Texte d'origine
Ouvrir un fichier
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 ()
Texte modifié
Ouvrir un fichier
import Control.Concurrent import Control.Concurrent.STM import Control.Concurrent.STM.TVar import Control.Monad import System.Directory import System.Environment (getArgs) import System.Exit import System.INotify import System.IO import System.Process data Config = Config { confOutputFile :: FilePath , confCabalFile :: FilePath , confWorking :: Bool } deriving (Show,Read) main = do args <- getArgs let dir = head args let cabalOutput = args !! 1 putStrLn $ "Watching directory: " ++ dir putStrLn $ "Cabal output file: " ++ cabalOutput contents <- getDirectoryContents dir let contents' = filter filterCabal contents case contents' of (x:_) -> do let config = Config cabalOutput x False runThread config dir [] -> do putStrLn "No cabal file found!" putStrLn "Exiting" runThread config dir = do config <- newTVarIO config 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 = when (filterHS fp) $ print evt >> doWork conf filterHS fp = fileExt fp == "hs" filterCabal fp = fileExt fp == "cabal" fileExt = reverse . takeWhile (/= '.') . reverse doWork :: TVar Config -> IO () doWork conf = 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 }) _ <- forkIO $ runCI conf return () runCI :: TVar Config -> IO () runCI conf = do runCIChain conf config <- readTVarIO conf atomically $ writeTVar conf (config { confWorking = False }) return () runCIChain :: TVar Config -> IO () runCIChain conf = do cabalBuild <- runCabal conf ["build"] print $ "*** cabal build result: " ++ show cabalBuild case cabalBuild of False -> return () True -> do cabalTest <- runCabal conf ["test"] print $ "*** cabal test result: " ++ show cabalTest runCabal :: TVar Config -> [String] -> IO Bool runCabal conf args = do (code, out, err) <- readProcessWithExitCode "cabal" args "" config <- readTVarIO conf let outputFile = confOutputFile config _ <- when (out /= []) $ appendFile outputFile out _ <- when (err /= []) $ appendFile outputFile err case code of ExitSuccess -> return True ExitFailure _ -> return False
Trouver la différence