c8h4/aux-search
1
0
Fork 0
Code Issues Pull requests Packages Releases Activity

Fixes support for packages with multiple homepage entries. (#255)

Browse source
This commit is contained in:
Marek Fajkus 2020-12-28 23:14:00 +01:00 committed by GitHub
parent 153674a2b9
commit 08943214d2
Failed to generate hash of commit
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Page/Packages.elm
View file

@ -66,7 +66,7 @@ type alias ResultItemSource =
, maintainers : List ResultPackageMaintainer , maintainers : List ResultPackageMaintainer
, platforms : List String , platforms : List String
, position : Maybe String , position : Maybe String
, homepage : Maybe String , homepage : List String
, system : String , system : String
, hydra : Maybe (List ResultPackageHydra) , hydra : Maybe (List ResultPackageHydra)
} }
@ -374,7 +374,7 @@ viewResultItemDetails channel item =
, dt [] [ text "Platforms" ] , dt [] [ text "Platforms" ]
, dd [] [ asList (showPlatforms item.source.hydra item.source.platforms) ] , dd [] [ asList (showPlatforms item.source.hydra item.source.platforms) ]
, dt [] [ text "Homepage" ] , dt [] [ text "Homepage" ]
, dd [] [ withEmpty asLink item.source.homepage ] , dd [] <| List.intersperse (Html.text ", ") <| List.map asLink item.source.homepage
, dt [] [ text "Licenses" ] , dt [] [ text "Licenses" ]
, dd [] [ asList (List.map showLicence item.source.licenses) ] , dd [] [ asList (List.map showLicence item.source.licenses) ]
, dt [] [ text "Maintainers" ] , dt [] [ text "Maintainers" ]
@ -426,6 +426,20 @@ makeRequest options channel query from size sort =
-- JSON -- JSON
decodeHomepage : Json.Decode.Decoder (List String)
decodeHomepage =
Json.Decode.oneOf
-- null becomes [] (empty list)
[ Json.Decode.null []
-- "foo" becomes ["foo"]
, Json.Decode.map List.singleton Json.Decode.string
-- arrays are decoded to list as expected
, Json.Decode.list Json.Decode.string
]
decodeResultItemSource : Json.Decode.Decoder ResultItemSource decodeResultItemSource : Json.Decode.Decoder ResultItemSource
decodeResultItemSource = decodeResultItemSource =
Json.Decode.succeed ResultItemSource Json.Decode.succeed ResultItemSource
@ -438,7 +452,7 @@ decodeResultItemSource =
|> Json.Decode.Pipeline.required "package_maintainers" (Json.Decode.list decodeResultPackageMaintainer) |> Json.Decode.Pipeline.required "package_maintainers" (Json.Decode.list decodeResultPackageMaintainer)
|> Json.Decode.Pipeline.required "package_platforms" (Json.Decode.list Json.Decode.string) |> Json.Decode.Pipeline.required "package_platforms" (Json.Decode.list Json.Decode.string)
|> Json.Decode.Pipeline.required "package_position" (Json.Decode.nullable Json.Decode.string) |> Json.Decode.Pipeline.required "package_position" (Json.Decode.nullable Json.Decode.string)
|> Json.Decode.Pipeline.required "package_homepage" (Json.Decode.nullable Json.Decode.string) |> Json.Decode.Pipeline.required "package_homepage" decodeHomepage
|> Json.Decode.Pipeline.required "package_system" Json.Decode.string |> Json.Decode.Pipeline.required "package_system" Json.Decode.string
|> Json.Decode.Pipeline.required "package_hydra" (Json.Decode.nullable (Json.Decode.list decodeResultPackageHydra)) |> Json.Decode.Pipeline.required "package_hydra" (Json.Decode.nullable (Json.Decode.list decodeResultPackageHydra))