Move logic

ehmicky · Jan 9, 2022 · 09c91cd · 09c91cd
1 parent ca8994b
commit 09c91cd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/src/history/data/main.js b/src/history/data/main.js
@@ -3,6 +3,7 @@ import inquirer from 'inquirer'
 import { isTtyInput } from '../../report/tty.js'
 import { pickLast } from '../../utils/last.js'
 import { applyMainDelta, applySinceDelta } from '../delta/find.js'
+import { shortenId } from '../merge/id.js'
 import { groupMetadata, ungroupMetadata } from '../merge/metadata.js'
 import { compressRawResult } from '../normalize/compress.js'
 import { loadRawResults, normalizePreviousResults } from '../normalize/load.js'
@@ -22,7 +23,8 @@ export const addToHistory = async function (rawResult, { save, cwd }) {
   }
 
   const rawResultA = compressRawResult(rawResult)
-  await addRawResult(rawResultA, cwd)
+  const metadatum = getRawResultMetadatum(rawResultA)
+  await addRawResult(metadatum, rawResultA, cwd)
 }
 
 // Remove a rawResult
@@ -31,7 +33,14 @@ export const removeFromHistory = async function (rawResult, { cwd, force }) {
     return
   }
 
-  await removeRawResult(rawResult, cwd)
+  const metadatum = getRawResultMetadatum(rawResult)
+  await removeRawResult(metadatum, cwd)
+}
+
+// Retrieve the metadatum of a rawResult
+const getRawResultMetadatum = function ({ id, subId, timestamp }) {
+  const idA = shortenId(id)
+  return { id: idA, subId, timestamp }
 }
 
 const shouldRemoveFromHistory = async function (force) {

diff --git a/src/history/data/results.js b/src/history/data/results.js
@@ -1,7 +1,5 @@
 import pMap from 'p-map'
 
-import { shortenId } from '../merge/id.js'
-
 import { parseRawResult, serializeRawResult } from './contents.js'
 import { getReadHistoryDir, getWriteHistoryDir } from './dir.js'
 import { parseFilename, serializeFilename } from './filename.js'
@@ -60,8 +58,7 @@ const fetchRawResult = async function (metadatum, historyDir) {
 }
 
 // Save a new rawResult
-export const addRawResult = async function (rawResult, cwd) {
-  const metadatum = getRawResultMetadatum(rawResult)
+export const addRawResult = async function (metadatum, rawResult, cwd) {
   const historyDir = await getWriteHistoryDir(cwd)
   const filename = serializeFilename(metadatum)
   const path = `${historyDir}/${filename}`
@@ -70,8 +67,7 @@ export const addRawResult = async function (rawResult, cwd) {
 }
 
 // Remove a rawResult from the filesystem
-export const removeRawResult = async function (rawResult, cwd) {
-  const metadatum = getRawResultMetadatum(rawResult)
+export const removeRawResult = async function (metadatum, cwd) {
   const historyDir = await getReadHistoryDir(cwd)
 
   if (historyDir === undefined) {
@@ -82,9 +78,3 @@ export const removeRawResult = async function (rawResult, cwd) {
   const path = `${historyDir}/${filename}`
   await deleteRawResult(path)
 }
-
-// Retrieve the metadatum of a rawResult
-const getRawResultMetadatum = function ({ id, subId, timestamp }) {
-  const idA = shortenId(id)
-  return { id: idA, subId, timestamp }
-}