From f2afb422e954ad600c90e9ad73b83ca0cd958fe5 Mon Sep 17 00:00:00 2001
From: Kevin Canico <kevcanico25@gmail.com>
Date: Fri, 4 Mar 2022 13:53:06 +0100
Subject: [PATCH 01/11] :sparkles: add parser function

---
 src/services/gitReader.js | 40 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/src/services/gitReader.js b/src/services/gitReader.js
index 538b299..1b08a66 100644
--- a/src/services/gitReader.js
+++ b/src/services/gitReader.js
@@ -123,4 +123,44 @@ export default class GitReader {
       files: list,
     };
   }
+
+  commitDetailsParser(commitDetails) {
+    const allResultCommandLine = commitDetails;
+
+    const allLinesSplited = allResultCommandLine.split('\n');
+
+    let allFiles = [];
+
+    for (let line in allLinesSplited) {
+      line = parseInt(line);
+      const lineValue = allLinesSplited[line];
+      let lastIndex = allFiles.length - 1;
+      let lastFile = allFiles[lastIndex];
+      if (lineValue.includes('diff --git')) {
+        allFiles.push({});
+        lastIndex = allFiles.length - 1;
+        lastFile = allFiles[lastIndex];
+        lastFile.command = lineValue;
+        lastFile.commits = allLinesSplited[line + 1];
+        lastFile.oldFile = allLinesSplited[line + 2];
+        lastFile.newFile = allLinesSplited[line + 3];
+        lastFile.fileContent = [];
+      } else if (lineValue.includes('@@ -')) {
+        lastFile.fileContent.push({
+          separationName: lineValue,
+          separationContent: [],
+        });
+      } else if (
+        !allLinesSplited[line - 1].includes('diff --git') &&
+        !allLinesSplited[line - 2].includes('diff --git') &&
+        !allLinesSplited[line - 3].includes('diff --git')
+      ) {
+        lastFile.fileContent[
+          lastFile.fileContent.length - 1
+        ].separationContent.push(lineValue);
+      }
+    }
+
+    return allFiles;
+  }
 }

From f68d9c0b116154e9b81ee85de416743f70da1698 Mon Sep 17 00:00:00 2001
From: Lahaxe Hugo <lahaxeh@gmail.com>
Date: Fri, 4 Mar 2022 16:15:34 +0100
Subject: [PATCH 02/11] feat: toggle between file list and file details view in
 view details popup

---
 src/modules/GitView/GitView.vue               |  2 +-
 .../GitView/components/CommitDetails.vue      | 69 +++++--------------
 .../GitView/components/CommitDetailsFile.vue  | 12 ++++
 .../GitView/components/CommitDetailsFiles.vue | 67 ++++++++++++++++++
 .../GitView/components/CommitModal.vue        | 12 +++-
 src/modules/GitView/components/CommitView.vue | 24 ++++++-
 src/modules/GitView/composables/useGitView.js |  9 ++-
 7 files changed, 138 insertions(+), 57 deletions(-)
 create mode 100644 src/modules/GitView/components/CommitDetailsFile.vue
 create mode 100644 src/modules/GitView/components/CommitDetailsFiles.vue

diff --git a/src/modules/GitView/GitView.vue b/src/modules/GitView/GitView.vue
index be0b1ea..decf623 100644
--- a/src/modules/GitView/GitView.vue
+++ b/src/modules/GitView/GitView.vue
@@ -69,9 +69,9 @@ export default {
       headCommitSha,
       folderPath,
       files,
-      commitDetails,
       isDetailsOpened,
       currentBranchCommits,
+      commitDetails,
     };
   },
 };
diff --git a/src/modules/GitView/components/CommitDetails.vue b/src/modules/GitView/components/CommitDetails.vue
index aa0928f..fe71cd3 100644
--- a/src/modules/GitView/components/CommitDetails.vue
+++ b/src/modules/GitView/components/CommitDetails.vue
@@ -4,77 +4,42 @@
     class="flex flex-col border-t-green-400 border-solid border-t-width-2"
   >
     <DsButton @click="closeDetail" class="mx-4 mt-4">Close</DsButton>
-    <p class="pt-4 px-4">{{ recap }}</p>
-    <ul
-      class="flex flex-col justify-center text-sm flex-shrink-0 p-4 flex-grow-0"
-    >
-      <li
-        class="flex items-center"
-        v-for="([filename, affected_line, stat], index) in files"
-        :key="index"
-      >
-        <span class="mr-2">{{ filename }}</span>
-        <span class="mr-2">{{ affected_line }}</span>
-        <span class="mb-0.5" v-html="formatStat(stat)"></span>
-      </li>
-    </ul>
+
+    <CommitDetailsFiles v-if="!isFileDetailsOpened" />
+    <CommitDetailsFile v-else />
   </div>
 </template>
 
 <script>
-import { computed, onMounted, watch } from 'vue';
-
-import { useGit } from '@/composables/useGit';
+import { watch } from 'vue';
 
 import { useGitView } from '../composables/useGitView';
+import CommitDetailsFile from './CommitDetailsFile.vue';
+import CommitDetailsFiles from './CommitDetailsFiles.vue';
 
 export default {
   name: 'CommitDetails',
-  props: {
-    details: {
-      type: Object,
-      required: true,
-    },
+  components: {
+    CommitDetailsFile,
+    CommitDetailsFiles,
   },
 
   emits: ['onClose'],
 
   setup(props, { emit }) {
-    const { getDiffCommit } = useGit();
-    const { shaCommit } = useGitView();
+    const { shaCommit, isFileDetailsOpened } = useGitView();
 
-    const recap = computed(() => props.details.recap);
-    const files = computed(() => props.details.files);
-
-    onMounted(() => {
-      getDiffCommit(shaCommit.value);
-    });
+    const closeDetail = () => {
+      emit('onClose');
+      isFileDetailsOpened.value = false;
+    };
 
-    watch(shaCommit, (newSha) => {
-      getDiffCommit(newSha);
+    watch(shaCommit, () => {
+      isFileDetailsOpened.value = false;
     });
 
-    const regex = /(\+*)(-*)/;
-    const formatStat = (stat) => {
-      if (stat) {
-        const match = stat.match(regex);
-        return (
-          '<span class="text-green-700 text-xl">' +
-          match[1] +
-          '</span>' +
-          ' <span class="text-red-700 text-xl tracking-2px">' +
-          match[2] +
-          '</span>'
-        );
-      }
-    };
-    const closeDetail = () => emit('onClose');
-
     return {
-      recap,
-      files,
-      formatStat,
-      getDiffCommit,
+      isFileDetailsOpened,
       closeDetail,
     };
   },
diff --git a/src/modules/GitView/components/CommitDetailsFile.vue b/src/modules/GitView/components/CommitDetailsFile.vue
new file mode 100644
index 0000000..dc05d77
--- /dev/null
+++ b/src/modules/GitView/components/CommitDetailsFile.vue
@@ -0,0 +1,12 @@
+<template>
+  <div class="pt-4 px-4">
+    <p>Coucou</p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'CommitDetailsFiles',
+  setup(props) {},
+};
+</script>
diff --git a/src/modules/GitView/components/CommitDetailsFiles.vue b/src/modules/GitView/components/CommitDetailsFiles.vue
new file mode 100644
index 0000000..bdb4dff
--- /dev/null
+++ b/src/modules/GitView/components/CommitDetailsFiles.vue
@@ -0,0 +1,67 @@
+<template>
+  <p class="pt-4 px-4">{{ recap }}</p>
+  <ul
+    class="flex flex-col justify-center text-sm flex-shrink-0 p-4 flex-grow-0"
+  >
+    <li
+      class="flex items-center"
+      v-for="([filename, affected_line, stat], index) in files"
+      @click="isFileDetailsOpened = true"
+      :key="index"
+    >
+      <span class="mr-2">{{ filename }}</span>
+      <span class="mr-2">{{ affected_line }}</span>
+      <span class="mb-0.5" v-html="formatStat(stat)"></span>
+    </li>
+  </ul>
+</template>
+
+<script>
+import { computed, onMounted, watch } from 'vue';
+
+import { useGit } from '@/composables/useGit';
+
+import { useGitView } from '../composables/useGitView';
+
+export default {
+  name: 'CommitDetailsFiles',
+  setup() {
+    const { getDiffCommit, commitDetails } = useGit();
+    const { shaCommit, isFileDetailsOpened } = useGitView();
+
+    const recap = computed(() => commitDetails.value.recap);
+    const files = computed(() => commitDetails.value.files);
+
+    onMounted(() => {
+      getDiffCommit(shaCommit.value);
+    });
+
+    watch(shaCommit, (newSha) => {
+      getDiffCommit(newSha);
+    });
+
+    const regex = /(\+*)(-*)/;
+    const formatStat = (stat) => {
+      if (stat) {
+        const match = stat.match(regex);
+        return (
+          '<span class="text-green-700 text-xl">' +
+          match[1] +
+          '</span>' +
+          ' <span class="text-red-700 text-xl tracking-2px">' +
+          match[2] +
+          '</span>'
+        );
+      }
+    };
+
+    return {
+      recap,
+      files,
+      getDiffCommit,
+      formatStat,
+      isFileDetailsOpened,
+    };
+  },
+};
+</script>
diff --git a/src/modules/GitView/components/CommitModal.vue b/src/modules/GitView/components/CommitModal.vue
index 5aa0392..8b17ab9 100644
--- a/src/modules/GitView/components/CommitModal.vue
+++ b/src/modules/GitView/components/CommitModal.vue
@@ -18,6 +18,7 @@
             () => {
               isDetailsOpened = true;
               shaCommit = sha;
+              prevShaCommit = prevSha;
             }
           "
           class="mb-4 mt-4"
@@ -45,6 +46,10 @@ export default {
       type: Object,
       required: true,
     },
+    prevCommit: {
+      type: Object,
+      required: true,
+    },
   },
 
   emits: ['onClose'],
@@ -52,11 +57,14 @@ export default {
   setup(props, { emit }) {
     const { checkoutCommit } = useGit();
 
-    const { isDetailsOpened, shaCommit } = useGitView();
+    const { isDetailsOpened, shaCommit, prevShaCommit } = useGitView();
 
     const author = computed(() => props.commit.author);
     const message = computed(() => props.commit.message);
     const sha = computed(() => props.commit.sha);
+    const prevSha = computed(() =>
+      props.prevCommit ? props.prevCommit.sha : null
+    );
 
     const modalContainer = ref(null);
     onClickOutside(modalContainer, () => emit('onClose'));
@@ -65,10 +73,12 @@ export default {
       author,
       message,
       sha,
+      prevSha,
       checkoutCommit,
       modalContainer,
       isDetailsOpened,
       shaCommit,
+      prevShaCommit,
     };
   },
 };
diff --git a/src/modules/GitView/components/CommitView.vue b/src/modules/GitView/components/CommitView.vue
index 89f9979..654f85f 100644
--- a/src/modules/GitView/components/CommitView.vue
+++ b/src/modules/GitView/components/CommitView.vue
@@ -1,14 +1,30 @@
 <template>
   <div class="flex-col justify-center">
-    <CommitModal v-if="isOpen" :commit="commit" @on-close="isOpen = false" />
+    <CommitModal
+      v-if="isOpen"
+      :commit="commit"
+      :prev-commit="prevCommit"
+      @on-close="isOpen = false"
+    />
     <div
-      class="dot-wrapper bg-gray-400 rounded-1/2 w-16 h-16 border-4 border-gray-700 ml-4 mr-4 mb-2"
+      class="
+        dot-wrapper
+        bg-gray-400
+        rounded-1/2
+        w-16
+        h-16
+        border-4 border-gray-700
+        ml-4
+        mr-4
+        mb-2
+      "
       :class="{ 'bg-indigo-400 border-indigo-700': isHead }"
       @click="isOpen = !isOpen"
     ></div>
 
     <div>
       <p class="pl-4">{{ sha }}</p>
+      <p class="pl-4">{{ prevSha }}</p>
     </div>
 
     <p class="pl-4" v-if="isHead">HEAD</p>
@@ -32,6 +48,10 @@ export default {
       type: Object,
       required: true,
     },
+    prevCommit: {
+      type: Object,
+      required: true,
+    },
   },
 
   setup(props) {
diff --git a/src/modules/GitView/composables/useGitView.js b/src/modules/GitView/composables/useGitView.js
index 479d05b..e6362c1 100644
--- a/src/modules/GitView/composables/useGitView.js
+++ b/src/modules/GitView/composables/useGitView.js
@@ -1,6 +1,13 @@
 import { ref } from '@vue/reactivity';
 
 const isDetailsOpened = ref(false);
+const isFileDetailsOpened = ref(false);
 const shaCommit = ref('');
+const prevShaCommit = ref('');
 
-export const useGitView = () => ({ isDetailsOpened, shaCommit });
+export const useGitView = () => ({
+  isDetailsOpened,
+  isFileDetailsOpened,
+  shaCommit,
+  prevShaCommit,
+});

From 6c2fc1ab48c0b44799098020131f058fb1775e70 Mon Sep 17 00:00:00 2001
From: Tom Siatka <tom.siatka@laposte.net>
Date: Fri, 4 Mar 2022 16:47:24 +0100
Subject: [PATCH 03/11] feat: get file diff

---
 src/composables/useGit.js                     | 16 ++++++++++++++++
 src/events/GitReader.event.js                 | 12 ++++++++++++
 .../GitView/components/CommitDetailsFile.vue  | 19 ++++++++++++++++++-
 .../GitView/components/CommitDetailsFiles.vue | 10 ++++++++--
 src/modules/GitView/composables/useGitView.js |  2 ++
 src/services/gitReader.js                     | 14 +++++++++++---
 utils/constants.js                            |  2 ++
 7 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/src/composables/useGit.js b/src/composables/useGit.js
index 0febcb0..24f6d94 100644
--- a/src/composables/useGit.js
+++ b/src/composables/useGit.js
@@ -13,6 +13,7 @@ const offset = computed(() => limit.value * index.value);
 const currentBranchCommits = ref(0);
 const files = ref([]);
 const commitDetails = ref([]);
+const fileDetails = ref([]);
 
 const headCommitSha = computed({
   get: () => commits.value.find((commit) => commit.isHead)?.sha,
@@ -78,6 +79,20 @@ const getDiffCommit = async (commitSha, stat = true) => {
   );
 };
 
+const getFileDetails = (commitSha, prevShaCommit, fileName) => {
+  ipcRenderer.send(
+    'getFileDetails-event',
+    folderPath.value,
+    commitSha,
+    prevShaCommit,
+    fileName
+  );
+
+  ipcRenderer.on('getFileDetails-reply', (event, detailsList) => {
+    fileDetails.value = detailsList;
+  });
+};
+
 export const useGit = () => ({
   getCommits,
   checkoutBranch,
@@ -85,6 +100,7 @@ export const useGit = () => ({
   checkoutCommit,
   getBranchsInfo,
   getDiffCommit,
+  getFileDetails,
   commits,
   branchs,
   headCommitSha,
diff --git a/src/events/GitReader.event.js b/src/events/GitReader.event.js
index 555b148..11d8575 100644
--- a/src/events/GitReader.event.js
+++ b/src/events/GitReader.event.js
@@ -1,4 +1,6 @@
 import {
+  GET_FILE_DETAILS_EVENT,
+  GET_FILE_DETAILS_REPLY,
   GET_GIT_BRANCHS_EVENT,
   GET_GIT_BRANCHS_INFO_EVENT,
   GET_GIT_DIFF_EVENT,
@@ -43,4 +45,14 @@ export default [
       return details;
     },
   },
+  {
+    name: GET_FILE_DETAILS_EVENT,
+    fct: () => (event, folderPath, sha, prevSha, fileName) => {
+      gitReader
+        .getFileDetails(folderPath, sha, prevSha, fileName)
+        .then((details) => {
+          event.reply(GET_FILE_DETAILS_REPLY, details);
+        });
+    },
+  },
 ];
diff --git a/src/modules/GitView/components/CommitDetailsFile.vue b/src/modules/GitView/components/CommitDetailsFile.vue
index dc05d77..ff116e2 100644
--- a/src/modules/GitView/components/CommitDetailsFile.vue
+++ b/src/modules/GitView/components/CommitDetailsFile.vue
@@ -5,8 +5,25 @@
 </template>
 
 <script>
+import { onMounted, watch } from 'vue';
+
+import { useGit } from '@/composables/useGit';
+
+import { useGitView } from '../composables/useGitView';
+
 export default {
   name: 'CommitDetailsFiles',
-  setup(props) {},
+  setup() {
+    const { getFileDetails, fileDetails } = useGit();
+    const { prevShaCommit, shaCommit, fileName } = useGitView();
+
+    onMounted(() => {
+      getFileDetails(shaCommit.value, prevShaCommit.value, fileName.value);
+    });
+
+    watch(fileDetails, (newFileDetails) => {
+      console.log(newFileDetails);
+    });
+  },
 };
 </script>
diff --git a/src/modules/GitView/components/CommitDetailsFiles.vue b/src/modules/GitView/components/CommitDetailsFiles.vue
index bdb4dff..e808558 100644
--- a/src/modules/GitView/components/CommitDetailsFiles.vue
+++ b/src/modules/GitView/components/CommitDetailsFiles.vue
@@ -6,7 +6,12 @@
     <li
       class="flex items-center"
       v-for="([filename, affected_line, stat], index) in files"
-      @click="isFileDetailsOpened = true"
+      @click="
+        () => {
+          isFileDetailsOpened = true;
+          fileName = filename;
+        }
+      "
       :key="index"
     >
       <span class="mr-2">{{ filename }}</span>
@@ -27,7 +32,7 @@ export default {
   name: 'CommitDetailsFiles',
   setup() {
     const { getDiffCommit, commitDetails } = useGit();
-    const { shaCommit, isFileDetailsOpened } = useGitView();
+    const { shaCommit, isFileDetailsOpened, fileName } = useGitView();
 
     const recap = computed(() => commitDetails.value.recap);
     const files = computed(() => commitDetails.value.files);
@@ -61,6 +66,7 @@ export default {
       getDiffCommit,
       formatStat,
       isFileDetailsOpened,
+      fileName,
     };
   },
 };
diff --git a/src/modules/GitView/composables/useGitView.js b/src/modules/GitView/composables/useGitView.js
index e6362c1..1577b25 100644
--- a/src/modules/GitView/composables/useGitView.js
+++ b/src/modules/GitView/composables/useGitView.js
@@ -4,10 +4,12 @@ const isDetailsOpened = ref(false);
 const isFileDetailsOpened = ref(false);
 const shaCommit = ref('');
 const prevShaCommit = ref('');
+const fileName = ref('');
 
 export const useGitView = () => ({
   isDetailsOpened,
   isFileDetailsOpened,
   shaCommit,
   prevShaCommit,
+  fileName,
 });
diff --git a/src/services/gitReader.js b/src/services/gitReader.js
index 1b08a66..f4626f1 100644
--- a/src/services/gitReader.js
+++ b/src/services/gitReader.js
@@ -101,6 +101,14 @@ export default class GitReader {
     return this.commitStatParser(commandResponse);
   }
 
+  async getFileDetails(path, commit, prevCommit, fileName) {
+    const commandResponse = await this.execGit(
+      path,
+      `git diff ${commit} ${prevCommit} ${fileName}`
+    );
+    return this.fileDetailsParser(commandResponse);
+  }
+
   commitStatParser(commitDetails) {
     const list = commitDetails
       .trim()
@@ -124,8 +132,8 @@ export default class GitReader {
     };
   }
 
-  commitDetailsParser(commitDetails) {
-    const allResultCommandLine = commitDetails;
+  fileDetailsParser(fileDetails) {
+    const allResultCommandLine = fileDetails;
 
     const allLinesSplited = allResultCommandLine.split('\n');
 
@@ -161,6 +169,6 @@ export default class GitReader {
       }
     }
 
-    return allFiles;
+    return allFiles[0];
   }
 }
diff --git a/utils/constants.js b/utils/constants.js
index 27476a2..d0072b2 100644
--- a/utils/constants.js
+++ b/utils/constants.js
@@ -12,4 +12,6 @@ module.exports = {
   GET_GIT_LOGS_BY_OFFSET_REPLY: 'getGitLogsByOffset-reply',
   GET_GIT_DIFF_EVENT: 'getGitDiff-event',
   GET_GIT_DIFF_REPLY: 'getGitDiff-reply',
+  GET_FILE_DETAILS_EVENT: 'getFileDetails-event',
+  GET_FILE_DETAILS_REPLY: 'getFileDetails-reply',
 };

From f7ef09b1d34d14cf090c07988f97ddce3d89a5b8 Mon Sep 17 00:00:00 2001
From: Lahaxe Hugo <lahaxeh@gmail.com>
Date: Fri, 4 Mar 2022 17:49:39 +0100
Subject: [PATCH 04/11] feat: start of file display

---
 docs/style.css                                 |  5 +++++
 .../GitView/components/CommitDetailsFile.vue   | 18 ++++++++++++++++--
 src/modules/GitView/components/CommitModal.vue |  5 ++++-
 src/services/gitReader.js                      |  1 +
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/docs/style.css b/docs/style.css
index aabaa70..3af5eab 100644
--- a/docs/style.css
+++ b/docs/style.css
@@ -641,6 +641,11 @@ Ensure the default browser behavior of the `hidden` attribute.
   background-color: rgb(34 197 94 / var(--tw-bg-opacity));
 }
 
+.bg-gray-200 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(229 231 235 / var(--tw-bg-opacity));
+}
+
 .px-5 {
   padding-left: 1.25rem;
   padding-right: 1.25rem;
diff --git a/src/modules/GitView/components/CommitDetailsFile.vue b/src/modules/GitView/components/CommitDetailsFile.vue
index ff116e2..0d7cd80 100644
--- a/src/modules/GitView/components/CommitDetailsFile.vue
+++ b/src/modules/GitView/components/CommitDetailsFile.vue
@@ -1,11 +1,15 @@
 <template>
   <div class="pt-4 px-4">
-    <p>Coucou</p>
+    <div class="bg-gray-200 p-2 px-4">
+      <div>
+        <p>{{ newFile }}</p>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
-import { onMounted, watch } from 'vue';
+import { computed, onMounted, watch } from 'vue';
 
 import { useGit } from '@/composables/useGit';
 
@@ -17,13 +21,23 @@ export default {
     const { getFileDetails, fileDetails } = useGit();
     const { prevShaCommit, shaCommit, fileName } = useGitView();
 
+    const newFile = computed(() => fileDetails.value.newFile);
+
     onMounted(() => {
       getFileDetails(shaCommit.value, prevShaCommit.value, fileName.value);
     });
 
+    watch(shaCommit, (newSha) => {
+      getFileDetails(newSha.value, prevShaCommit.value, fileName.value);
+    });
+
     watch(fileDetails, (newFileDetails) => {
       console.log(newFileDetails);
     });
+
+    return {
+      newFile,
+    };
   },
 };
 </script>
diff --git a/src/modules/GitView/components/CommitModal.vue b/src/modules/GitView/components/CommitModal.vue
index 8b17ab9..e9e6515 100644
--- a/src/modules/GitView/components/CommitModal.vue
+++ b/src/modules/GitView/components/CommitModal.vue
@@ -19,6 +19,7 @@
               isDetailsOpened = true;
               shaCommit = sha;
               prevShaCommit = prevSha;
+              isFileDetailsOpened = false;
             }
           "
           class="mb-4 mt-4"
@@ -57,7 +58,8 @@ export default {
   setup(props, { emit }) {
     const { checkoutCommit } = useGit();
 
-    const { isDetailsOpened, shaCommit, prevShaCommit } = useGitView();
+    const { isDetailsOpened, shaCommit, prevShaCommit, isFileDetailsOpened } =
+      useGitView();
 
     const author = computed(() => props.commit.author);
     const message = computed(() => props.commit.message);
@@ -77,6 +79,7 @@ export default {
       checkoutCommit,
       modalContainer,
       isDetailsOpened,
+      isFileDetailsOpened,
       shaCommit,
       prevShaCommit,
     };
diff --git a/src/services/gitReader.js b/src/services/gitReader.js
index f4626f1..9bb5e15 100644
--- a/src/services/gitReader.js
+++ b/src/services/gitReader.js
@@ -133,6 +133,7 @@ export default class GitReader {
   }
 
   fileDetailsParser(fileDetails) {
+    // TODO: fix edge case when parsing himself 2ddaa65
     const allResultCommandLine = fileDetails;
 
     const allLinesSplited = allResultCommandLine.split('\n');

From b9a137ecbe873ea198d2b2f6af504b538ec1f1d8 Mon Sep 17 00:00:00 2001
From: Tom Siatka <tom.siatka@laposte.net>
Date: Fri, 4 Mar 2022 16:51:46 +0100
Subject: [PATCH 05/11] add end of line setting in .vscode folder

---
 .gitignore            | 1 -
 .vscode/settings.json | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 .vscode/settings.json

diff --git a/.gitignore b/.gitignore
index 049cd11..0e784d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,6 @@ pnpm-debug.log*
 
 # Editor directories and files
 .idea
-.vscode
 *.suo
 *.ntvs*
 *.njsproj
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..f302814
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1 @@
+{ "files.eol": "\n" }

From 33eef1d4a238e0a526e84df3b878ba22a96b8861 Mon Sep 17 00:00:00 2001
From: felixbouveret <35692793+felixbouveret@users.noreply.github.com>
Date: Fri, 4 Mar 2022 16:40:57 +0100
Subject: [PATCH 06/11] Fix(core): refacto event handle (#55)

---
 src/composables/useGit.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/composables/useGit.js b/src/composables/useGit.js
index 24f6d94..d1aa1a6 100644
--- a/src/composables/useGit.js
+++ b/src/composables/useGit.js
@@ -79,18 +79,14 @@ const getDiffCommit = async (commitSha, stat = true) => {
   );
 };
 
-const getFileDetails = (commitSha, prevShaCommit, fileName) => {
-  ipcRenderer.send(
+const getFileDetails = async (commitSha, prevShaCommit, fileName) => {
+  fileDetails.value = await ipcRenderer.invoke(
     'getFileDetails-event',
     folderPath.value,
     commitSha,
     prevShaCommit,
     fileName
   );
-
-  ipcRenderer.on('getFileDetails-reply', (event, detailsList) => {
-    fileDetails.value = detailsList;
-  });
 };
 
 export const useGit = () => ({

From b806afe9fae9a1ae8fbe36351c65bca66680e8c1 Mon Sep 17 00:00:00 2001
From: Felix <bouveret.felix@gmail.com>
Date: Fri, 18 Mar 2022 13:27:31 +0100
Subject: [PATCH 07/11] Register file details event

---
 src/events/GitReader.event.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/events/GitReader.event.js b/src/events/GitReader.event.js
index 11d8575..cd2818b 100644
--- a/src/events/GitReader.event.js
+++ b/src/events/GitReader.event.js
@@ -47,12 +47,14 @@ export default [
   },
   {
     name: GET_FILE_DETAILS_EVENT,
-    fct: () => (event, folderPath, sha, prevSha, fileName) => {
-      gitReader
-        .getFileDetails(folderPath, sha, prevSha, fileName)
-        .then((details) => {
-          event.reply(GET_FILE_DETAILS_REPLY, details);
-        });
+    fct: async (event, folderPath, sha, prevSha, fileName) => {
+      const details = await gitReader.getFileDetails(
+        folderPath,
+        sha,
+        prevSha,
+        fileName
+      );
+      return details;
     },
   },
 ];

From c71c78cb8e89aa11087ff088e4ce952361decccd Mon Sep 17 00:00:00 2001
From: Tom Siatka <tom.siatka@laposte.net>
Date: Fri, 18 Mar 2022 14:12:01 +0100
Subject: [PATCH 08/11] fixes

---
 src/modules/GitView/components/CommitDetailsFile.vue | 2 +-
 src/modules/GitView/components/CommitModal.vue       | 1 -
 src/modules/GitView/components/CommitView.vue        | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/modules/GitView/components/CommitDetailsFile.vue b/src/modules/GitView/components/CommitDetailsFile.vue
index 0d7cd80..e2ea129 100644
--- a/src/modules/GitView/components/CommitDetailsFile.vue
+++ b/src/modules/GitView/components/CommitDetailsFile.vue
@@ -28,7 +28,7 @@ export default {
     });
 
     watch(shaCommit, (newSha) => {
-      getFileDetails(newSha.value, prevShaCommit.value, fileName.value);
+      getFileDetails(newSha, prevShaCommit.value, fileName.value);
     });
 
     watch(fileDetails, (newFileDetails) => {
diff --git a/src/modules/GitView/components/CommitModal.vue b/src/modules/GitView/components/CommitModal.vue
index e9e6515..979dc55 100644
--- a/src/modules/GitView/components/CommitModal.vue
+++ b/src/modules/GitView/components/CommitModal.vue
@@ -49,7 +49,6 @@ export default {
     },
     prevCommit: {
       type: Object,
-      required: true,
     },
   },
 
diff --git a/src/modules/GitView/components/CommitView.vue b/src/modules/GitView/components/CommitView.vue
index 654f85f..47aa47c 100644
--- a/src/modules/GitView/components/CommitView.vue
+++ b/src/modules/GitView/components/CommitView.vue
@@ -24,7 +24,6 @@
 
     <div>
       <p class="pl-4">{{ sha }}</p>
-      <p class="pl-4">{{ prevSha }}</p>
     </div>
 
     <p class="pl-4" v-if="isHead">HEAD</p>

From 8646b608ee89257ecd1991c0fb759c4d2c3d437f Mon Sep 17 00:00:00 2001
From: Felix <bouveret.felix@gmail.com>
Date: Fri, 18 Mar 2022 17:21:32 +0100
Subject: [PATCH 09/11] Add files details

---
 package.json                                  |  7 ++-
 src/composables/useGit.js                     |  6 +-
 src/events/GitReader.event.js                 |  1 -
 src/main.js                                   |  4 ++
 .../GitView/components/CommitDetailsFile.vue  | 61 +++++++++++++++----
 src/services/gitReader.js                     | 45 +-------------
 6 files changed, 64 insertions(+), 60 deletions(-)

diff --git a/package.json b/package.json
index 5715b20..80381bf 100644
--- a/package.json
+++ b/package.json
@@ -22,13 +22,16 @@
   "dependencies": {
     "@vueuse/core": "^7.5.3",
     "core-js": "^3.6.5",
-    "localforage": "^1.10.0",
     "electron-log": "^4.4.4",
     "electron-simple-updater": "^2.0.11",
     "electron-updater": "^4.6.1",
+    "gitdiff-parser": "^0.2.2",
+    "localforage": "^1.10.0",
     "update-electron-app": "^2.0.1",
     "vue": "^3.0.0",
-    "vue-router": "^4.0.12"
+    "vue-highlightjs": "^1.3.3",
+    "vue-router": "^4.0.12",
+    "vue3-highlightjs": "^1.0.5"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.5.0",
diff --git a/src/composables/useGit.js b/src/composables/useGit.js
index d1aa1a6..71ad371 100644
--- a/src/composables/useGit.js
+++ b/src/composables/useGit.js
@@ -1,4 +1,5 @@
 import { ipcRenderer } from 'electron';
+import gitDiffParser from 'gitdiff-parser';
 import { computed, ref } from 'vue';
 
 import { useFolder } from './useFolder';
@@ -78,15 +79,16 @@ const getDiffCommit = async (commitSha, stat = true) => {
     stat
   );
 };
-
 const getFileDetails = async (commitSha, prevShaCommit, fileName) => {
-  fileDetails.value = await ipcRenderer.invoke(
+  const data = await ipcRenderer.invoke(
     'getFileDetails-event',
     folderPath.value,
     commitSha,
     prevShaCommit,
     fileName
   );
+
+  fileDetails.value = gitDiffParser.parse(data);
 };
 
 export const useGit = () => ({
diff --git a/src/events/GitReader.event.js b/src/events/GitReader.event.js
index cd2818b..d624c1c 100644
--- a/src/events/GitReader.event.js
+++ b/src/events/GitReader.event.js
@@ -1,6 +1,5 @@
 import {
   GET_FILE_DETAILS_EVENT,
-  GET_FILE_DETAILS_REPLY,
   GET_GIT_BRANCHS_EVENT,
   GET_GIT_BRANCHS_INFO_EVENT,
   GET_GIT_DIFF_EVENT,
diff --git a/src/main.js b/src/main.js
index 556aa6b..f18e55c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,4 +1,7 @@
+import 'highlight.js/styles/default.css';
+
 import { createApp } from 'vue';
+import VueHighlightJS from 'vue3-highlightjs';
 
 import DsButton from '@/components/DsButton.vue';
 
@@ -8,4 +11,5 @@ import router from './router';
 const app = createApp(App);
 app.component('DsButton', DsButton);
 app.use(router);
+app.use(VueHighlightJS);
 app.mount('#app');
diff --git a/src/modules/GitView/components/CommitDetailsFile.vue b/src/modules/GitView/components/CommitDetailsFile.vue
index e2ea129..a75d9b9 100644
--- a/src/modules/GitView/components/CommitDetailsFile.vue
+++ b/src/modules/GitView/components/CommitDetailsFile.vue
@@ -1,15 +1,57 @@
 <template>
-  <div class="pt-4 px-4">
-    <div class="bg-gray-200 p-2 px-4">
-      <div>
-        <p>{{ newFile }}</p>
+  <div class="p-2 bg-white border-gray-200 rounded-lg border-width-2 mx-2 mt-2">
+    <div v-for="({ hunks }, fileKey) in fileDetails" :key="`${fileKey}-file`">
+      <div
+        v-for="({ content, changes }, hunkKey) in hunks"
+        :key="hunkKey"
+        class="text-xs"
+      >
+        <p class="text-gray-500">{{ content }}</p>
+        <div
+          v-for="(
+            { content: lineContent, isDelete, isInsert, isNormal }, lineKey
+          ) in changes"
+          :key="`${lineKey}-line`"
+          class="flex px-2 items-center"
+          :class="[
+            {
+              'bg-red-100': isDelete,
+              'bg-green-100': isInsert,
+              'bg-white': isNormal,
+            },
+          ]"
+        >
+          <span
+            :class="[
+              'font-bold',
+              {
+                'text-red-500': isDelete,
+                'text-green-500': isInsert,
+              },
+            ]"
+            >{{ isDelete ? '-' : isInsert ? '+' : ' ' }}</span
+          >
+          <pre
+            class="flex-1"
+            v-highlightjs="lineContent"
+          ><code class="javascript" 
+            :class="[
+              {
+                'bg-red-100': isDelete,
+                'bg-green-100': isInsert,
+                'bg-white': isNormal,
+              },
+            ]"></code></pre>
+        </div>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import { computed, onMounted, watch } from 'vue';
+import 'prismjs/themes/prism.css';
+
+import { onMounted, watch } from 'vue';
 
 import { useGit } from '@/composables/useGit';
 
@@ -17,12 +59,11 @@ import { useGitView } from '../composables/useGitView';
 
 export default {
   name: 'CommitDetailsFiles',
+
   setup() {
     const { getFileDetails, fileDetails } = useGit();
     const { prevShaCommit, shaCommit, fileName } = useGitView();
 
-    const newFile = computed(() => fileDetails.value.newFile);
-
     onMounted(() => {
       getFileDetails(shaCommit.value, prevShaCommit.value, fileName.value);
     });
@@ -31,12 +72,8 @@ export default {
       getFileDetails(newSha, prevShaCommit.value, fileName.value);
     });
 
-    watch(fileDetails, (newFileDetails) => {
-      console.log(newFileDetails);
-    });
-
     return {
-      newFile,
+      fileDetails,
     };
   },
 };
diff --git a/src/services/gitReader.js b/src/services/gitReader.js
index 9bb5e15..110ebfb 100644
--- a/src/services/gitReader.js
+++ b/src/services/gitReader.js
@@ -104,9 +104,9 @@ export default class GitReader {
   async getFileDetails(path, commit, prevCommit, fileName) {
     const commandResponse = await this.execGit(
       path,
-      `git diff ${commit} ${prevCommit} ${fileName}`
+      `git diff ${prevCommit} ${commit} ${fileName}`
     );
-    return this.fileDetailsParser(commandResponse);
+    return commandResponse;
   }
 
   commitStatParser(commitDetails) {
@@ -131,45 +131,4 @@ export default class GitReader {
       files: list,
     };
   }
-
-  fileDetailsParser(fileDetails) {
-    // TODO: fix edge case when parsing himself 2ddaa65
-    const allResultCommandLine = fileDetails;
-
-    const allLinesSplited = allResultCommandLine.split('\n');
-
-    let allFiles = [];
-
-    for (let line in allLinesSplited) {
-      line = parseInt(line);
-      const lineValue = allLinesSplited[line];
-      let lastIndex = allFiles.length - 1;
-      let lastFile = allFiles[lastIndex];
-      if (lineValue.includes('diff --git')) {
-        allFiles.push({});
-        lastIndex = allFiles.length - 1;
-        lastFile = allFiles[lastIndex];
-        lastFile.command = lineValue;
-        lastFile.commits = allLinesSplited[line + 1];
-        lastFile.oldFile = allLinesSplited[line + 2];
-        lastFile.newFile = allLinesSplited[line + 3];
-        lastFile.fileContent = [];
-      } else if (lineValue.includes('@@ -')) {
-        lastFile.fileContent.push({
-          separationName: lineValue,
-          separationContent: [],
-        });
-      } else if (
-        !allLinesSplited[line - 1].includes('diff --git') &&
-        !allLinesSplited[line - 2].includes('diff --git') &&
-        !allLinesSplited[line - 3].includes('diff --git')
-      ) {
-        lastFile.fileContent[
-          lastFile.fileContent.length - 1
-        ].separationContent.push(lineValue);
-      }
-    }
-
-    return allFiles[0];
-  }
 }

From 31afa4ae995d4fc2f14c0fd8d56a25c50e1fd370 Mon Sep 17 00:00:00 2001
From: Felix <bouveret.felix@gmail.com>
Date: Sat, 19 Mar 2022 15:03:53 +0100
Subject: [PATCH 10/11] Update dependencies

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 80381bf..0e4a937 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "electron-updater": "^4.6.1",
     "gitdiff-parser": "^0.2.2",
     "localforage": "^1.10.0",
+    "prismjs": "^1.27.0",
     "update-electron-app": "^2.0.1",
     "vue": "^3.0.0",
     "vue-highlightjs": "^1.3.3",

From 2b106e067dbe57cf24b1b9bed1f8f5602f476c61 Mon Sep 17 00:00:00 2001
From: Felix <bouveret.felix@gmail.com>
Date: Sat, 19 Mar 2022 16:32:43 +0100
Subject: [PATCH 11/11] Fix rebase

---
 src/composables/useGit.js                     |  2 +
 .../GitView/components/CommitDetails.vue      |  5 ++-
 .../GitView/components/CommitDetailsFile.vue  | 43 +++++++++++++------
 src/modules/GitView/components/CommitList.vue |  1 +
 .../GitView/components/CommitModal.vue        |  1 +
 src/services/gitReader.js                     |  2 +-
 6 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/src/composables/useGit.js b/src/composables/useGit.js
index 71ad371..f6c1dcf 100644
--- a/src/composables/useGit.js
+++ b/src/composables/useGit.js
@@ -87,6 +87,7 @@ const getFileDetails = async (commitSha, prevShaCommit, fileName) => {
     prevShaCommit,
     fileName
   );
+  console.log(data);
 
   fileDetails.value = gitDiffParser.parse(data);
 };
@@ -106,5 +107,6 @@ export const useGit = () => ({
   currentBranchCommits,
   files,
   commitDetails,
+  fileDetails,
   resetState,
 });
diff --git a/src/modules/GitView/components/CommitDetails.vue b/src/modules/GitView/components/CommitDetails.vue
index fe71cd3..f3fc34a 100644
--- a/src/modules/GitView/components/CommitDetails.vue
+++ b/src/modules/GitView/components/CommitDetails.vue
@@ -1,9 +1,9 @@
 <template>
   <div
     id="details-sidebar"
-    class="flex flex-col border-t-green-400 border-solid border-t-width-2"
+    class="flex flex-col border-t-green-400 border-solid border-t-width-2 overflow-auto p-2"
   >
-    <DsButton @click="closeDetail" class="mx-4 mt-4">Close</DsButton>
+    <DsButton @click="closeDetail" class="mt-4">Close</DsButton>
 
     <CommitDetailsFiles v-if="!isFileDetailsOpened" />
     <CommitDetailsFile v-else />
@@ -19,6 +19,7 @@ import CommitDetailsFiles from './CommitDetailsFiles.vue';
 
 export default {
   name: 'CommitDetails',
+
   components: {
     CommitDetailsFile,
     CommitDetailsFiles,
diff --git a/src/modules/GitView/components/CommitDetailsFile.vue b/src/modules/GitView/components/CommitDetailsFile.vue
index a75d9b9..16f63a9 100644
--- a/src/modules/GitView/components/CommitDetailsFile.vue
+++ b/src/modules/GitView/components/CommitDetailsFile.vue
@@ -1,18 +1,27 @@
 <template>
-  <div class="p-2 bg-white border-gray-200 rounded-lg border-width-2 mx-2 mt-2">
+  <div class="bg-gray-100 border-gray-200 rounded-lg border-width-2 mt-2 pb-2">
     <div v-for="({ hunks }, fileKey) in fileDetails" :key="`${fileKey}-file`">
       <div
         v-for="({ content, changes }, hunkKey) in hunks"
         :key="hunkKey"
         class="text-xs"
       >
-        <p class="text-gray-500">{{ content }}</p>
+        <p class="text-gray-500 p-2">{{ content }}</p>
         <div
           v-for="(
-            { content: lineContent, isDelete, isInsert, isNormal }, lineKey
+            {
+              content: lineContent,
+              isDelete,
+              isInsert,
+              isNormal,
+              lineNumber,
+              newLineNumber,
+              oldLineNumber,
+            },
+            lineKey
           ) in changes"
           :key="`${lineKey}-line`"
-          class="flex px-2 items-center"
+          class="flex items-center h-6"
           :class="[
             {
               'bg-red-100': isDelete,
@@ -21,9 +30,24 @@
             },
           ]"
         >
+          <div
+            class="flex gap-1 text-center h-full items-center"
+            :class="[
+              {
+                'bg-red-200': isDelete,
+                'bg-green-200': isInsert,
+                'bg-white': isNormal,
+              },
+            ]"
+          >
+            <span class="min-w-10 block">{{ oldLineNumber }}</span>
+            <span class="min-w-10 block">{{
+              lineNumber ? lineNumber : newLineNumber
+            }}</span>
+          </div>
           <span
             :class="[
-              'font-bold',
+              'font-bold block text-center min-w-4',
               {
                 'text-red-500': isDelete,
                 'text-green-500': isInsert,
@@ -34,14 +58,7 @@
           <pre
             class="flex-1"
             v-highlightjs="lineContent"
-          ><code class="javascript" 
-            :class="[
-              {
-                'bg-red-100': isDelete,
-                'bg-green-100': isInsert,
-                'bg-white': isNormal,
-              },
-            ]"></code></pre>
+          ><code class="javascript bg-transparent"></code></pre>
         </div>
       </div>
     </div>
diff --git a/src/modules/GitView/components/CommitList.vue b/src/modules/GitView/components/CommitList.vue
index ef9f9ab..16651e1 100644
--- a/src/modules/GitView/components/CommitList.vue
+++ b/src/modules/GitView/components/CommitList.vue
@@ -11,6 +11,7 @@
         v-for="(commit, commitIndex) in commits"
         :key="commitIndex"
         :commit="commit"
+        :prev-commit="commitIndex - 1 >= 0 ? commits[commitIndex - 1] : null"
       />
     </div>
   </div>
diff --git a/src/modules/GitView/components/CommitModal.vue b/src/modules/GitView/components/CommitModal.vue
index 979dc55..e9e6515 100644
--- a/src/modules/GitView/components/CommitModal.vue
+++ b/src/modules/GitView/components/CommitModal.vue
@@ -49,6 +49,7 @@ export default {
     },
     prevCommit: {
       type: Object,
+      required: true,
     },
   },
 
diff --git a/src/services/gitReader.js b/src/services/gitReader.js
index 110ebfb..dbe4b7a 100644
--- a/src/services/gitReader.js
+++ b/src/services/gitReader.js
@@ -96,7 +96,7 @@ export default class GitReader {
   async getGitDiff(path, commit, stat) {
     const commandResponse = await this.execGit(
       path,
-      `git show ${commit} --pretty="format:" ${stat ? '--stat' : ''}`
+      `git show ${commit} --pretty="format:" ${stat ? '--stat="124"' : ''}`
     );
     return this.commitStatParser(commandResponse);
   }