Update generator code, to output tile json

.gitignore

@@ -135,3 +135,7 @@ data/certbot/conf/*
 !data/certbot/conf/letsencrypt-recommended-ssl.conf
 !data/certbot/conf/letsencrypt-dhparams.pem
 data/certbot/www/*
+
+# Generator data
+data/tiles/config.json
+data/tiles/tiles.json

docker-compose.override.yml

@@ -15,6 +15,10 @@ services:
       - ./node_modules:/usr/src/backend/node_modules
     ports:
       - "1337:1337"
+  generator:
+    volumes:
+      - ./data/tiles/:/usr/src/data/
+      - ./src/generator/bin/Release/netcoreapp3.1/publish/:/usr/src/app
   proxy:
     volumes:
       - ./src/proxy/nginx.dev.conf:/etc/nginx/conf.d/nginx.conf

docker-compose.yml

@@ -12,6 +12,10 @@ services:
     build:
       context: .
       dockerfile: src/backend/Dockerfile
+  generator:
+    build:
+      context: src/generator/
+    entrypoint: "/bin/sh -c 'trap exit TERM; while :; do dotnet generator.dll /usr/src/data/config.json /usr/src/data/tiles.json; sleep 12h & wait $${!}; done;'"
   proxy:
     image: nginx:1.19-alpine
     ports:

src/generator/.vscode/launch.json

@@ -0,0 +1,27 @@
+{
+   // Use IntelliSense to find out which attributes exist for C# debugging
+   // Use hover for the description of the existing attributes
+   // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+   "version": "0.2.0",
+   "configurations": [
+        {
+            "name": ".NET Core Launch (console)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceFolder}/bin/Debug/netcoreapp3.1/generator.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}",
+            // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
+            "console": "internalConsole",
+            "stopAtEntry": false
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach",
+            "processId": "${command:pickProcess}"
+        }
+    ]
+}

src/generator/.vscode/tasks.json

@@ -0,0 +1,42 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/generator.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "publish",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "publish",
+                "${workspaceFolder}/generator.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "watch",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "watch",
+                "run",
+                "${workspaceFolder}/generator.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}

src/generator/ApiConfigManager.cs

@@ -38,18 +38,18 @@ public class LastfmApiConfig
         [JsonProperty("username")]
         public string Username { get; set; }
 
-        [JsonProperty("albumChartPeriod")]
-        public LastStatsTimeSpan AlbumChartPeriod { get; set; } = LastStatsTimeSpan.Month;
+        [JsonProperty("period")]
+        public LastStatsTimeSpan Period { get; set; } = LastStatsTimeSpan.Month;
 
-        [JsonProperty("albumChartCount")]
-        public int AlbumChartCount { get; set; }
+        [JsonProperty("count")]
+        public int Count { get; set; } = 5;
     }
 
     public class ApiConfig
     {
         [JsonProperty("github")]
         public GitHubApiConfig GitHub { get; set; }
-        
+
         [JsonProperty("lastfm")]
         public LastfmApiConfig Lastfm { get; set; }
 

src/generator/Dockerfile

@@ -0,0 +1,13 @@
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1
+
+COPY . usr/src/app/
+WORKDIR usr/src/app/
+# https://github.com/NuGet/Home/issues/9020
+RUN dotnet restore --disable-parallel
+RUN dotnet publish -c Release
+
+FROM mcr.microsoft.com/dotnet/core/runtime:3.1
+COPY --from=0 usr/src/app/bin/Release/netcoreapp3.1/publish/ /usr/src/app
+
+WORKDIR /usr/src/app
+ENTRYPOINT ["dotnet", "generator.dll"]