
Added git-remote-p2p-annex, which allows git pull and push to P2P networks provided by external commands. This is a refactor of git-remote-tor-annex, and should just work. Except possibly for quirks with the address parsing. I've checked that the address parsing basically works. One thing I don't understand is why git-remote-tor-annex removes "/*" from the end of the address. The git history does not provide any hints. So I didn't make git-remote-p2p-annex do the same. Maybe that is needed in some situation? But, a P2P address could contain "/", so removing it would be a problem. I can't see anything in gitremote-helpers(7) about why the url might get such a thing added to the end of it. My guess is that is not needed for tor either (but does no harm there since onion addresses never contain "/"). At this point, the implementation of generic P2P transports needs only remotedaemon support.
30 lines
789 B
Haskell
30 lines
789 B
Haskell
{- git-remote-tor-annex program
|
|
-
|
|
- Copyright 2016 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
|
-}
|
|
|
|
module CmdLine.GitRemoteTorAnnex where
|
|
|
|
import Common
|
|
import Utility.Tor
|
|
import P2P.Address
|
|
import CmdLine.GitRemoteP2PAnnex (runner)
|
|
|
|
run :: [String] -> IO ()
|
|
run = runner mkaddress
|
|
where
|
|
mkaddress address =
|
|
let (onionaddress, onionport)
|
|
| '/' `elem` address = parseAddressPort $
|
|
reverse $ takeWhile (/= '/') $ reverse address
|
|
| otherwise = parseAddressPort address
|
|
in TorAnnex onionaddress onionport
|
|
|
|
parseAddressPort :: String -> (OnionAddress, OnionPort)
|
|
parseAddressPort s =
|
|
let (a, sp) = separate (== ':') s
|
|
in case readish sp of
|
|
Nothing -> giveup "onion address must include port number"
|
|
Just p -> (OnionAddress a, p)
|