From f34a9a010d6a0c8fcd440383023804f2facc7415 Mon Sep 17 00:00:00 2001
From: Jacob Cody Wimer <jacob.wimer@gmail.com>
Date: Mon, 30 Mar 2015 10:29:16 -0400
Subject: [PATCH] Created fileUtil

---
 source/cryptowallFinder.rb | 19 +++++++++----------
 source/filesUtil.rb        | 25 +++++++++++++++++++++++++
 source/searchUtil.rb       |  5 -----
 3 files changed, 34 insertions(+), 15 deletions(-)
 create mode 100644 source/filesUtil.rb
 delete mode 100644 source/searchUtil.rb

diff --git a/source/cryptowallFinder.rb b/source/cryptowallFinder.rb
index 4161a79..ea4297f 100644
--- a/source/cryptowallFinder.rb
+++ b/source/cryptowallFinder.rb
@@ -1,27 +1,26 @@
-require 'FileUtils'
-require_relative 'searchUtil'
+require_relative 'filesUtil'
 
 
 class Cryptowallfinder	
 
 	attr_accessor :outputFile, :path
 
-	@search = Searchutil.new
+	def initialize
+		@filesUtil = Filesutil.new
+	end
 
 	def infectedFiles(decryptFile)
-		infectedPath = File.dirname("#{decryptFile}")
-		infectedFiles = Dir["#{infectedPath}/*.*"]
+		infectedPath = @filesUtil.getDirectoryNameByFile(decryptFile)
+		infectedFiles = @filesUtil.getAllFilesByPath(infectedPath)
 		return infectedFiles
 	end
 
 	def infectedFileExpandedPath(file)
-		infectedFileExpandedPath = File.expand_path(file.to_s)
-		return infectedFileExpandedPath
+		return @filesUtil.getExpandedPathByFileName(file)
 	end
 
 	def decryptFiles(path)
-		decryptFiles = Dir["#{path}/**/DECRYPT_INSTRUCTION.TXT"]
-		return decryptFiles
+		return @filesUtil.findFilesByFileName(path,'DECRYPT_INSTRUCTION.txt')
 	end
 
 	def writeMyFile(whatToWrite)
@@ -36,7 +35,7 @@ class Cryptowallfinder
 
 	def deleteInstructions(file)
 		if isTorInstructions(file) or isDecryptInstructions(file)
-			FileUtils.rm(File.expand_path(file.to_s))
+			@filesUtil.removeFile(file)
 		end
 	end
 
diff --git a/source/filesUtil.rb b/source/filesUtil.rb
new file mode 100644
index 0000000..06bf623
--- /dev/null
+++ b/source/filesUtil.rb
@@ -0,0 +1,25 @@
+require 'FileUtils'
+
+class Filesutil
+	def findFilesByFileName(path,filename)
+		files = Dir["#{path}/**/#{filename}"]
+		return files
+	end
+
+	def getExpandedPathByFileName(file)
+		return File.expand_path(file.to_s)
+	end
+
+	def removeFile(file)
+		FileUtils.rm(getExpandedPathByFileName(file)) 
+	end
+
+	def getDirectoryNameByFile(file)
+		return File.dirname("#{file}")
+	end
+
+	def getAllFilesByPath(path)
+		return Dir["#{path}/*.*"]
+	end
+
+end
\ No newline at end of file
diff --git a/source/searchUtil.rb b/source/searchUtil.rb
deleted file mode 100644
index 1037d9d..0000000
--- a/source/searchUtil.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'FileUtils'
-
-class Searchutil
-
-end
\ No newline at end of file