From 6dc87e3354efe09cfc4f0124441603cb81270b04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Mur=C3=A7a?= <leo@leomurca.xyz>
Date: Fri, 18 Nov 2022 13:53:32 -0300
Subject: [PATCH] Add rejected files list

---
 src/lib/Dropzone.svelte             |  4 +--
 src/lib/FileList.svelte             | 14 ++++++++--
 src/lib/FileViewer.svelte           | 42 ++++++++++++++++-------------
 src/utils/filterFileRequirements.js | 20 ++++++++++++++
 4 files changed, 58 insertions(+), 22 deletions(-)
 create mode 100644 src/utils/filterFileRequirements.js

diff --git a/src/lib/Dropzone.svelte b/src/lib/Dropzone.svelte
index c9afc82..2dfc6e3 100644
--- a/src/lib/Dropzone.svelte
+++ b/src/lib/Dropzone.svelte
@@ -1,6 +1,6 @@
 <script>
   export let files;
-  export let acceptedFiles;
+  export let supportedFormats;
   export let onKeydown;
   export let onClick;
   export let onDrop;
@@ -23,7 +23,7 @@
     id="file-input"
     type="file"
     name="files[]"
-    accept={acceptedFiles.join(",")}
+    accept={supportedFormats.join(",")}
     multiple
     on:change={onChange}
     bind:files
diff --git a/src/lib/FileList.svelte b/src/lib/FileList.svelte
index 121c61f..cafeafd 100644
--- a/src/lib/FileList.svelte
+++ b/src/lib/FileList.svelte
@@ -1,12 +1,14 @@
 <script>
+  export let title;
   export let files = [];
+  export let isError = false;
 </script>
 
 {#if files.length !== 0}
   <div id="selected-files-container">
-    <h2>Selected files:</h2>
+    <h2>{title}:</h2>
     {#each Array.from(files) as file}
-      <div id="selected-file-card">
+      <div id={isError ? "selected-file-card-error" : "selected-file-card"}>
         <p>{file.name} ({file.size / 1000} kb)</p>
       </div>
     {/each}
@@ -21,6 +23,14 @@
     margin-top: 10px;
   }
 
+  #selected-file-card-error {
+    border: 1px solid red;
+    width: 500px;
+    padding-left: 15px;
+    margin-top: 10px;
+    color: red;
+  }
+
   @media only screen and (max-device-width: 812px) {
     #selected-files-container {
       width: 100%;
diff --git a/src/lib/FileViewer.svelte b/src/lib/FileViewer.svelte
index 39de554..71ac1ea 100644
--- a/src/lib/FileViewer.svelte
+++ b/src/lib/FileViewer.svelte
@@ -3,10 +3,15 @@
   import Dropzone from "./Dropzone.svelte";
   import FileList from "./FileList.svelte";
 
+  import { filterFileRequirements } from "../utils/filterFileRequirements";
+
   let files;
   let filesRendered = false;
-  const acceptedFiles = [".pes"];
-  const maxFileSize = 700000;
+  let filesRejected;
+  const fileRequirements = {
+    supportedFormats: [".pes"],
+    maxSize: 700000,
+  };
 
   const onSubmit = () => {
     filesRendered = true;
@@ -23,18 +28,10 @@
     const changedFiles = evt.dataTransfer
       ? evt.dataTransfer.files
       : evt.target.files;
-    let filesToUpload = [];
-    for (var i = 0, file; (file = changedFiles[i]); i++) {
-      if (file) {
-        if (file.size <= maxFileSize) {
-          filesToUpload.push(file);
-        } else {
-          console.log("File too large!");
-          console.log(file);
-        }
-      }
-    }
-    files = filesToUpload;
+
+    const results = filterFileRequirements(changedFiles, fileRequirements);
+    files = results.accepted;
+    filesRejected = results.rejected;
   };
 
   const onClick = () => {
@@ -55,11 +52,19 @@
 >
   <h2>Upload files</h2>
   <p>
-    Max file size is <strong>{maxFileSize / 1000}kb</strong>. Accepted formats:
-    <strong>{acceptedFiles.join(",")}</strong>.
+    Max file size is <strong>{fileRequirements.maxSize / 1000}kb</strong>.
+    Accepted formats:
+    <strong>{fileRequirements.supportedFormats.join(",")}</strong>.
   </p>
 
-  <Dropzone {files} {acceptedFiles} {onKeydown} {onClick} {onDrop} {onChange} />
+  <Dropzone
+    {files}
+    supportedFormats={fileRequirements.supportedFormats}
+    {onKeydown}
+    {onClick}
+    {onDrop}
+    {onChange}
+  />
 
   <input type="submit" value="Render files" />
 </form>
@@ -67,7 +72,8 @@
 {#if filesRendered}
   <CardList {files} />
 {:else}
-  <FileList {files} />
+  <FileList title="Rejected Files" files={filesRejected} isError />
+  <FileList title="Selected Files" {files} />
 {/if}
 
 <style>
diff --git a/src/utils/filterFileRequirements.js b/src/utils/filterFileRequirements.js
new file mode 100644
index 0000000..9ef43ac
--- /dev/null
+++ b/src/utils/filterFileRequirements.js
@@ -0,0 +1,20 @@
+export function filterFileRequirements(files, requirements) {
+  let accepted = [];
+  let rejected = [];
+  for (var i = 0, file; (file = files[i]); i++) {
+    if (file) {
+      if (
+        requirements.maxSize >= file.size &&
+        requirements.supportedFormats.includes(
+          `.${file.name.split(".").pop().toLowerCase()}`
+        )
+      ) {
+        accepted.push(file);
+      } else {
+        rejected.push(file);
+      }
+    }
+  }
+
+  return { accepted, rejected };
+}