From 7c499bd3f7140397e4737292c4b87ad9e560fef1 Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Mon, 25 Sep 2023 10:18:00 +0200 Subject: universal-ctags: Add version path segment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … to the download URL. --- app/Main.hs | 9 ++++++--- app/SlackBuilder/Updater.hs | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/Main.hs b/app/Main.hs index 46256cc..5b888b4 100644 --- a/app/Main.hs +++ b/app/Main.hs @@ -39,7 +39,8 @@ autoUpdatable = let ghArguments = GhArguments{ owner = "universal-ctags", name = "ctags", transform = Nothing} latest' = latestGitHub ghArguments pure templateTail = - [ Package.StaticPlaceholder "/ctags-" + [ Package.VersionPlaceholder + , Package.StaticPlaceholder "/ctags-" , Package.VersionPlaceholder , Package.StaticPlaceholder ".tar.gz" ] @@ -56,8 +57,10 @@ autoUpdatable = up2Date :: SlackBuilderT () up2Date = for_ autoUpdatable go where - go package@Package{ latest = Package.Updater getLatest _ } = - getLatest >>= mapM_ (updatePackage package) + go package = getAndLogLatest package >>= mapM_ (updatePackage package) + getAndLogLatest Package{ latest = Package.Updater getLatest _, name } + = liftIO (putStrLn $ Text.unpack name <> ": Retreiving the latest version.") + >> getLatest updatePackage :: Package -> Text -> SlackBuilderT () updatePackage Package{..} version = do diff --git a/app/SlackBuilder/Updater.hs b/app/SlackBuilder/Updater.hs index 6663bb7..864e466 100644 --- a/app/SlackBuilder/Updater.hs +++ b/app/SlackBuilder/Updater.hs @@ -109,7 +109,7 @@ latestPackagist PackagistArguments{..} = do latestText :: TextArguments -> SlackBuilderT (Maybe Text) latestText (TextArguments textArguments) = do uri <- liftIO $ useHttpsURI <$> mkURI textArguments - packagistResponse <- traverse (runReq defaultHttpConfig) $ go . fst <$> uri + packagistResponse <- traverse (runReq defaultHttpConfig . go . fst) uri pure $ Text.strip . Text.Encoding.decodeASCII . responseBody <$> packagistResponse -- cgit v1.2.3