From 2ccd9c5e7cf3266d2270741e1535d78350afcee9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Sun, 5 Apr 2015 12:50:02 -0400
Subject: rethought distributed fsck; instead add activity.log and expire
 command

This is much more space efficient!
---
 Logs/Activity.hs | 37 +++++++++++++++++++++++++++++++++++++
 Logs/Location.hs |  1 -
 Logs/Presence.hs |  4 ----
 3 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 Logs/Activity.hs

(limited to 'Logs')

diff --git a/Logs/Activity.hs b/Logs/Activity.hs
new file mode 100644
index 000000000..45262a633
--- /dev/null
+++ b/Logs/Activity.hs
@@ -0,0 +1,37 @@
+{- git-annex activity log
+ -
+ - Copyright 2015 Joey Hess <id@joeyh.name>
+ -
+ - Licensed under the GNU GPL version 3 or higher.
+ -}
+
+module Logs.Activity (
+	Log,
+	Activity(..),
+	recordActivity,
+	lastActivities,
+) where
+
+import Data.Time.Clock.POSIX
+
+import Common.Annex
+import qualified Annex.Branch
+import Logs
+import Logs.UUIDBased
+
+data Activity = Fsck
+	deriving (Eq, Read, Show, Enum, Bounded)
+
+recordActivity :: Activity -> UUID -> Annex ()
+recordActivity act uuid = do
+	ts <- liftIO getPOSIXTime
+	Annex.Branch.change activityLog $
+		showLog id . changeLog ts uuid (show act) . parseLog readish
+
+lastActivities :: Maybe Activity -> Annex (Log Activity)
+lastActivities wantact = parseLog onlywanted <$> Annex.Branch.get activityLog
+  where
+	onlywanted s = case readish s of
+		Just a | wanted a -> Just a
+		_ -> Nothing
+	wanted a = maybe True (a ==) wantact
diff --git a/Logs/Location.hs b/Logs/Location.hs
index 59375a512..391edb680 100644
--- a/Logs/Location.hs
+++ b/Logs/Location.hs
@@ -17,7 +17,6 @@ module Logs.Location (
 	LogStatus(..),
 	logStatus,
 	logChange,
-	logChange',
 	loggedLocations,
 	loggedLocationsHistorical,
 	locationLog,
diff --git a/Logs/Presence.hs b/Logs/Presence.hs
index 469ed8de9..60e0c542a 100644
--- a/Logs/Presence.hs
+++ b/Logs/Presence.hs
@@ -16,7 +16,6 @@ module Logs.Presence (
 	addLog,
 	readLog,
 	logNow,
-	logThen,
 	currentLog,
 	currentLogInfo,
 	historicalLogInfo,
@@ -44,9 +43,6 @@ logNow s i = do
 	now <- liftIO getPOSIXTime
 	return $ LogLine now s i
 
-logThen :: POSIXTime -> LogStatus -> String -> Annex LogLine
-logThen t s i = return $ LogLine t s i
-
 {- Reads a log and returns only the info that is still in effect. -}
 currentLogInfo :: FilePath -> Annex [String]
 currentLogInfo file = map info <$> currentLog file
-- 
cgit v1.2.3