moved PackageRank into PackageList Feature and changed UI so packageRank will display as Int between 1000 and 0

Author: kubaneko

hackage-server.cabal

@@ -310,6 +310,8 @@ library lib-server
       Distribution.Server.Features.PackageCandidates.Backup
       Distribution.Server.Features.PackageFeed
       Distribution.Server.Features.PackageList
+      Distribution.Server.Features.PackageList.PackageRank
+      Distribution.Server.Features.PackageList.MStats
       Distribution.Server.Features.Distro
       Distribution.Server.Features.Distro.Distributions
       Distribution.Server.Features.Distro.Backup
@@ -359,8 +361,6 @@ library lib-server
       Distribution.Server.Features.StaticFiles
       Distribution.Server.Features.ServerIntrospect
       Distribution.Server.Features.Sitemap
-      Distribution.Server.Features.PackageRank
-      Distribution.Server.Features.PackageRank.Parser
 
   if flag(debug)
     cpp-options: -DDEBUG

src/Distribution/Server/Features/Browse.hs

@@ -9,6 +9,7 @@ import qualified Data.Set as S
 import Data.Time (getCurrentTime)
 import Data.Time.Format.ISO8601 (iso8601Show)
 import System.FilePath ((</>))
+import GHC.Float.RealFracMethods (roundFloatInteger)
 
 import Data.Aeson (Value(Array), object, toJSON, (.=))
 import qualified Data.Aeson.Key as Key
@@ -147,7 +148,7 @@ packageIndexInfoToValue
     , Key.fromString "tags" .= map renderTag (S.toAscList itemTags)
     , Key.fromString "lastUpload" .= iso8601Show itemLastUpload
     , Key.fromString "maintainers" .= map renderUser itemMaintainer
-    , Key.fromString "packageRank" .= itemPackageRank
+    , Key.fromString "packageRank" .= (roundFloatInteger (1000 * itemPackageRank))
     ]
   where
   renderTag :: Tag -> Value

src/Distribution/Server/Features/PackageList.hs

@@ -17,7 +17,7 @@ import Distribution.Server.Features.Users
 import Distribution.Server.Features.Upload(UploadFeature(..))
 import Distribution.Server.Features.Documentation (DocumentationFeature(..))
 import Distribution.Server.Features.TarIndexCache (TarIndexCacheFeature(..))
-import Distribution.Server.Features.PackageRank
+import Distribution.Server.Features.PackageList.PackageRank
 
 import Distribution.Server.Users.Users (userIdToName)
 import qualified Distribution.Server.Users.UserIdSet as UserIdSet

src/Distribution/Server/Features/PackageRank/Parser.hs renamed to src/Distribution/Server/Features/PackageList/MStats.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE ScopedTypeVariables, FlexibleInstances, MultiParamTypeClasses, ConstraintKinds #-}
-module Distribution.Server.Features.PackageRank.Parser
+module Distribution.Server.Features.PackageList.MStats
   ( parseM
   , sumMStat
   , getListsTables
@@ -53,13 +53,13 @@ data MarkdownStats = NotImportant MStats |
 
 getCode :: [MarkdownStats] -> (Int, Int) -- number of code blocks, size of code
 getCode []                           = (0, 0)
-getCode (Code  (MStats code _) : xs) = (1, code) >< getCode xs
-getCode (HCode (MStats code _) : xs) = (1, code) >< getCode xs
+getCode (Code  (MStats codeT _) : xs) = (1, codeT) >< getCode xs
+getCode (HCode (MStats codeT _) : xs) = (1, codeT) >< getCode xs
 getCode (_                     : xs) = getCode xs
 
 getHCode :: [MarkdownStats] -> (Int, Int) -- number of code blocks, size of code
 getHCode []                           = (0, 0)
-getHCode (HCode (MStats code _) : xs) = (1, code) >< getHCode xs
+getHCode (HCode (MStats codeT _) : xs) = (1, codeT) >< getHCode xs
 getHCode (_                     : xs) = getHCode xs
 
 getSections :: [MarkdownStats] -> Int -- number of code blocks, size of code

src/Distribution/Server/Features/PackageRank.hs renamed to src/Distribution/Server/Features/PackageList/PackageRank.hs

@@ -2,11 +2,11 @@
 
 -- TODO change the module name probably Distribution.Server.Features.PackageList.PackageRank
 
-module Distribution.Server.Features.PackageRank
+module Distribution.Server.Features.PackageList.PackageRank
   ( rankPackage
   ) where
 
-import           Distribution.Server.Features.PackageRank.Parser
+import           Distribution.Server.Features.PackageList.MStats
 
 import           Data.TarIndex                  ( TarEntryOffset )
 import           Distribution.Package
@@ -274,9 +274,7 @@ temporalScore
 temporalScore p lastUploads versionList recentDownloads = do
   fresh <- freshnessScore
   tract <- tractionScore
-  -- Reverse dependencies are to be done
-
-  f <- packageFreshness
+  -- Reverse dependencies are added
   return $ tract <> fresh <> downloadScore
  where
   isApp         = (isNothing . library) p && (not . null . executables) p