Improve readabiltiy and performance

This commit is contained in:
Tad 2017-12-14 19:39:14 -05:00
parent 2528fba9f0
commit b663a11ee9
3 changed files with 16 additions and 9 deletions

2
.idea/misc.xml generated
View file

@ -24,7 +24,7 @@
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

View file

@ -49,6 +49,10 @@ public class Database {
}
public static void loadDatabase(ArrayList<SignatureDatabase> signatureDatabases) {
signaturesMD5 = new HashMap<String, String>();
signaturesSHA1 = new HashMap<String, String>();
signaturesSHA256 = new HashMap<String, String>();
System.gc();
for (SignatureDatabase database : signatureDatabases) {
File databaseLocation = new File(databasePath + "/" + database.getName());
if (databaseLocation.exists()) {
@ -81,6 +85,7 @@ public class Database {
}
}
}
System.gc();
}
public static String checkInDatabase(String hash) {

View file

@ -92,7 +92,7 @@ public class MalwareScanner {
Database.loadDatabase(Database.signatureDatabases);
publishProgress("Loaded " + Database.signaturesMD5.size() + " MD5 signatures");
publishProgress("Loaded " + Database.signaturesSHA1.size() + " SHA-1 signatures");
publishProgress("Loaded " + Database.signaturesSHA256.size() + " SHA-256 signatures");
publishProgress("Loaded " + Database.signaturesSHA256.size() + " SHA-256 signatures\n");
if (Database.signaturesMD5.size() > 0) {
for (File file : filesToScan) {
@ -105,9 +105,9 @@ public class MalwareScanner {
publishProgress(file.getValue() + " detected as " + result);
}
}
publishProgress("Checked all MD5 hashes against signature databases");
publishProgress("Checked all MD5 hashes against signature databases\n");
} else {
publishProgress("No MD5 signatures available");
publishProgress("No MD5 signatures available\n");
}
if (Database.signaturesSHA1.size() > 0) {
@ -121,9 +121,9 @@ public class MalwareScanner {
publishProgress(file.getValue() + " detected as " + result);
}
}
publishProgress("Checked all SHA-1 hashes against signature databases");
publishProgress("Checked all SHA-1 hashes against signature databases\n");
} else {
publishProgress("No SHA-1 signatures available");
publishProgress("No SHA-1 signatures available\n");
}
if (Database.signaturesSHA256.size() > 0) {
@ -137,11 +137,13 @@ public class MalwareScanner {
publishProgress(file.getValue() + " detected as " + result);
}
}
publishProgress("Checked all SHA-256 hashes against signature databases");
publishProgress("Checked all SHA-256 hashes against signature databases\n");
} else {
publishProgress("No SHA-256 signatures available");
publishProgress("No SHA-256 signatures available\n");
}
System.gc();
return null;
}
@ -152,7 +154,7 @@ public class MalwareScanner {
@Override
protected void onPostExecute(String result) {
log.append("Scan complete!\n");
log.append("Scan complete!\n\n\n\n\n");
}
}