voidlizard
/
hbs2
mirror of https://github.com/voidlizard/hbs2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make a better report for invalid author argument in hbs2-sync init

This commit is contained in:
b0oh 2024-09-11 17:09:37 +07:00 committed by Dmitry Zuikov
parent ba5665fe2d
commit aa9355e7d7
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hbs2-sync/src/HBS2/Sync/Internal.hs
View File

@ -27,7 +27,7 @@ import Data.HashSet qualified as HS
import Data.List qualified as L import Data.List qualified as L
import Data.Map qualified as Map import Data.Map qualified as Map
import Lens.Micro.Platform import Lens.Micro.Platform
import System.Directory (setModificationTime,listDirectory,createDirectoryIfMissing) import System.Directory (listDirectory,createDirectoryIfMissing)
import System.Directory (XdgDirectory(..),getXdgDirectory) import System.Directory (XdgDirectory(..),getXdgDirectory)
import Control.Monad.Except import Control.Monad.Except
import Data.Ord import Data.Ord
@ -59,7 +59,10 @@ syncEntries = do
setLogging @DEBUG debugPrefix setLogging @DEBUG debugPrefix
entry $ bindMatch "init" $ nil_ $ \case entry $ bindMatch "init" $ nil_ $ \case
[StringLike "--auto", SignPubKeyLike author, StringLike readerRaw] -> do [StringLike "--auto", StringLike authorString, StringLike readerString] -> do
authorKey <- fromStringMay @(PubKey 'Sign HBS2Basic) authorString & orThrowUser "author not found"
readerKey <- fromStringMay @(PubKey 'Encrypt HBS2Basic) readerString & orThrowUser "reader not found"
peerApi <- getClientAPI @PeerAPI @UNIX peerApi <- getClientAPI @PeerAPI @UNIX
rchanApi <- getClientAPI @RefChanAPI @UNIX rchanApi <- getClientAPI @RefChanAPI @UNIX
storage <- getStorage storage <- getStorage
@ -69,15 +72,14 @@ syncEntries = do
<&> parseTop <&> parseTop
>>= orThrowUser "invalid hbs2-peer attributes" >>= orThrowUser "invalid hbs2-peer attributes"
key <- [ x peerKey <- [ x
| ListVal [SymbolVal "peer-key:", SignPubKeyLike x] <- poked | ListVal [SymbolVal "peer-key:", SignPubKeyLike x] <- poked
] & headMay & orThrowUser "hbs2-peer key not found" ] & headMay & orThrowUser "hbs2-peer key not found"
reader <- fromStringMay @(PubKey 'Encrypt HBS2Basic) readerRaw & orThrowUser "reader not found"
let chanData = refChanHeadDefault @L4Proto let chanData = refChanHeadDefault @L4Proto
& set refChanHeadPeers (HM.singleton key 1) & set refChanHeadPeers (HM.singleton peerKey 1)
& set refChanHeadAuthors (HS.singleton author) & set refChanHeadAuthors (HS.singleton authorKey)
& set refChanHeadReaders (HS.singleton reader) & set refChanHeadReaders (HS.singleton readerKey)
refchan <- keymanNewCredentials (Just "refchan") 0 refchan <- keymanNewCredentials (Just "refchan") 0
creds <- runKeymanClient $ loadCredentials refchan creds <- runKeymanClient $ loadCredentials refchan
@ -93,11 +95,10 @@ syncEntries = do
callService @RpcRefChanHeadPost rchanApi (HashRef href) callService @RpcRefChanHeadPost rchanApi (HashRef href)
>>= orThrowUser "can't post refchan head" >>= orThrowUser "can't post refchan head"
let signString = show $ pretty $ AsBase58 author
let refchanString = show $ pretty $ AsBase58 refchan let refchanString = show $ pretty $ AsBase58 refchan
let configForms :: [Syntax c] = [ mkList [mkSym "exclude", mkStr "**/.*"] let configForms :: [Syntax c] = [ mkList [mkSym "exclude", mkStr "**/.*"]
, mkList [mkSym "include", mkStr "**"] , mkList [mkSym "include", mkStr "**"]
, mkList [mkSym "sign", mkStr signString] , mkList [mkSym "sign", mkStr authorString]
, mkList [mkSym "refchan", mkStr refchanString] , mkList [mkSym "refchan", mkStr refchanString]
] ]
let config = unlines $ map (show . pretty) configForms let config = unlines $ map (show . pretty) configForms