s464900/gonito
1
0
Fork 0
forked from filipg/gonito
Code Issues Pull Requests Projects Releases Wiki Activity

improve "branches" mode

Browse Source
This commit is contained in:
Filip Graliński 2018-06-06 13:08:38 +02:00
parent 92c0927dca
commit 115df0521d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Handler/MakePublic.hs
View File

@ -24,16 +24,20 @@ doMakePublic submissionId chan = do
runDB $ update submissionId [SubmissionIsPublic =. True] runDB $ update submissionId [SubmissionIsPublic =. True]
submission <- runDB $ get404 submissionId submission <- runDB $ get404 submissionId
challenge <- runDB $ get404 $ submissionChallenge submission challenge <- runDB $ get404 $ submissionChallenge submission
repo <- runDB $ get404 $ challengePublicRepo challenge
let submissionRepoId = submissionRepo submission let submissionRepoId = submissionRepo submission
submissionRepoDir <- getRepoDir submissionRepoId submissionRepoDir <- getRepoDir submissionRepoId
let targetRepoUrl = getPublicSubmissionUrl $ challengeName challenge
app <- getYesod
let scheme = appRepoScheme $ appSettings app
let targetRepoUrl = getPublicSubmissionUrl scheme (Just repo) $ challengeName challenge
let targetBranchName = getPublicSubmissionBranch submissionId let targetBranchName = getPublicSubmissionBranch submissionId
msg chan $ "Start pushing from " ++ (T.pack submissionRepoDir) ++ " to repo " ++ targetRepoUrl ++ ", branch " ++ targetBranchName ++ " ..." msg chan $ "Start pushing from " ++ (T.pack submissionRepoDir) ++ " to repo " ++ targetRepoUrl ++ ", branch " ++ targetBranchName ++ " ..."
let commit = submissionCommit submission let commit = submissionCommit submission
pushRepo submissionRepoDir commit (T.unpack $ targetRepoUrl) (T.unpack $ targetBranchName) chan pushRepo submissionRepoDir commit (T.unpack $ targetRepoUrl) (T.unpack $ targetBranchName) chan
return () return ()
pushRepo :: String -> SHA1 -> String -> String -> Channel -> Handler () pushRepo :: String -> SHA1 -> String -> String -> Channel -> Handler ()
pushRepo repoDir commit targetRepoUrl targetBranchName chan = do pushRepo repoDir commit targetRepoUrl targetBranchName chan = do
(exitCode, _) <- runProgram (Just repoDir) gitPath [ (exitCode, _) <- runProgram (Just repoDir) gitPath [

5
Handler/Shared.hs
View File

@ -62,8 +62,9 @@ gitReadOnlyServer = "git://" ++ serverAddress ++ "/"
getPublicSubmissionBranch :: SubmissionId -> Text getPublicSubmissionBranch :: SubmissionId -> Text
getPublicSubmissionBranch = T.pack . (printf "submission-%05d") . fromSqlKey getPublicSubmissionBranch = T.pack . (printf "submission-%05d") . fromSqlKey
getPublicSubmissionUrl :: Text -> Text getPublicSubmissionUrl :: RepoScheme -> Maybe Repo -> Text -> Text
getPublicSubmissionUrl bareRepoName = gitServer ++ bareRepoName getPublicSubmissionUrl SelfHosted _ bareRepoName = gitServer ++ bareRepoName
getPublicSubmissionUrl Branches (Just repo) _ = repoUrl repo
getReadOnlySubmissionUrl :: Text -> Text getReadOnlySubmissionUrl :: Text -> Text
getReadOnlySubmissionUrl bareRepoName = gitReadOnlyServer ++ bareRepoName getReadOnlySubmissionUrl bareRepoName = gitReadOnlyServer ++ bareRepoName