jan-leila/Slipstream-Mod-Manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Exploded FTLDat.java into separate files

Browse source
This commit is contained in:
Vhati 2017-12-03 11:00:01 -05:00
parent f6ed5a9afc
commit 3e1744a227
13 changed files with 1015 additions and 1020 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/net/vhati/modmanager/cli/SlipstreamCLI.java
View file

@ -15,7 +15,9 @@ import java.util.Properties;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import net.vhati.ftldat.FTLDat;
import net.vhati.ftldat.AbstractPack;
import net.vhati.ftldat.FolderPack;
import net.vhati.ftldat.FTLPack;
import net.vhati.modmanager.FTLModManager;
import net.vhati.modmanager.core.DelayedDeleteHook;
import net.vhati.modmanager.core.FTLUtilities;
@ -202,16 +204,16 @@ public class SlipstreamCLI {
File resDatFile = new File( datsDir, "resource.dat" );
File[] datFiles = new File[] {dataDatFile, resDatFile};
FTLDat.AbstractPack srcP = null;
FTLDat.AbstractPack dstP = null;
AbstractPack srcP = null;
AbstractPack dstP = null;
InputStream is = null;
try {
if ( !extractDir.exists() ) extractDir.mkdirs();
dstP = new FTLDat.FolderPack( extractDir );
dstP = new FolderPack( extractDir );
for ( File datFile : datFiles ) {
srcP = new FTLDat.FTLPack( datFile, "r" );
srcP = new FTLPack( datFile, "r" );
List<String> innerPaths = srcP.list();
for ( String innerPath : innerPaths ) {

4
src/main/java/net/vhati/modmanager/core/HashThread.java
View file

@ -6,7 +6,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import net.vhati.ftldat.FTLDat;
import net.vhati.ftldat.PackUtilities;
import net.vhati.modmanager.core.HashObserver;
import org.apache.logging.log4j.LogManager;
@ -49,7 +49,7 @@ public class HashThread extends Thread {
private String calcFileMD5( File f ) {
String result = null;
try {
result = FTLDat.calcFileMD5( f );
result = PackUtilities.calcFileMD5( f );
}
catch ( Exception e ) {
log.error( "Error while calculating hash for file: "+ f.getPath(), e );

20
src/main/java/net/vhati/modmanager/core/ModPatchThread.java
View file

@ -14,9 +14,9 @@ import java.util.regex.Pattern;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import net.vhati.ftldat.FTLDat;
import net.vhati.ftldat.FTLDat.AbstractPack;
import net.vhati.ftldat.FTLDat.FTLPack;
import net.vhati.ftldat.AbstractPack;
import net.vhati.ftldat.FTLPack;
import net.vhati.ftldat.PackUtilities;
import net.vhati.modmanager.core.ModPatchObserver;
import net.vhati.modmanager.core.ModUtilities;
@ -28,7 +28,7 @@ import org.apache.logging.log4j.Logger;
public class ModPatchThread extends Thread {
private static final Logger log = LogManager.getLogger(ModPatchThread.class);
private static final Logger log = LogManager.getLogger( ModPatchThread.class );
// Other threads can check or set this.
public volatile boolean keepRunning = true;
@ -125,7 +125,7 @@ public class ModPatchThread extends Thread {
log.info( String.format( "Backing up \"%s\".", dat.datFile.getName() ) );
observer.patchingStatus( String.format( "Backing up \"%s\".", dat.datFile.getName() ) );
FTLDat.copyFile( dat.datFile, dat.bakFile );
PackUtilities.copyFile( dat.datFile, dat.bakFile );
backupsCreated++;
observer.patchingProgress( progMilestone + progBackupMax/allDats.length*backupsCreated, progMax );
@ -144,7 +144,7 @@ public class ModPatchThread extends Thread {
log.info( String.format( "Restoring vanilla \"%s\"...", dat.datFile.getName() ) );
observer.patchingStatus( String.format( "Restoring vanilla \"%s\"...", dat.datFile.getName() ) );
FTLDat.copyFile( dat.bakFile, dat.datFile );
PackUtilities.copyFile( dat.bakFile, dat.datFile );
datsClobbered++;
observer.patchingProgress( progMilestone + progClobberMax/allDats.length*datsClobbered, progMax );
@ -215,9 +215,9 @@ public class ModPatchThread extends Thread {
continue;
}
String parentPath = m.group(1);
String topFolder = m.group(2);
String fileName = m.group(3);
String parentPath = m.group( 1 );
String topFolder = m.group( 2 );
String fileName = m.group( 3 );
AbstractPack ftlP = topFolderMap.get( topFolder );
if ( ftlP == null ) {
@ -378,7 +378,7 @@ public class ModPatchThread extends Thread {
observer.patchingProgress( progMilestone, progMax );
// Prune 'removed' files from dats.
for ( AbstractPack ftlP : new AbstractPack[]{dataP,resP} ) {
for ( AbstractPack ftlP : new AbstractPack[]{dataP, resP} ) {
if ( ftlP instanceof FTLPack ) {
observer.patchingStatus( String.format( "Repacking \"%s\"...", ftlP.getName() ) );

4
src/main/java/net/vhati/modmanager/core/ModsScanThread.java
View file

@ -9,7 +9,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import net.vhati.ftldat.FTLDat;
import net.vhati.ftldat.PackUtilities;
import net.vhati.modmanager.core.ModDB;
import net.vhati.modmanager.core.ModInfo;
import net.vhati.modmanager.core.ModsScanObserver;
@ -81,7 +81,7 @@ public class ModsScanThread extends Thread {
private String calcFileMD5( File f ) {
String result = null;
try {
result = FTLDat.calcFileMD5( f );
result = PackUtilities.calcFileMD5( f );
}
catch ( Exception e ) {
log.error( "Error while calculating hash for file: "+ f.getPath(), e );

6
src/main/java/net/vhati/modmanager/scraper/ForumScraper.java
View file

@ -34,7 +34,7 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import net.vhati.ftldat.FTLDat;
import net.vhati.ftldat.PackUtilities;
import net.vhati.modmanager.core.ModDB;
import net.vhati.modmanager.core.ModInfo;
import net.vhati.modmanager.core.ModsInfo;
@ -342,7 +342,7 @@ public class ForumScraper {
while( true ) {
try {
result.rawDesc = getFirstPost( result.threadURL );
result.threadHash = FTLDat.calcStreamMD5( new ByteArrayInputStream( result.rawDesc.getBytes( Charset.forName("UTF-8") ) ) );
result.threadHash = PackUtilities.calcStreamMD5( new ByteArrayInputStream( result.rawDesc.getBytes( Charset.forName("UTF-8") ) ) );
break;
}
catch ( IOException e ) {
@ -440,7 +440,7 @@ public class ForumScraper {
*/
private static String hashThread( String url ) throws IOException, NoSuchAlgorithmException {
String rawDesc = getFirstPost( url );
return FTLDat.calcStreamMD5( new ByteArrayInputStream( rawDesc.getBytes( Charset.forName("UTF-8") ) ) );
return PackUtilities.calcStreamMD5( new ByteArrayInputStream( rawDesc.getBytes( Charset.forName("UTF-8") ) ) );
}

12
src/main/java/net/vhati/modmanager/ui/DatExtractDialog.java
View file

@ -8,7 +8,9 @@ import java.util.List;
import javax.swing.JDialog;
import javax.swing.SwingUtilities;
import net.vhati.ftldat.FTLDat;
import net.vhati.ftldat.AbstractPack;
import net.vhati.ftldat.FolderPack;
import net.vhati.ftldat.FTLPack;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@ -87,18 +89,18 @@ public class DatExtractDialog extends ProgressDialog {
@Override
public void run() {
FTLDat.AbstractPack srcP = null;
FTLDat.AbstractPack dstP = null;
AbstractPack srcP = null;
AbstractPack dstP = null;
InputStream is = null;
int progress = 0;
try {
if ( !extractDir.exists() ) extractDir.mkdirs();
dstP = new FTLDat.FolderPack( extractDir );
dstP = new FolderPack( extractDir );
for ( File datFile : datFiles ) {
srcP = new FTLDat.FTLPack( datFile, "r" );
srcP = new FTLPack( datFile, "r" );
progress = 0;
List<String> innerPaths = srcP.list();
setProgressLater( progress, innerPaths.size() );

1
src/main/java/net/vhati/modmanager/ui/ManagerFrame.java
View file

@ -53,7 +53,6 @@ import javax.swing.UIManager;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import net.vhati.ftldat.FTLDat;
import net.vhati.modmanager.core.AutoUpdateInfo;
import net.vhati.modmanager.core.ComparableVersion;
import net.vhati.modmanager.core.FTLUtilities;

6
src/main/java/net/vhati/modmanager/ui/ModXMLSandbox.java
View file

@ -54,7 +54,7 @@ import javax.swing.tree.TreePath;
import javax.swing.undo.CannotRedoException;
import javax.swing.undo.UndoManager;
import net.vhati.ftldat.FTLDat;
import net.vhati.ftldat.FTLPack;
import net.vhati.modmanager.core.ModUtilities;
import net.vhati.modmanager.core.SloppyXMLOutputProcessor;
import net.vhati.modmanager.core.XMLPatcher;
@ -319,10 +319,10 @@ public class ModXMLSandbox extends JFrame implements ActionListener {
private void open() {
messageArea.setText( "" );
FTLDat.FTLPack dataP = null;
FTLPack dataP = null;
InputStream is = null;
try {
dataP = new FTLDat.FTLPack( dataDatFile, "r" );
dataP = new FTLPack( dataDatFile, "r" );
List<String> innerPaths = dataP.list();
String innerPath = promptForInnerPath( innerPaths );