diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2014-12-16 23:22:46 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2014-12-16 23:22:46 -0400 |
| commit | 7dcad535f2db4b1e5f89ae2d59496fd86bba977c (patch) | |
| tree | 7bc91205119c531fe29d1352cdf52719ebed11a7 /Types | |
| parent | 4556a7ce6c079f27f8f02b945829ad8d41dc5881 (diff) | |
Added bittorrent special remote
addurl behavior change: When downloading an url ending in .torrent,
it will download files from bittorrent, instead of the old behavior
of adding the torrent file to the repository.
Added Recommends on aria2 and bittornado | bittorrent.
This commit was sponsored by Asbjørn Sloth Tønnesen.
Diffstat (limited to 'Types')
| -rw-r--r-- | Types/CleanupActions.hs | 3 | ||||
| -rw-r--r-- | Types/GitConfig.hs | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Types/CleanupActions.hs b/Types/CleanupActions.hs index 498d5b4d7..fafa2ee00 100644 --- a/Types/CleanupActions.hs +++ b/Types/CleanupActions.hs @@ -9,9 +9,12 @@ module Types.CleanupActions where import Types.UUID +import Utility.Url + data CleanupAction = RemoteCleanup UUID | StopHook UUID | FsckCleanup | SshCachingCleanup + | TorrentCleanup URLString deriving (Eq, Ord) diff --git a/Types/GitConfig.hs b/Types/GitConfig.hs index deae1df37..3d89b0433 100644 --- a/Types/GitConfig.hs +++ b/Types/GitConfig.hs @@ -42,6 +42,7 @@ data GitConfig = GitConfig , annexDebug :: Bool , annexWebOptions :: [String] , annexQuviOptions :: [String] + , annexAriaTorrentOptions :: [String] , annexWebDownloadCommand :: Maybe String , annexCrippledFileSystem :: Bool , annexLargeFiles :: Maybe String @@ -77,6 +78,7 @@ extractGitConfig r = GitConfig , annexDebug = getbool (annex "debug") False , annexWebOptions = getwords (annex "web-options") , annexQuviOptions = getwords (annex "quvi-options") + , annexAriaTorrentOptions = getwords (annex "aria-torrent-options") , annexWebDownloadCommand = getmaybe (annex "web-download-command") , annexCrippledFileSystem = getbool (annex "crippledfilesystem") False , annexLargeFiles = getmaybe (annex "largefiles") |