Fusionne les 2 apps node.

2025-05-31 19:04:51 +02:00 · 2023-05-14 12:35:40 +02:00 · 2023-05-14 12:35:40 +02:00 · 4c5d5867c7
commit 4c5d5867c7
parent 5916053780
11 changed files with 111 additions and 1991 deletions
--- a/.gitlab/.gitlab-ci.yml
+++ b/.gitlab/.gitlab-ci.yml
@ -20,10 +20,11 @@ variables:
    - changes:
        - ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
  script:
-    - cd src/build_job
+    - cd src/
    - npm install
    - npm run start
-    - cat ../../${ENTRY_FOLDER}/${PACKAGE_NAME}/theme.json
+    - cat ../${ENTRY_FOLDER}/${PACKAGE_NAME}/theme.json
+    - node src/test_manifest_job/node_modules/mocha/bin/_mocha --require mocha-steps --colors src/test_manifest_job/wpp_checker.js
  artifacts:
    paths:
      - ${ENTRY_FOLDER}/${PACKAGE_NAME}/theme.json
@ -64,11 +65,6 @@ test-images-job/missing_tag_set:
    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
      changes:
        - ${ENTRY_FOLDER}/${PACKAGE_NAME}/*
-  script:
-    - cd src/test_manifest_job
-    - npm install ajv ajv-errors mocha mocha-steps chai
-    - cd ../..
-    - node src/test_manifest_job/node_modules/mocha/bin/_mocha --require mocha-steps --colors src/test_manifest_job/wpp_checker.js

 test-manifest-job/valid_set:
  variables:
--- a/src/build_job/themeset_builder.js
+++ b/src/build_job/themeset_builder.js
--- a/src/build_job/package-lock.json
+++ b/src/build_job/package-lock.json
@ -1,21 +0,0 @@
-{
-  "name": "build_job",
-  "version": "1.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "build_job",
-      "version": "1.0.0",
-      "license": "ISC",
-      "dependencies": {
-        "node-iptc": "^1.0.5"
-      }
-    },
-    "node_modules/node-iptc": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/node-iptc/-/node-iptc-1.0.5.tgz",
-      "integrity": "sha512-+e9aVETp/X8iFX2qBw2GnABkq/jGs7dJdxGURZysOdn4ZdOdArPW2a3xQpSq6GX2CcgEzUklDfaC/cg4sLv35g=="
-    }
-  }
-}
--- a/src/build_job/package.json
+++ b/src/build_job/package.json
@ -1,14 +0,0 @@
-{
-  "name": "build_job",
-  "version": "1.0.0",
-  "description": "Generate a theme.json file from the images' metadata of the working folder.",
-  "main": "themeset_builder.js",
-  "scripts": {
-    "start": "node themeset_builder.js"
-  },
-  "author": "Simon",
-  "license": "ISC",
-  "dependencies": {
-    "node-iptc": "^1.0.5"
-  }
-}
--- a/src/json_theme_schema.jsonc
+++ b/src/json_theme_schema.jsonc
@ -0,0 +1,86 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "type": "object",
+    "required": [
+        "imageFilename",
+        "imageCredits",
+        "displayName",
+        "dayImageList",
+        "nightImageList"
+    ],
+    "properties": {
+        "imageFilename": {
+            "type": "string"
+        },
+        "imageCredits": {
+            "type": "string"
+        },
+        "displayName": {
+            "type": "string"
+        },
+        "dayHighlight": {
+            "type": "integer",
+            "minimum": 0
+        },
+        "nightHighlight": {
+            "type": "integer",
+            "minimum": 0
+        },
+        "sunriseImageList": {
+            "type": "array",
+            "minItems": 0,
+            "uniqueItems": true,
+            "items": {
+                "type": "integer",
+                "minimum": 0
+            }
+        },
+        "dayImageList": {
+            "type": "array",
+            "minItems": 0,
+            "uniqueItems": true,
+            "items": {
+                "type": "integer",
+                "minimum": 0
+            }
+        },
+        "sunsetImageList": {
+            "type": "array",
+            "minItems": 0,
+            "uniqueItems": true,
+            "items": {
+                "type": "integer",
+                "minimum": 0
+            }
+        },
+        "nightImageList": {
+            "type": "array",
+            "minItems": 0,
+            "uniqueItems": true,
+            "items": {
+                "type": "integer",
+                "minimum": 0
+            }
+        }
+    },
+    "errorMessage": {
+        "required": {
+            "imageFilename": "The ‘imageFilename’ property is missing.",
+            "imageCredits": "The ‘imageCredits’ property is missing.",
+            "displayName": "The ‘displayName’ property is missing.",
+            "dayImageList": "The ‘dayImageList’ property is missing.",
+            "nightImageList": "The ‘nightImageList’ property is missing."
+        },
+        "properties": {
+            "imageFilename": "The ‘imageFilename’ property must be of type ‘string’.",
+            "imageCredits": "The ‘imageCredits’ property must be of type ‘string’.",
+            "displayName": "The ‘displayName’ property must be of type ‘string’.",
+            "dayHighlight": "The ‘dayHighlight’ property must be a counting number.",
+            "nightHighlight": "The ‘nightHighlight’ property must be a counting number.",
+            "sunriseImageList": "The ‘sunriseImageList’ property must be a list of counting numbers.",
+            "dayImageList": "The ‘dayImageList’ property must be a list of counting numbers.",
+            "sunsetImageList": "The ‘sunsetImageList’ property must be a list of counting numbers.",
+            "nightImageList": "The ‘nightImageList’ property must be a list of counting numbers."
+        }
+    }
+}
--- a/src/test_manifest_job/wpp_checker.js
+++ b/src/test_manifest_job/wpp_checker.js
--- a/src/package.json
+++ b/src/package.json
@ -0,0 +1,22 @@
+{
+  "name": "wpp-checker",
+  "version": "1.0.0",
+  "description": "Generate the manifest file of the project, based on metadata contained in the pictures.",
+  "main": "build-manifest.js",
+  "scripts": {
+    "dev-start": "",
+    "start": "",
+    "dev-test": "src/test_manifest_job/node_modules/mocha/bin/_mocha --require mocha-steps --colors src/test_manifest_job/wpp_checker.js",
+    "test": ""
+  },
+  "author": "Simon",
+  "license": "ISC",
+  "dependencies": {
+    "ajv": "^8.5.0",
+    "ajv-errors": "^3.0.0",
+    "chai": "^4.3.4",
+    "mocha": "^8.4.0",
+    "mocha-steps": "^1.3.0",
+    "node-iptc": "^1.0.5"
+  }
+}
--- a/src/test_images_job/test_wpp.py
+++ b/src/test_images_job/test_wpp.py
--- a/src/test_manifest_job/json_theme_schema.jsonc
+++ b/src/test_manifest_job/json_theme_schema.jsonc
@ -1,56 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "type": "object",
-    "required": ["imageFilename","imageCredits","displayName","dayImageList","nightImageList"],
-    "properties": {
-        "imageFilename": {"type": "string"},
-        "imageCredits": {"type": "string"},
-        "displayName": {"type": "string"},
-        "dayHighlight": {"type": "integer", "minimum": 0},
-        "nightHighlight": {"type": "integer", "minimum": 0},
-        "sunriseImageList": {
-            "type": "array",
-            "minItems" : 0,
-            "uniqueItems" : true,
-            "items": {"type": "integer", "minimum": 0}
-        },
-        "dayImageList": {
-            "type": "array",
-            "minItems" : 0,
-            "uniqueItems" : true,
-            "items": {"type": "integer", "minimum": 0}
-        },
-        "sunsetImageList": {
-            "type": "array",
-            "minItems" : 0,
-            "uniqueItems" : true,
-            "items": {"type": "integer", "minimum": 0}
-        },
-        "nightImageList": {
-            "type": "array",
-            "minItems" : 0,
-            "uniqueItems" : true,
-            "items": {"type": "integer", "minimum": 0}
-        }
-    },
-    "errorMessage": {
-        "required": {
-            "imageFilename":"The ‘imageFilename’ property is missing. Consider adding it.",
-            "imageCredits":"The ‘imageCredits’ property is missing. Consider adding it.",
-            "displayName":"The ‘displayName’ property is missing. Consider adding it.",
-            "dayImageList":"The ‘dayImageList’ property is missing. Consider adding it.",
-            "nightImageList":"The ‘nightImageList’ property is missing. Consider adding it."
-        },
-        "properties": {
-            "imageFilename": "The ‘imageFilename’ property must be of type ‘string’ and reflect a glob of an image, i.e.: ‘myWallpaper_*.jpg’.",
-            "imageCredits": "The ‘imageCredits’ property must be of type ‘string’.",
-            "displayName": "The ‘displayName’ property must be of type ‘string’.",
-            "dayHighlight": "The ‘dayHighlight’ property must be a counting number referencing an image, i.e.: ‘5’ in ‘myWallpaper_5.jpg’.",
-            "nightHighlight": "The ‘nightHighlight’ property must be a counting number referencing an image, i.e.: ‘13’ in ‘myWallpaper_13.jpg’.",
-            "sunriseImageList": "The ‘sunriseImageList’ property must be a list of counting numbers referencing images, i.e.: ‘[1, 2, 3, 4].’",
-            "dayImageList": "The ‘dayImageList’ property must be a list of counting numbers referencing images, i.e.: ‘[1, 2, 3, 4]’.",
-            "sunsetImageList": "The ‘sunsetImageList’ property must be a list of counting numbers referencing images, i.e.: ‘[1, 2, 3, 4]’.",
-            "nightImageList": "The ‘nightImageList’ property must be a list of counting numbers referencing images, i.e.: ‘[1, 2, 3, 4]’."
-        }
-    }
-}
--- a/src/test_manifest_job/package-lock.json
+++ b/src/test_manifest_job/package-lock.json
--- a/src/test_manifest_job/package.json
+++ b/src/test_manifest_job/package.json
@ -1,18 +0,0 @@
-{
-  "name": "wpp-checker",
-  "version": "1.0.0",
-  "description": "",
-  "main": "wpp_checker.js",
-  "scripts": {
-    "test": "src/test_manifest_job/node_modules/mocha/bin/_mocha --require mocha-steps --colors src/test_manifest_job/wpp_checker.js"
-  },
-  "author": "Simon",
-  "license": "ISC",
-  "dependencies": {
-    "ajv": "^8.5.0",
-    "ajv-errors": "^3.0.0",
-    "chai": "^4.3.4",
-    "mocha": "^8.4.0",
-    "mocha-steps": "^1.3.0"
-  }
-}