Diff
checker
Text
Text
Bilder
Dokumente
Excel
Ordner
Legal
Enterprise
Desktop-App
Preise
Einloggen
Diffchecker Desktop herunterladen
Texte vergleichen
Finde den Unterschied zwischen zwei Textdateien
Werkzeuge
Verlauf
Live-Editor
Gleiches ausblenden
Zeilenumbruch aus
Ansicht
Zweispaltig
Einspaltig
Vergleichsgenauigkeit
Intelligent
Wort
Zeichen
Syntaxhervorhebung
Syntax auswählen
Ignorieren
Text umwandeln
Zur ersten Änderung
Eingabe bearbeiten
Diffchecker Desktop
Der sicherste Weg, Diffchecker zu nutzen. Hol dir die Desktop-App: Deine Diffs verlassen nie deinen Computer!
Desktop holen
Untitled diff
Erstellt
vor 11 Jahren
Diff läuft nie ab
Löschen
Exportieren
Teilen
Erklären
12 Entfernungen
Zeilen
Gesamt
Entfernt
Zeichen
Gesamt
Entfernt
Um diese Funktion weiterhin zu nutzen, aktualisiere auf
Diff
checker
Pro
Preise anzeigen
80 Zeilen
Kopieren
49 Hinzufügungen
Zeilen
Gesamt
Hinzugefügt
Zeichen
Gesamt
Hinzugefügt
Um diese Funktion weiterhin zu nutzen, aktualisiere auf
Diff
checker
Pro
Preise anzeigen
120 Zeilen
Kopieren
Kopieren
Kopiert
Kopieren
Kopiert
import Control.Concurrent
import Control.Concurrent.STM
import Control.Concurrent.STM
import Control.Concurrent.STM.TVar
import Control.Concurrent.STM.TVar
Kopieren
Kopiert
Kopieren
Kopiert
import Control.Monad
import System.Directory
import System.Directory
import System.Environment (getArgs)
import System.Environment (getArgs)
Kopieren
Kopiert
Kopieren
Kopiert
import System.Exit
import System.INotify
import System.INotify
import System.IO
import System.IO
Kopieren
Kopiert
Kopieren
Kopiert
import System.Process
data Config =
data Config =
Config
Config
Kopieren
Kopiert
Kopieren
Kopiert
{
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
Kopieren
Kopiert
Kopieren
Kopiert
let cabalOutput = args !! 1
putStrLn $ "Watching directory: " ++ dir
putStrLn $ "Watching directory: " ++ dir
Kopieren
Kopiert
Kopieren
Kopiert
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
Kopieren
Kopiert
Kopieren
Kopiert
(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"
Kopieren
Kopiert
Kopieren
Kopiert
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 ()
Kopieren
Kopiert
Kopieren
Kopiert
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
Kopieren
Kopiert
Kopieren
Kopiert
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 })
Kopieren
Kopiert
Kopieren
Kopiert
_ <- forkIO $ runCI conf
return ()
return ()
Kopieren
Kopiert
Kopieren
Kopiert
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
Gespeicherte Diffs
Originaltext
Datei öffnen
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 ()
Bearbeitung
Datei öffnen
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
Unterschied finden