diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-09-15 13:15:47 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-09-15 13:18:21 -0400 |
| commit | 269c6925ded8145aaea1f8ccdbb747f65f076131 (patch) | |
| tree | 53baca2cb95215158d98e008614f4e7ab5e79e95 /Remote/External | |
| parent | 1890f6ee7a791db909055b4760919e6979ddd3ae (diff) | |
implement removeExportDirectory
Not yet called by Command.Export.
WebDAV needs this to clean up empty collections. Also, example.sh turned
out to not be cleaning up directories when removing content
from them, so it made sense for it to use this.
Remote.Directory did not need it, and since its cleanup method for empty
directories is more efficient than what Command.Export will need to do
to find empty directories, it uses Nothing so that extra work can be
avoided.
This commit was sponsored by Thom May on Patreon.
Diffstat (limited to 'Remote/External')
| -rw-r--r-- | Remote/External/Types.hs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/Remote/External/Types.hs b/Remote/External/Types.hs index 343004a85..01e44b3a7 100644 --- a/Remote/External/Types.hs +++ b/Remote/External/Types.hs @@ -36,7 +36,7 @@ import Types.StandardGroups (PreferredContentExpression) import Utility.Metered (BytesProcessed(..)) import Types.Transfer (Direction(..)) import Config.Cost (Cost) -import Types.Remote (RemoteConfig, ExportLocation(..)) +import Types.Remote (RemoteConfig, ExportLocation(..), ExportDirectory(..)) import Types.Availability (Availability(..)) import Types.Key import Utility.Url (URLString) @@ -121,6 +121,7 @@ data Request | TRANSFEREXPORT Direction SafeKey FilePath | CHECKPRESENTEXPORT SafeKey | REMOVEEXPORT SafeKey + | REMOVEEXPORTDIRECTORY ExportDirectory | RENAMEEXPORT SafeKey ExportLocation deriving (Show) @@ -160,6 +161,8 @@ instance Proto.Sendable Request where [ "CHECKPRESENTEXPORT", Proto.serialize key ] formatMessage (REMOVEEXPORT key) = [ "REMOVEEXPORT", Proto.serialize key ] + formatMessage (REMOVEEXPORTDIRECTORY dir) = + [ "REMOVEEXPORTDIRECTORY", Proto.serialize dir ] formatMessage (RENAMEEXPORT key newloc) = [ "RENAMEEXPORT" , Proto.serialize key @@ -190,6 +193,8 @@ data Response | WHEREIS_FAILURE | EXPORTSUPPORTED_SUCCESS | EXPORTSUPPORTED_FAILURE + | REMOVEEXPORTDIRECTORY_SUCCESS + | REMOVEEXPORTDIRECTORY_FAILURE | RENAMEEXPORT_SUCCESS Key | RENAMEEXPORT_FAILURE Key | UNSUPPORTED_REQUEST @@ -218,6 +223,8 @@ instance Proto.Receivable Response where parseCommand "WHEREIS-FAILURE" = Proto.parse0 WHEREIS_FAILURE parseCommand "EXPORTSUPPORTED-SUCCESS" = Proto.parse0 EXPORTSUPPORTED_SUCCESS parseCommand "EXPORTSUPPORTED-FAILURE" = Proto.parse0 EXPORTSUPPORTED_FAILURE + parseCommand "REMOVEEXPORTDIRECTORY-SUCCESS" = Proto.parse0 REMOVEEXPORTDIRECTORY_SUCCESS + parseCommand "REMOVEEXPORTDIRECTORY-FAILURE" = Proto.parse0 REMOVEEXPORTDIRECTORY_FAILURE parseCommand "RENAMEEXPORT-SUCCESS" = Proto.parse1 RENAMEEXPORT_SUCCESS parseCommand "RENAMEEXPORT-FAILURE" = Proto.parse1 RENAMEEXPORT_FAILURE parseCommand "UNSUPPORTED-REQUEST" = Proto.parse0 UNSUPPORTED_REQUEST @@ -352,3 +359,7 @@ instance Proto.Serializable URI where instance Proto.Serializable ExportLocation where serialize (ExportLocation loc) = loc deserialize = Just . ExportLocation + +instance Proto.Serializable ExportDirectory where + serialize (ExportDirectory loc) = loc + deserialize = Just . ExportDirectory |