From 796acd6c3bc104edc6c7e465dadac917a2df8e2a Mon Sep 17 00:00:00 2001 From: shabinder Date: Sun, 6 Jun 2021 03:28:10 +0530 Subject: [PATCH] Add Matomo Downloads in Download Card Count --- .../src/main/java/models/matomo/MatomoDownloads.kt | 3 +++ .../main/java/models/matomo/MatomoDownloadsItem.kt | 12 ++++++++++++ .../src/main/java/scripts/UpdateDownloadCards.kt | 12 +++++++----- 3 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 maintenance-tasks/src/main/java/models/matomo/MatomoDownloads.kt create mode 100644 maintenance-tasks/src/main/java/models/matomo/MatomoDownloadsItem.kt diff --git a/maintenance-tasks/src/main/java/models/matomo/MatomoDownloads.kt b/maintenance-tasks/src/main/java/models/matomo/MatomoDownloads.kt new file mode 100644 index 00000000..cc783dfc --- /dev/null +++ b/maintenance-tasks/src/main/java/models/matomo/MatomoDownloads.kt @@ -0,0 +1,3 @@ +package models.matomo + +typealias MatomoDownloads = ArrayList \ No newline at end of file diff --git a/maintenance-tasks/src/main/java/models/matomo/MatomoDownloadsItem.kt b/maintenance-tasks/src/main/java/models/matomo/MatomoDownloadsItem.kt new file mode 100644 index 00000000..6af66eed --- /dev/null +++ b/maintenance-tasks/src/main/java/models/matomo/MatomoDownloadsItem.kt @@ -0,0 +1,12 @@ +package models.matomo + +import kotlinx.serialization.Serializable + +@Serializable +data class MatomoDownloadsItem( + val idsubdatatable: Int = 0, + val label: String = "com.shabinder.spotiflyer", + val nb_hits: Int = 0, + val nb_visits: Int = 0, + val sum_time_spent: Int = 0 +) \ No newline at end of file diff --git a/maintenance-tasks/src/main/java/scripts/UpdateDownloadCards.kt b/maintenance-tasks/src/main/java/scripts/UpdateDownloadCards.kt index b9bd0436..2b340920 100644 --- a/maintenance-tasks/src/main/java/scripts/UpdateDownloadCards.kt +++ b/maintenance-tasks/src/main/java/scripts/UpdateDownloadCards.kt @@ -4,6 +4,7 @@ import common.* import io.ktor.client.features.* import io.ktor.client.request.* import io.ktor.client.statement.* +import models.matomo.MatomoDownloads import utils.RETRY_LIMIT_EXHAUSTED import utils.debug @@ -17,7 +18,7 @@ internal suspend fun updateDownloadCards( fileName = "README.md" ).decryptedContent - val totalDownloads:Int = GithubService.getGithubRepoReleasesInfo( + var totalDownloads:Int = GithubService.getGithubRepoReleasesInfo( secrets.ownerName, secrets.repoName ).let { allReleases -> @@ -35,13 +36,14 @@ internal suspend fun updateDownloadCards( return@let totalCount } + // Add Matomo Downloads + client.get("https://kind-grasshopper-73.telebit.io/matomo/?module=API&method=Actions.getDownloads&idSite=1&period=year&date=today&format=JSON&token_auth=anonymous").forEach { + totalDownloads += it.nb_hits + } return getUpdatedContent( oldContent, - """ - - Total Downloads - """.trim().trimIndent(), + """Total Downloads""", secrets.tagName ) }