Merge pull request #136 from C4illin/release-please--branches--main--components--convertx-frontend

chore(deps): update oven/bun docker tag to v1.1.28

.deepsource.toml

@@ -0,0 +1,7 @@
+version = 1
+
+[[analyzers]]
+name = "javascript"
+
+  [analyzers.meta]
+  environment = ["nodejs"]

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [0.5.0](https://github.com/C4illin/ConvertX/compare/v0.4.1...v0.5.0) (2024-09-20)
+
+
+### Features
+
+* add option to customize how often files are automatically deleted ([317c932](https://github.com/C4illin/ConvertX/commit/317c932c2a26280bf37ed3d3bf9b879413590f5a))
+
+
+### Bug Fixes
+
+* improve file name replacement logic ([60ba7c9](https://github.com/C4illin/ConvertX/commit/60ba7c93fbdc961f3569882fade7cc13dee7a7a5))
+
 ## [0.4.1](https://github.com/C4illin/ConvertX/compare/v0.4.0...v0.4.1) (2024-09-15)
 
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM oven/bun:1.1.27-alpine AS base
+FROM oven/bun:1.1.29-alpine AS base
 LABEL org.opencontainers.image.source="https://github.com/C4illin/ConvertX"
 WORKDIR /app
 

README.md

@@ -47,6 +47,7 @@ services:
       - JWT_SECRET=aLongAndSecretStringUsedToSignTheJSONWebToken1234 # will use randomUUID() by default
       - HTTP_ALLOWED=false # setting this to true is unsafe, only set this to true locally
       - ALLOW_UNAUTHENTICATED=false # allows anyone to use the service without logging in, only set this to true locally
+      - AUTO_DELETE_EVERY_N_HOURS=24 # checks every n hours for files older then n hours and deletes them, set to 0 to disable
     volumes:
       - convertx:/app/data
 ```
@@ -65,6 +66,10 @@ If you get unable to open database file run `chown -R $USER:$USER path` on the p
 
 Tutorial in french: https://belginux.com/installer-convertx-avec-docker/
 
+## Screenshots
+
+![ConvertX Preview](images/preview.png)
+
 ## Development
 
 0. Install [Bun](https://bun.sh/) and Git

biome.json

@@ -10,7 +10,7 @@
     "attributePosition": "auto"
   },
   "files": {
-    "ignore": ["**/node_modules/**"]
+    "ignore": ["**/node_modules/**", "**/pico.lime.min.css"]
   },
   "organizeImports": { "enabled": true },
   "linter": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "convertx-frontend",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "scripts": {
     "dev": "bun run --watch src/index.tsx",
     "hot": "bun run --hot src/index.tsx",
@@ -24,7 +24,7 @@
     "start": "bun run src/index.tsx"
   },
   "devDependencies": {
-    "@biomejs/biome": "1.9.1",
+    "@biomejs/biome": "1.9.2",
     "@eslint/compat": "^1.1.1",
     "@eslint/js": "^9.9.1",
     "@ianvs/prettier-plugin-sort-imports": "^4.3.1",

src/index.tsx

@@ -33,6 +33,9 @@ const HTTP_ALLOWED =
   process.env.HTTP_ALLOWED?.toLowerCase() === "true" || false;
 const ALLOW_UNAUTHENTICATED =
   process.env.ALLOW_UNAUTHENTICATED?.toLowerCase() === "true" || false;
+const AUTO_DELETE_EVERY_N_HOURS = process.env.AUTO_DELETE_EVERY_N_HOURS
+  ? Number(process.env.AUTO_DELETE_EVERY_N_HOURS)
+  : 24;
 
 // fileNames: fileNames,
 // filesToConvert: fileNames.length,
@@ -543,9 +546,11 @@ const app = new Elysia({
                           style={{
                             borderColor: "gray",
                             padding: "2px",
-                          }}>
+                          }}
+                        >
                           <header
-                            style={{ fontSize: "20px", fontWeight: "bold" }}>
+                            style={{ fontSize: "20px", fontWeight: "bold" }}
+                            safe>
                             {converter}
                           </header>
 
@@ -567,7 +572,9 @@ const app = new Elysia({
                                 data-target={target}
                                 data-converter={converter}
                                 style={{ fontSize: "15px", padding: "5px" }}
-                                type="button">
+                                type="button"
+                                safe
+                              >
                                 {target}
                               </button>
                             ))}
@@ -638,8 +645,9 @@ const app = new Elysia({
                   style={{
                     borderColor: "gray",
                     padding: "2px",
-                  }}>
-                  <header style={{ fontSize: "20px", fontWeight: "bold" }}>
+                  }}
+                >
+                  <header style={{ fontSize: "20px", fontWeight: "bold" }} safe>
                     {converter}
                   </header>
 
@@ -661,7 +669,9 @@ const app = new Elysia({
                         data-target={target}
                         data-converter={converter}
                         style={{ fontSize: "15px", padding: "5px" }}
-                        type="button">
+                        type="button"
+                        safe
+                      >
                         {target}
                       </button>
                     ))}
@@ -828,7 +838,10 @@ const app = new Elysia({
           const fileTypeOrig = fileName.split(".").pop() ?? "";
           const fileType = normalizeFiletype(fileTypeOrig);
           const newFileExt = normalizeOutputFiletype(convertTo);
-          const newFileName = fileName.replace(fileTypeOrig, newFileExt);
+          const newFileName = fileName.replace(
+            new RegExp(`${fileTypeOrig}(?!.*${fileTypeOrig})`),
+            newFileExt,
+          );
           const targetPath = `${userOutputDir}${newFileName}`;
 
           const result = await mainConverter(
@@ -1253,12 +1266,14 @@ console.log(
 );
 
 const clearJobs = () => {
-  // clear all jobs older than 24 hours
-  // get all files older than 24 hours
   const jobs = db
     .query("SELECT * FROM jobs WHERE date_created < ?")
     .as(Jobs)
-    .all(new Date(Date.now() - 24 * 60 * 60 * 1000).toISOString());
+    .all(
+      new Date(
+        Date.now() - AUTO_DELETE_EVERY_N_HOURS * 60 * 60 * 1000,
+      ).toISOString(),
+    );
 
   for (const job of jobs) {
     // delete the directories
@@ -1269,7 +1284,9 @@ const clearJobs = () => {
     db.query("DELETE FROM jobs WHERE id = ?").run(job.id);
   }
 
-  // run every 24 hours
-  setTimeout(clearJobs, 24 * 60 * 60 * 1000);
+  setTimeout(clearJobs, AUTO_DELETE_EVERY_N_HOURS * 60 * 60 * 1000);
 };
-clearJobs();
+
+if (AUTO_DELETE_EVERY_N_HOURS > 0) {
+  clearJobs();
+}

src/public/style.css

@@ -4,7 +4,7 @@ div.icon {
 }
 
 button[type="submit"] {
-  width: 50%
+  width: 50%;
 }
 
 div.center {