Refactor metadata out

Author: odarbelaeze

src/components/tree/Reference.tsx

@@ -34,7 +34,6 @@ const Reference: FC<Props> = ({
   simple = true,
 }: Props) => (
   <div className="reference" id={label}>
-    {!!title && simple && <div className="title">{title}</div>}
     {!!authors && (
       <Fragment>
         <span className="authors">
@@ -50,7 +49,7 @@ const Reference: FC<Props> = ({
         {". "}
       </Fragment>
     )}
-    {!!title && !simple && (
+    {!!title && (
       <Fragment>
         <span className="title">{title}</span>
         {". "}

src/hooks/useUpload.ts

@@ -1,45 +1,24 @@
-import md5 from "md5";
 import { useCallback, useContext } from "react";
 
 import FirebaseContext from "../context/FirebaseContext";
 import FileContext from "../context/FileContext";
-import * as isi from "../utils/isiUtils";
-import * as scopus from "../utils/scopusUtils";
+import metadata from "../utils/metadata";
 
 const useUpload = () => {
   const { add, track } = useContext(FileContext);
   const firebase = useContext(FirebaseContext);
 
   const upload = useCallback(
     (name: string, blob: Blob) => {
-      blob.text().then((text) => {
+      metadata(name, blob).then((meta) => {
         if (firebase === null) return;
-        const hash = md5(text);
-        const keywords = isi.looksLikeIsi(text)
-          ? isi.mostCommon(isi.keywords(text), 3)
-          : isi.mostCommon(scopus.getKeywords(text), 3);
-        const articles = isi.looksLikeIsi(text)
-          ? isi.countArticles(text)
-          : scopus.countArticles(text);
-        const citations = isi.looksLikeIsi(text)
-          ? isi.countReferences(text)
-          : scopus.countReferences(text);
-        const metadata = {
-          name,
-          blob,
-          hash,
-          keywords,
-          articles,
-          citations,
-          valid: true,
-        };
-        add(metadata);
-        const ref = firebase.storage().ref(`isi-files/${hash}`);
+        add(meta);
+        const ref = firebase.storage().ref(`isi-files/${meta.hash}`);
 
         ref
           .getDownloadURL()
           .then(() => {
-            track(hash, 100);
+            track(meta.hash, 100);
           })
           .catch(() => {
             const task = ref.put(blob);
@@ -48,11 +27,11 @@ const useUpload = () => {
               (snapshot) => {
                 const percent =
                   (snapshot.bytesTransferred / snapshot.totalBytes) * 100;
-                track(hash, percent);
+                track(meta.hash, percent);
               },
               (error) => console.log,
               () => {
-                track(hash, 100);
+                track(meta.hash, 100);
               }
             );
           });

src/utils/customTypes.tsx

@@ -34,5 +34,4 @@ export interface Article {
   issue?: string | null;
   page?: string | null;
   doi?: string | null;
-  simple?: boolean;
 }

src/utils/metadata.ts

@@ -0,0 +1,42 @@
+import { FileMetadata } from "./customTypes";
+import * as isi from "./isiUtils";
+import * as scopus from "./scopusUtils";
+import md5 from "md5";
+
+const metadata = async (name: string, blob: Blob): Promise<FileMetadata> => {
+  const content = await blob.text();
+  const hash = md5(content);
+
+  if (isi.looksLikeIsi(content)) {
+    return {
+      name,
+      blob,
+      hash,
+      keywords: isi.mostCommon(isi.keywords(content), 3),
+      articles: isi.countArticles(content),
+      citations: isi.countReferences(content),
+      valid: true,
+    };
+  }
+
+  if (scopus.looksLikeScopus(content)) {
+    return {
+      name,
+      blob,
+      hash,
+      keywords: isi.mostCommon(scopus.keywords(content), 3),
+      articles: scopus.countArticles(content),
+      citations: scopus.countReferences(content),
+      valid: true,
+    };
+  }
+
+  return {
+    name,
+    hash,
+    blob,
+    valid: false,
+  };
+};
+
+export default metadata;

src/utils/scopusUtils.tsx

@@ -17,7 +17,7 @@ const looksLikeScopus = (content: string): boolean => {
   return true;
 };
 
-const getKeywords = (content: string): string[] =>
+const keywords = (content: string): string[] =>
   content
     .split("\n")
     .filter((line) => !!line)
@@ -72,4 +72,4 @@ const countReferences = (content: string): number =>
       { counting: false, count: 0 }
     ).count;
 
-export { looksLikeScopus, getKeywords, countArticles, countReferences };
+export { looksLikeScopus, keywords, countArticles, countReferences };