Half implemented scrolling

Author: tgmars

flshell

@@ -4,39 +4,45 @@
 
 package main
 
+import "strings"
+
 // messageRetrieve ... Pass the users selection as an inode for fls or command+inode for carving and a slice of the current
 // directory to retrieve a single element of the slice.
-func messageRetrieve(selection string, input []string) string {
+func messageRetrieve(selection string, input []string) (results string, log string) {
 
 	//Pull the inode and name from the selection.
 	// TODO Test this on selection without a slice to determine how robust the regex is.
 	selectionInode := inodeMatcher(selection)
 	selectionName := nameMatcher(selection)
+	selectedType := dirMatcher(selection)
 
 	// Does not matter that this is not robust logic, input will be locked down by line selection in tcell version.
 	// References to global executionArgs and the unallocatedRecover command line parameter
 	// Return a success message if executeCarvers completes successfully, else return a failure message to the user.
-	if selection[0] == 't' {
+	if strings.Contains(selectedType, "d") {
 		if executeCarvers("tsk_recover", argsUpdaterRecover(executionArgsRecover, selectionInode, *unallocatedRecover), selectionName) {
-			return "Successfully carved " + selectionName
+			return "", "Successfully carved " + selectionName
 		}
-		return "Failed to carve " + selectionName
+		return "", "Failed to carve " + selectionName
 	}
 
-	if selection[0] == 'i' {
+	if strings.Contains(selectedType, "r") {
 		if executeCarvers("icat", argsUpdater(executionArgs, selectionInode), selectionName) {
-			return "Successfully carved " + selectionName
+			return "", "Successfully carved " + selectionName
 		}
-		return "Failed to carve " + selectionName
-	} else {
-		// If there's nothing in the selection string providing direction to carve,
-		// then iterate through input and return a line that has an inode matching to the
-		// selectionInode.
-		for _, inputLine := range input {
-			if selectionInode == inodeMatcher(inputLine) {
-				return inputLine
+		return "", "Failed to carve " + selectionName
+	}
+	// If there's nothing in the selection string providing direction to carve,
+	// then iterate through input and return a line that has an inode matching to the
+	// selectionInode.
+	for _, inputLine := range input {
+		if selectionInode == inodeMatcher(inputLine) {
+			if !executeFLS(executionArgs) {
+				return inputLine, ""
 			}
+			return "", "FLS failed to execute on directory: " + selectionName
 		}
 	}
-	return "Unable to find a line in the input that matches the input string."
+
+	return "", "Unable to find a line in the FLS input slice that matches the selected input string."
 }

interfacecontroller.go

@@ -31,6 +31,7 @@ func main() {
 
 // setupMain ... Initialise and setup variables before entering the main loop of program execution.
 // Assign command line parameters to variables and conduct an initial run of FLS in the root directory.
+// TODO: integrate initial FLS execution with interfacecontroller.go
 func setupMain() {
 	flag.Parse()
 	executionArgs = []string{"-o", *diskoffset, *imagepath, "5"}

main.go

@@ -74,12 +74,6 @@ func drawBody(s tcell.Screen, content []string, selectedline int) {
 	}
 }
 
-// Line ... Represents a line that gets drawn to the screen
-type Line struct {
-	num  int
-	text string
-}
-
 // colourRow ... Set a row on the screen with the specified style, ideally with a specific background colour.
 func colourRow(s tcell.Screen, style tcell.Style, row int) {
 	for x := 0; x < windowWidth; x++ {

view.go

@@ -7,6 +7,7 @@ import (
 )
 
 // globally defined selected line starts at 1 to account for header width.
+// sl is the line within the view, it does not represent the line in the currentSplit
 var sl = 1
 
 // loop ... main execution loop. Figure out wtf is happening here.
@@ -22,16 +23,17 @@ func loop(s tcell.Screen) {
 					close(quit)
 					return
 				case tcell.KeyDown:
-					moveSelectedLine(1, sl, 1, 1)
+					moveSelectedLine(1, sl, len(currentSplit), 1, 1)
 
 				case tcell.KeyUp:
-					moveSelectedLine(-1, sl, 1, 1)
+					moveSelectedLine(-1, sl, len(currentSplit), 1, 1)
 
 				case tcell.KeyLeft:
 
-					s.Sync()
 				case tcell.KeyRight:
-					s.Sync()
+					//determine index into selectedSlice that selectedline is pointed at.
+					//pass selectedline to windowstring to messageretrieve
+					//messageRetrieve()
 				}
 			case *tcell.EventResize:
 				s.Sync()
@@ -56,7 +58,7 @@ loop:
 // moveSelectedLine ... Return the currently selected line with deviation specified by amount value.
 // Amount should only ever be 1 or -1. The logic in moveSelectedLine is not robust enough
 // to safely handle other values.
-func moveSelectedLine(amount int, selectedline int, headerheight int, footerheight int) {
+func moveSelectedLine(amount int, selectedline int, lenlines int, headerheight int, footerheight int) {
 	// if amount is a negative value and the currently selected line is the top (ie, headerwidth), keep it at the
 	// at the index that's the same thickness as the header.
 	if (amount < 0) && (selectedline == headerheight) {
@@ -65,6 +67,8 @@ func moveSelectedLine(amount int, selectedline int, headerheight int, footerheig
 		// then return the max value.
 	} else if (amount > 0) && (selectedline == windowHeight-footerheight-1) {
 		sl = windowHeight - footerheight - 1
+	} else if (amount > 0) && (selectedline == lenlines-1) {
+		sl = lenlines - 1
 	} else {
 		sl = selectedline + amount
 	}
@@ -73,19 +77,19 @@ func moveSelectedLine(amount int, selectedline int, headerheight int, footerheig
 
 // windowString ... takes a chunk of text delimited by newlines and returns a specified portion of it
 // that fits within the current size of the terminal window. A number of lines to offset
-// into the original message must be provided by the selected integer.
-// windowheight will usually be an integer that starts at 1 whereas selected is likely
+// into the original message must be provided by the offset integer.
+// windowheight will usually be an integer that starts at 1 whereas offset is likely
 // starting from 0. When passing variables to this function, it is recommended to increment
-// selected by 1.
+// offset by 1.
 // The function does not return a reduced portion of the input message if it has less lines
 // than windowheight.
-/*func windowString(lines []string, selectedline int, headerheight int, footerheight int) []string {
-	if windowHeight-headerheight-footerheight >= len(lines) {
+func currentWindow(lines []string, offset int, headerheight int, footerheight int) []string {
+	limit := windowHeight - headerheight - footerheight
+	if limit >= len(lines) {
 		return lines
 	}
-	if selected > windowheight {
-		return strings.Join(lines[selected-windowheight:selected], "\n")
+	if offset > limit {
+		return lines[offset-limit : offset]
 	}
-	return strings.Join(lines[0:windowheight], "\n")
+	return lines[0:limit]
 }
-*/