From a25655c2b24535eb1c8bfce61159d9b37200074f Mon Sep 17 00:00:00 2001
From: Eugen Wissner <belka@caraus.de>
Date: Mon, 1 Jan 2024 19:44:45 +0100
Subject: Move latest version checker to a separate module

---
 src/Main.hs | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

(limited to 'src/Main.hs')

diff --git a/src/Main.hs b/src/Main.hs
index 1d7e6d9..e59cae7 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -18,7 +18,7 @@ import Options.Applicative (execParser)
 import SlackBuilder.CommandLine
 import SlackBuilder.Config
 import SlackBuilder.Trans
-import SlackBuilder.Updater
+import SlackBuilder.LatestVersionCheck
 import qualified Toml
 import qualified Data.ByteString as ByteString
 import Data.Text (Text)
@@ -59,8 +59,8 @@ autoUpdatable :: [Package]
 autoUpdatable =
     [ Package
         { latest =
-            let ghArguments = GhArguments{ owner = "universal-ctags", name = "ctags", transform = Nothing}
-                latest' = latestGitHub ghArguments pure
+            let ghArguments = PackageOwner{ owner = "universal-ctags", name = "ctags" }
+                latest' = latestGitHub ghArguments stableTagTransform
                 templateTail =
                     [ Package.VersionPlaceholder
                     , Package.StaticPlaceholder "/ctags-"
@@ -77,7 +77,7 @@ autoUpdatable =
         }
     , Package
         { latest =
-            let packagistArguments = PackagistArguments{ vendor = "composer", name = "composer" }
+            let packagistArguments = PackageOwner{ owner = "composer", name = "composer" }
                 latest' = latestPackagist packagistArguments
                 template = Package.DownloadTemplate
                     $ Package.StaticPlaceholder "https://getcomposer.org/download/"
@@ -89,10 +89,9 @@ autoUpdatable =
         }
     , Package
         { latest =
-            let ghArguments = GhArguments
+            let ghArguments = PackageOwner
                     { owner = "jitsi"
                     , name = "jitsi-meet-electron"
-                    , transform = Nothing
                     }
                 latest' = latestGitHub ghArguments $ Text.stripPrefix "v"
                 template = Package.DownloadTemplate
@@ -106,10 +105,9 @@ autoUpdatable =
         }
     , Package
         { latest =
-            let ghArguments = GhArguments
+            let ghArguments = PackageOwner
                     { owner = "php"
                     , name = "php-src"
-                    , transform = Nothing
                     }
                 checkVersion x
                     | not $ Text.isInfixOf "RC" x
@@ -127,12 +125,11 @@ autoUpdatable =
         }
     , Package
         { latest =
-            let ghArguments = GhArguments
+            let ghArguments = PackageOwner
                     { owner = "kovidgoyal"
                     , name = "kitty"
-                    , transform = Nothing
                     }
-                latest' = latestGitHub ghArguments $ Text.stripPrefix "v"
+                latest' = latestGitHub ghArguments stableTagTransform
                 templateTail =
                     [ Package.StaticPlaceholder "/kitty-"
                     , Package.VersionPlaceholder
@@ -149,10 +146,9 @@ autoUpdatable =
         }
     , Package
         { latest =
-            let ghArguments = GhArguments
+            let ghArguments = PackageOwner
                     { owner = "rdiff-backup"
                     , name = "rdiff-backup"
-                    , transform = Nothing
                     }
                 latest' = latestGitHub ghArguments $ Text.stripPrefix "v"
                 template = Package.DownloadTemplate
@@ -187,10 +183,9 @@ autoUpdatable =
         }
     , Package
         { latest =
-            let ghArguments = GhArguments
+            let ghArguments = PackageOwner
                     { owner = "librsync"
                     , name = "librsync"
-                    , transform = Nothing
                     }
                 latest' = latestGitHub ghArguments $ Text.stripPrefix "v"
                 template = Package.DownloadTemplate
@@ -236,9 +231,9 @@ autoUpdatable =
         , category = "development"
         , name = "d-tools"
         , downloaders =
-            let dubArguments = GhArguments{ owner = "dlang", name = "dub", transform = Nothing}
-                dscannerArguments = GhArguments{ owner = "dlang-community", name = "D-Scanner", transform = Nothing }
-                dcdArguments = GhArguments{ owner = "dlang-community", name = "DCD", transform = Nothing }
+            let dubArguments = PackageOwner{ owner = "dlang", name = "dub" }
+                dscannerArguments = PackageOwner{ owner = "dlang-community", name = "D-Scanner" }
+                dcdArguments = PackageOwner{ owner = "dlang-community", name = "DCD" }
                 latestDub = latestGitHub dubArguments pure
                 latestDscanner = latestGitHub dscannerArguments pure
                 latestDcd = latestGitHub dcdArguments pure
-- 
cgit v1.2.3