Merge pull request #4 from AhmedMohamedAbdelaty/bug-Choices-Format

Fixed bug causing code block in choices and updated explanation text color.

Author: AhmedMohamedAbdelaty

popup.js

@@ -20,6 +20,21 @@ function scrapeData() {
   let title = document.querySelector("h1.entry-title");
   let content = document.querySelector("div.entry-content");
   let questions = [];
+  function formatChoices(str) {
+    // Splitting it to array contains choices and answers
+    let choices = str.split(/([a-z]\))/i);
+
+    // removing the new lines between the answer.
+    choices = choices.map((choice) => {
+      choice = choice.trim();
+      return choice;
+    });
+    let modifiedChoices = {};
+    for (let i = 1; i < choices.length; i += 2) {
+      modifiedChoices[choices[i]] = choices[i + 1] + "\n";
+    }
+    return modifiedChoices;
+  }
   var i = 0;
   let isAD = function (element) {
     if (
@@ -53,12 +68,25 @@ function scrapeData() {
     while (content.children[i].tagName !== "P") {
       i++;
     }
-    let p = content.children[i];
-    choices = p.innerText;
-    choices = choices.replace("View Answer", "");
+    let x = "";
+    if (
+      content.children[i].tagName === "P" ||
+      content.children[i].tagName === "PRE"
+    ) {
+      while (
+        content.children[i].tagName === "P" ||
+        content.children[i].tagName === "PRE"
+      ) {
+        x += content.children[i].innerText + "\n";
+        i++;
+      }
+    }
+    choices = x.replace("View Answer", "");
+    choices = choices.trim();
+    // console.log(formatChoices(choices));
+    choices = formatChoices(choices);
     // get the answer
     // while it is an AD
-    i++;
     while (isAD(content.children[i])) {
       i++;
     }
@@ -89,6 +117,7 @@ function scrapeData() {
   let Question = function (child, content) {
     let questionText = child.innerText.replace("View Answer", "");
     let choices = questionText.split("\n").slice(1, -1).join("\n");
+    choices = formatChoices(choices);
     let codeText = "";
     let answer = "";
     let explanation = "";
@@ -133,17 +162,10 @@ function scrapeData() {
     }
     i++;
   }
-  // print title
-  console.log(title.innerText);
-  // print questions
-  for (let i = 0; i < questions.length; i++) {
-    console.log(questions[i]);
-  }
+
   chrome.runtime.sendMessage({ title: title.innerText, questions });
 }
 
-function format(title, questions) {}
-
 function createPDF(title, questions) {
   let doc = new jsPDF("p", "mm", [250, 360]);
   let x = 10,
@@ -195,7 +217,7 @@ function createPDF(title, questions) {
     let text = questionText;
     let textWidth =
       (doc.getStringUnitWidth(text) * fontSize) / doc.internal.scaleFactor;
-    let textLines = doc.splitTextToSize(text, 250);
+    let textLines = doc.splitTextToSize(text, 230);
     textLines.forEach((line) => {
       doc.text(line, x, y);
       y += lineHeight;
@@ -205,22 +227,28 @@ function createPDF(title, questions) {
       codeLines.forEach((line) => {
         doc.setFont("Courier", fontStyle[1]);
         doc.text(line, x, y);
-        y += lineHeight;
+        y += lineHeight - 1.5;
       });
     }
-    let choicesLines = doc.splitTextToSize(choices, 230);
-    for (let i = 0; i < choicesLines.length; i++) {
-      doc.setFont("Times", fontStyle[1]);
-      if (choicesLines[i].charAt(0) === answer) {
+    let choiceKeys = Object.keys(choices);
+    for (let i = 0; i < choiceKeys.length; i++) {
+      let choiceKey = choiceKeys[i];
+      let choiceValue = choices[choiceKey];
+      // get how many "\n" in the choiceValue
+      let newLineCount = (choiceValue.match(/\n/g) || []).length;
+      // add the newLineCount to the y
+      if (choiceKey[0] === answer) {
         doc.setFont("Times", fontStyle[0]);
         doc.setTextColor(0, 0, 128);
+      } else {
+        doc.setFont("Times", fontStyle[1]);
+        doc.setTextColor(0, 0, 0);
       }
-      doc.text(choicesLines[i], x + 4, y);
-      doc.setFont("Times", fontStyle[1]);
-      doc.setTextColor(0, 0, 0);
-      y += lineHeight;
+      doc.text(choiceKey + " " + choiceValue, x + 4, y);
+      y += lineHeight * newLineCount;
     }
     doc.setFont("Times", fontStyle[1]);
+    doc.setTextColor(128, 0, 0);
     doc.text("Explanation:", x, y);
     y += lineHeight;
     let explanationLines = doc.splitTextToSize(explanation, 230);
@@ -233,6 +261,7 @@ function createPDF(title, questions) {
       doc.addPage();
       y = 10;
     }
+    doc.setTextColor(0, 0, 0);
   }
 
   doc.save(`${title}.pdf`);
@@ -244,47 +273,34 @@ function checkQuestionHeight(doc, y, lineHeight, remainingHeight, question) {
   let choices = question.choices;
   let answer = question.answer;
   let explanation = question.explanation;
-  let fontSize = 12;
-  let fontStyle = ["bold", "normal"];
   let text = questionText;
-  let textWidth =
-    (doc.getStringUnitWidth(text) * fontSize) / doc.internal.scaleFactor;
   if (remainingHeight - lineHeight * 5 < 0) {
     return false;
   }
-  doc.setFontSize(fontSize);
-  doc.setFont("Times", fontStyle[0]);
-  doc.setTextColor(0, 0, 0);
-  let x = 10;
   let textLines = doc.splitTextToSize(text, 250);
   textLines.forEach((line) => {
-    // doc.text(line, x, y);
     y += lineHeight;
   });
   if (codeText !== "") {
     let codeLines = doc.splitTextToSize(codeText, 250);
     codeLines.forEach((line) => {
-      doc.setFont("Courier", fontStyle[1]);
-      // doc.text(line, x, y);
       y += lineHeight;
     });
   }
-  let choicesLines = doc.splitTextToSize(choices, 250);
-  choicesLines.forEach((line) => {
-    doc.setFont("Times", fontStyle[1]);
-    // doc.text(line, x, y);
+  let choicesLines = Object.entries(choices);
+  for (let i = 0; i < choicesLines.length; i++) {
+    let [choiceKey, choiceValue] = choicesLines[i];
+    if (choiceKey === answer) {
+    }
     y += lineHeight;
-  });
+  }
+
   let answerLines = doc.splitTextToSize(answer, 250);
   answerLines.forEach((line) => {
-    doc.setFont("Times", fontStyle[0]);
-    // doc.text(line, x, y);
     y += lineHeight;
   });
   let explanationLines = doc.splitTextToSize(explanation, 250);
   explanationLines.forEach((line) => {
-    doc.setFont("Times", fontStyle[1]);
-    // doc.text(line, x, y);
     y += lineHeight;
   });
   y += lineHeight;
@@ -305,4 +321,4 @@ document.addEventListener("DOMContentLoaded", function () {
       };
     })();
   }
-});
+});