From 129cff8c378a423553dc7d2c23e7c0973b1afaa7 Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Thu, 10 Feb 2022 17:44:25 +0100 Subject: [PATCH] add releases to extensionstore item detail view --- .../extensiondetails/StoreExtensionDetailsItem.java | 8 ++++++-- .../extensionstore/repository/StoreFetch.java | 4 ++-- .../extensionstore/repository/models/StoreExtension.java | 9 ++++++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/extensiondetails/StoreExtensionDetailsItem.java b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/extensiondetails/StoreExtensionDetailsItem.java index df581c2..e4a335e 100644 --- a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/extensiondetails/StoreExtensionDetailsItem.java +++ b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/application/entities/extensiondetails/StoreExtensionDetailsItem.java @@ -49,8 +49,12 @@ public class StoreExtensionDetailsItem implements ContentItem { .append("*Author(s):* ").append(storeExtension.getAuthors().stream().map(StoreExtension.Author::getName).collect(Collectors.joining(", "))).append("\n\n") .append("*Categories:* ").append(storeExtension.getCategories().stream().map(ExtCategory::getName).collect(Collectors.joining(", "))).append("\n\n"); - contentBuilder.append("*Technical information*").append("\n") - .append("> Language: ").append(storeExtension.getLanguage()).append("\n") + contentBuilder.append("*Technical information*").append("\n"); + + if(storeExtension.getReleases() != null) + contentBuilder.append("> Releases: --url:Click Here-").append(storeExtension.getReleases()).append("\n"); + + contentBuilder.append("> Language: ").append(storeExtension.getLanguage()).append("\n") .append("> Source: --url:Click Here-").append(storeExtension.getSource()).append("\n") .append("> Framework: ").append(storeExtension.getFramework().getFramework().getName()).append(" - v").append(storeExtension.getFramework().getVersion()).append("\n") .append("> Systems: ").append(String.join(", ", storeExtension.getCompatibility().getSystems())).append("\n \n"); diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/StoreFetch.java b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/StoreFetch.java index a35ae94..5788e43 100644 --- a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/StoreFetch.java +++ b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/StoreFetch.java @@ -34,11 +34,11 @@ public class StoreFetch { new URL(String.format("https://raw.githubusercontent.com/%s/repo/%s/store/config.json", source, version)) .openStream(), StandardCharsets.UTF_8)); - JSONArray exensions = new JSONArray(IOUtils.toString( + JSONArray extensions = new JSONArray(IOUtils.toString( new URL(String.format("https://raw.githubusercontent.com/%s/repo/%s/.auto-generated/extensions.json", source, version)) .openStream(), StandardCharsets.UTF_8)); - storeFetchListener.success(new StoreRepository(new StoreData(config, exensions), version, source)); + storeFetchListener.success(new StoreRepository(new StoreData(config, extensions), version, source)); } catch (Exception e) { storeFetchListener.fail(e.getLocalizedMessage()); diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/models/StoreExtension.java b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/models/StoreExtension.java index d876081..eb33e61 100644 --- a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/models/StoreExtension.java +++ b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/models/StoreExtension.java @@ -10,7 +10,7 @@ import java.util.stream.Collectors; public class StoreExtension { - public StoreExtension(String title, String description, List authors, String version, List categories, String source, String readme, boolean stable, Framework framework, String language, Commands commands, Compatibility compatibility, LocalDateTime submissionDate, LocalDateTime updateDate, boolean isOutdated, int rating) { + public StoreExtension(String title, String description, List authors, String version, List categories, String source, String readme, String releases, boolean stable, Framework framework, String language, Commands commands, Compatibility compatibility, LocalDateTime submissionDate, LocalDateTime updateDate, boolean isOutdated, int rating) { this.title = title; this.description = description; this.authors = authors; @@ -18,6 +18,7 @@ public class StoreExtension { this.categories = categories; this.source = source; this.readme = readme; + this.releases = releases; this.stable = stable; this.framework = framework; this.language = language; @@ -38,6 +39,7 @@ public class StoreExtension { .toList().stream().anyMatch(j -> j.equals(c.getName()))).collect(Collectors.toList()); this.source = object.getString("source"); this.readme = object.has("readme") ? object.getString("readme") : null; + this.releases = object.has("releases") ? object.getString("releases") : null; this.stable = object.getBoolean("stable"); this.framework = new Framework(object.getJSONObject("framework"), storeConfig); this.language = object.getString("language"); @@ -201,6 +203,7 @@ public class StoreExtension { private final String source; private final String readme; + private final String releases; private final boolean stable; @@ -246,6 +249,10 @@ public class StoreExtension { return readme; } + public String getReleases() { + return releases; + } + public boolean isStable() { return stable; }