Dockerfile

@@ -1,15 +0,0 @@
-# syntax=docker/dockerfile:1
-
-FROM mcr.microsoft.com/dotnet/sdk:7.0 as build-env
-WORKDIR /src
-COPY . /src/
-RUN ls /src
-RUN dotnet restore Tranga-API/Tranga-API.csproj
-RUN dotnet publish -c Release -o /publish
-
-FROM mcr.microsoft.com/dotnet/aspnet:7.0 as runtime
-WORKDIR /publish
-COPY --from=build-env /publish .
-RUN ls /publish
-EXPOSE 80
-ENTRYPOINT ["dotnet", "/publish/Tranga-API.dll"]

Tranga-API/Dockerfile

@@ -0,0 +1,19 @@
+FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
+WORKDIR /app
+EXPOSE 6531
+
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+WORKDIR /src
+COPY ["Tranga-API/Tranga-API.csproj", "Tranga-API/"]
+RUN dotnet restore "Tranga-API/Tranga-API.csproj"
+COPY . .
+WORKDIR "/src/Tranga-API"
+RUN dotnet build "Tranga-API.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "Tranga-API.csproj" -c Release -o /app/publish /p:UseAppHost=false
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "Tranga-API.dll"]

Tranga-API/Program.cs

@@ -1,23 +1,20 @@
-using System.Runtime.InteropServices;
 using Logging;
 using Tranga;
 
-string applicationFolderPath = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Tranga-API");
+string applicationFolderPath =
-string downloadFolderPath = RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "/Manga" : Path.Join(applicationFolderPath, "Manga");
+    Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Tranga-API");
-string logsFolderPath = RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "/var/logs/Tranga" : Path.Join(applicationFolderPath, "logs");
+string downloadFolderPath = Path.Join(applicationFolderPath, "Manga");
+string logsFolderPath = Path.Join(applicationFolderPath, "logs");
 string logFilePath = Path.Join(logsFolderPath, $"log-{DateTime.Now:dd-M-yyyy-HH-mm-ss}.txt");
 string settingsFilePath = Path.Join(applicationFolderPath, "settings.json");
 
 Directory.CreateDirectory(applicationFolderPath);
-Directory.CreateDirectory(downloadFolderPath);
 Directory.CreateDirectory(logsFolderPath);
         
-Console.WriteLine($"Application-Folder: {applicationFolderPath}");
-Console.WriteLine($"Download-Folder-Path: {downloadFolderPath}");
 Console.WriteLine($"Logfile-Path: {logFilePath}");
 Console.WriteLine($"Settings-File-Path: {settingsFilePath}");
 
-Logger logger = new(new[] { Logger.LoggerType.FileLogger, Logger.LoggerType.ConsoleLogger }, Console.Out, Console.Out.Encoding, logFilePath);
+Logger logger = new(new[] { Logger.LoggerType.FileLogger }, null, null, logFilePath);
         
 logger.WriteLine("Tranga_CLI", "Loading Taskmanager.");
 TrangaSettings settings;

Tranga-CLI/Dockerfile

@@ -0,0 +1,18 @@
+FROM mcr.microsoft.com/dotnet/runtime:7.0 AS base
+WORKDIR /app
+
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+WORKDIR /src
+COPY ["Tranga-CLI/Tranga-CLI.csproj", "Tranga-CLI/"]
+RUN dotnet restore "Tranga-CLI/Tranga-CLI.csproj"
+COPY . .
+WORKDIR "/src/Tranga-CLI"
+RUN dotnet build "Tranga-CLI.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "Tranga-CLI.csproj" -c Release -o /app/publish /p:UseAppHost=false
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "Tranga-CLI.dll"]

Website/apiConnector.js

@@ -1,23 +1,4 @@
-let apiUri = `http://${window.location.host.split(':')[0]}:6531`
+const apiUri = "http://localhost:6531";
-
-if(getCookie("apiUri") != ""){
-    apiUri = getCookie("apiUri");
-}
-function getCookie(cname) {
-    let name = cname + "=";
-    let decodedCookie = decodeURIComponent(document.cookie);
-    let ca = decodedCookie.split(';');
-    for(let i = 0; i < ca.length; i++) {
-        let c = ca[i];
-        while (c.charAt(0) == ' ') {
-            c = c.substring(1);
-        }
-        if (c.indexOf(name) == 0) {
-            return c.substring(name.length, c.length);
-        }
-    }
-    return "";
-}
 
 async function GetData(uri){
     let request = await fetch(uri, {

Website/index.html

@@ -82,8 +82,6 @@
   <settingstab id="settingstab">
     <span class="title">Download Location:</span>
     <span id="downloadLocation"></span>
-    <span class="title">API-URI</span>
-    <label for="settingApiUri"></label><input placeholder="https://" type="text" id="settingApiUri">
     <komga-settings>
       <span class="title">Komga</span>
       <div>Configured: <span id="komgaConfigured">✅❌</span></div>
@@ -91,7 +89,7 @@
       <label for="komgaUsername"></label><input placeholder="Username" id="komgaUsername" type="text">
       <label for="komgaPassword"></label><input placeholder="Password" id="komgaPassword" type="password">
       <div><label for="komgaUpdateTime" style="margin-right: 5px;">Update Time</label><input id="komgaUpdateTime" type="time" value="00:01:00" step="10"></div>
-      <input type="submit" value="Update" onclick="UpdateKomgaSettings()">
+      <input type="submit" value="Update" onclick="UpdateSettingsClick()">
     </komga-settings>
   </settingstab>
   

Website/interaction.js

@@ -45,7 +45,6 @@ const settingKomgaUser = document.querySelector("#komgaUsername");
 const settingKomgaPass = document.querySelector("#komgaPassword");
 const settingKomgaTime = document.querySelector("#komgaUpdateTime");
 const settingKomgaConfigured = document.querySelector("#komgaConfigured");
-const settingApiUri = document.querySelector("#settingApiUri");
 
 
 settingsCog.addEventListener("click", () => OpenSettings());
@@ -54,18 +53,6 @@ document.querySelector("#blurBackgroundTaskPopup").addEventListener("click", ()
 document.querySelector("#blurBackgroundPublicationPopup").addEventListener("click", () => HidePublicationPopup());
 publicationDelete.addEventListener("click", () => DeleteTaskClick());
 publicationAdd.addEventListener("click", () => AddTaskClick());
-settingApiUri.addEventListener("keypress", (event) => {
-    if(event.key === "Enter"){
-        apiUri = settingApiUri.value;
-        setTimeout(() => GetSettingsClick(), 100);
-        document.cookie = `apiUri=${apiUri};`;
-    }
-});
-searchPublicationQuery.addEventListener("keypress", (event) => {
-    if(event.key === "Enter"){
-        NewSearch();
-    }
-});
 
 let availableConnectors;
 GetAvailableControllers()
@@ -79,6 +66,11 @@ GetAvailableControllers()
         })
     );
 
+searchPublicationQuery.addEventListener("keypress", (event) => {
+   if(event.key === "Enter"){
+       NewSearch();
+   } 
+});
 
 function NewSearch(){
     //Disable inputs
@@ -218,13 +210,10 @@ function OpenSettings(){
 }
 
 function GetSettingsClick(){
-    settingApiUri.value = "";
     settingKomgaUrl.value = "";
     settingKomgaUser.value = "";
     settingKomgaPass.value = "";
     
-    settingApiUri.placeholder = apiUri;
-    
     GetSettings().then(json => {
         settingDownloadLocation.innerText = json.downloadLocation;
         if(json.komga != null)
@@ -239,7 +228,7 @@ function GetSettingsClick(){
     });
 }
 
-function UpdateKomgaSettings(){
+function UpdateSettingsClick(){
     var auth = utf8_to_b64(`${settingKomgaUser.value}:${settingKomgaPass.value}`);
     console.log(auth);
     UpdateSettings("", settingKomgaUrl.value, auth);

Website/style.css

@@ -132,13 +132,6 @@ settingstab > * {
     margin: 0 20px;
 }
 
-settingstab input {
-    padding: 3px;
-    border-radius: 3px;
-    border: 0;
-    margin: 2px 20px;
-}
-
 settingstab .title {
     font-size: 14pt;
     font-weight: bolder;
@@ -152,10 +145,16 @@ komga-settings {
     flex-wrap: nowrap;
 }
 
-komga-settings input {
+komga-settings > * {
     margin: 2px 0;
 }
 
+komga-settings input {
+    padding: 3px;
+    border-radius: 3px;
+    border: 0;
+}
+
 #addPublication {
     cursor: pointer;
     background-color: var(--secondary-color);