Voomra/lwjake2
0
Fork 0
Code Activity

fix: lint

Browse Source
This commit is contained in:
DmitriyMX
2018-03-07 01:13:15 +03:00
parent 38dea96244
commit 5ac1283dc1
1 changed files with 36 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
src/lwjake2/qcommon/BaseQ2FileSystem.java
View File

@@ -100,7 +100,6 @@ public class BaseQ2FileSystem implements FileSystem {
private void path_f() { private void path_f() {
searchpath_t s; searchpath_t s;
filelink_t link;
log.info("Current search path:"); log.info("Current search path:");
for (s = fs_searchpaths; s != null; s = s.next) { for (s = fs_searchpaths; s != null; s = s.next) {
@@ -113,8 +112,7 @@ public class BaseQ2FileSystem implements FileSystem {
} }
log.info("Links:"); log.info("Links:");
for (Iterator<filelink_t> it = fs_links.iterator(); it.hasNext();) { for (filelink_t link : fs_links) {
link = it.next();
log.info("{} : {}", link.from, link.to); log.info("{} : {}", link.from, link.to);
} }
} }
@@ -140,7 +138,7 @@ public class BaseQ2FileSystem implements FileSystem {
it.remove(); it.remove();
return; return;
} }
entry.to = new String(Cmd.Argv(2)); entry.to = Cmd.Argv(2);
return; return;
} }
} }
@@ -148,9 +146,9 @@ public class BaseQ2FileSystem implements FileSystem {
// create a new link if the <to> is not empty // create a new link if the <to> is not empty
if (Cmd.Argv(2).length() > 0) { if (Cmd.Argv(2).length() > 0) {
entry = new filelink_t(); entry = new filelink_t();
entry.from = new String(Cmd.Argv(1)); entry.from = Cmd.Argv(1);
entry.fromlength = entry.from.length(); entry.fromlength = entry.from.length();
entry.to = new String(Cmd.Argv(2)); entry.to = Cmd.Argv(2);
fs_links.add(entry); fs_links.add(entry);
} }
} }
@@ -173,7 +171,7 @@ public class BaseQ2FileSystem implements FileSystem {
if (s.pack != null) if (s.pack != null)
continue; continue;
if (prevpath == prev) if (prevpath.equals(prev))
return s.filename; return s.filename;
prev = s.filename; prev = s.filename;
@@ -200,7 +198,7 @@ public class BaseQ2FileSystem implements FileSystem {
private void dir_f() { private void dir_f() {
String path = null; String path = null;
String findname = null; String findname;
String wildcard = "*.*"; String wildcard = "*.*";
String[] dirnames; String[] dirnames;
@@ -209,25 +207,20 @@ public class BaseQ2FileSystem implements FileSystem {
} }
while ((path = nextPath(path)) != null) { while ((path = nextPath(path)) != null) {
String tmp = findname;
findname = path + '/' + wildcard; findname = path + '/' + wildcard;
if (tmp != null)
tmp.replaceAll("\\\\", "/");
log.info("Directory of {}", findname); log.info("Directory of {}", findname);
log.info("----"); log.info("----");
dirnames = listFiles(findname, 0, 0); dirnames = listFiles(findname, 0, 0);
if (dirnames.length != 0) { if (dirnames.length != 0) {
int index = 0; int index;
for (int i = 0; i < dirnames.length; i++) { for (String dirname : dirnames) {
if ((index = dirnames[i].lastIndexOf('/')) > 0) { if ((index = dirname.lastIndexOf('/')) > 0) {
log.info(dirnames[i].substring(index + 1, dirnames[i].length())); log.info(dirname.substring(index + 1, dirname.length()));
} else { } else {
log.info(dirnames[i]); log.info(dirname);
} }
} }
} }
@@ -263,10 +256,10 @@ public class BaseQ2FileSystem implements FileSystem {
searchpath_t s; searchpath_t s;
for (s = fs_searchpaths; s != null; s = s.next) { for (s = fs_searchpaths; s != null; s = s.next) {
if (s.filename.indexOf("xatrix") != -1) if (s.filename.contains("xatrix"))
return 1; return 1;
if (s.filename.indexOf("rogue") != -1) if (s.filename.contains("rogue"))
return 2; return 2;
} }
@@ -290,8 +283,8 @@ public class BaseQ2FileSystem implements FileSystem {
dpackheader_t header; dpackheader_t header;
Hashtable<String, packfile_t> newfiles; Hashtable<String, packfile_t> newfiles;
RandomAccessFile file; RandomAccessFile file;
int numpackfiles = 0; int numpackfiles;
pack_t pack = null; pack_t pack;
// unsigned checksum; // unsigned checksum;
// //
try { try {
@@ -302,7 +295,7 @@ public class BaseQ2FileSystem implements FileSystem {
fc.close(); fc.close();
if (packhandle == null || packhandle.limit() < 1) if (packhandle.limit() < 1)
return null; return null;
// //
header = new dpackheader_t(); header = new dpackheader_t();
@@ -319,12 +312,12 @@ public class BaseQ2FileSystem implements FileSystem {
Com.Error(Defines.ERR_FATAL, packfile + " has " + numpackfiles Com.Error(Defines.ERR_FATAL, packfile + " has " + numpackfiles
+ " files"); + " files");
newfiles = new Hashtable<String, packfile_t>(numpackfiles); newfiles = new Hashtable<>(numpackfiles);
packhandle.position(header.dirofs); packhandle.position(header.dirofs);
// parse the directory // parse the directory
packfile_t entry = null; packfile_t entry;
for (int i = 0; i < numpackfiles; i++) { for (int i = 0; i < numpackfiles; i++) {
packhandle.get(tmpText); packhandle.get(tmpText);
@@ -343,7 +336,7 @@ public class BaseQ2FileSystem implements FileSystem {
} }
pack = new pack_t(); pack = new pack_t();
pack.filename = new String(packfile); pack.filename = packfile;
pack.handle = file; pack.handle = file;
pack.numfiles = numpackfiles; pack.numfiles = numpackfiles;
pack.files = newfiles; pack.files = newfiles;
@@ -365,13 +358,13 @@ public class BaseQ2FileSystem implements FileSystem {
pack_t pak; pack_t pak;
String pakfile; String pakfile;
fs_gamedir = new String(dir); fs_gamedir = dir;
// //
// add the directory to the search path // add the directory to the search path
// ensure fs_userdir is first in searchpath // ensure fs_userdir is first in searchpath
search = new searchpath_t(); search = new searchpath_t();
search.filename = new String(dir); search.filename = dir;
if (fs_searchpaths != null) { if (fs_searchpaths != null) {
search.next = fs_searchpaths.next; search.next = fs_searchpaths.next;
fs_searchpaths.next = search; fs_searchpaths.next = search;
@@ -405,7 +398,7 @@ public class BaseQ2FileSystem implements FileSystem {
@Override @Override
public void setCDDir() { public void setCDDir() {
fs_cddir = Cvar.Get("cddir", "", CVAR_ARCHIVE); fs_cddir = Cvar.Get("cddir", "", CVAR_ARCHIVE);
if (fs_cddir.string.length() > 0) if (fs_cddir != null && fs_cddir.string.length() > 0)
addGameDirectory(fs_cddir.string + '/' + Globals.BASEDIRNAME); addGameDirectory(fs_cddir.string + '/' + Globals.BASEDIRNAME);
} }
@@ -424,8 +417,7 @@ public class BaseQ2FileSystem implements FileSystem {
public void setGamedir(String dir) { public void setGamedir(String dir) {
searchpath_t next; searchpath_t next;
if (dir.indexOf("..") != -1 || dir.indexOf("/") != -1 if (dir.contains("..") || dir.contains("/") || dir.contains("\\") || dir.contains(":")) {
|| dir.indexOf("\\") != -1 || dir.indexOf(":") != -1) {
log.warn("Gamedir should be a single filename, not a path"); log.warn("Gamedir should be a single filename, not a path");
return; return;
} }
@@ -613,9 +605,10 @@ public class BaseQ2FileSystem implements FileSystem {
public void checkOverride() { public void checkOverride() {
fs_gamedirvar = Cvar.Get("game", "", CVAR_LATCH | CVAR_SERVERINFO); fs_gamedirvar = Cvar.Get("game", "", CVAR_LATCH | CVAR_SERVERINFO);
if (fs_gamedirvar.string.length() > 0) if (fs_gamedirvar != null && fs_gamedirvar.string.length() > 0) {
setGamedir(fs_gamedirvar.string); setGamedir(fs_gamedirvar.string);
} }
}
/* /*
* FOpenFile * FOpenFile
@@ -628,15 +621,12 @@ public class BaseQ2FileSystem implements FileSystem {
searchpath_t search; searchpath_t search;
String netpath; String netpath;
pack_t pak; pack_t pak;
filelink_t link; File file;
File file = null;
file_from_pak = 0; file_from_pak = 0;
// check for links first // check for links first
for (Iterator<filelink_t> it = fs_links.iterator(); it.hasNext();) { for (filelink_t link : fs_links) {
link = it.next();
// if (!strncmp (filename, link->from, link->fromlength)) // if (!strncmp (filename, link->from, link->fromlength))
if (filename.regionMatches(0, link.from, 0, link.fromlength)) { if (filename.regionMatches(0, link.from, 0, link.fromlength)) {
netpath = link.to + filename.substring(link.fromlength); netpath = link.to + filename.substring(link.fromlength);
@@ -704,21 +694,9 @@ public class BaseQ2FileSystem implements FileSystem {
@Override @Override
public void init() { public void init() {
Cmd.AddCommand("path", new Runnable() { Cmd.AddCommand("path", this::path_f);
public void run() { Cmd.AddCommand("link", this::link_f);
path_f(); Cmd.AddCommand("dir", this::dir_f);
}
});
Cmd.AddCommand("link", new Runnable() {
public void run() {
link_f();
}
});
Cmd.AddCommand("dir", new Runnable() {
public void run() {
dir_f();
}
});
fs_userdir = System.getProperty("user.home") + "/.lwjake2"; fs_userdir = System.getProperty("user.home") + "/.lwjake2";
createPath(fs_userdir + "/"); createPath(fs_userdir + "/");
@@ -754,14 +732,11 @@ public class BaseQ2FileSystem implements FileSystem {
searchpath_t search; searchpath_t search;
String netpath; String netpath;
pack_t pak; pack_t pak;
filelink_t link;
file_from_pak = 0; file_from_pak = 0;
// check for links first // check for links first
for (Iterator<filelink_t> it = fs_links.iterator(); it.hasNext();) { for (filelink_t link : fs_links) {
link = it.next();
if (filename.regionMatches(0, link.from, 0, link.fromlength)) { if (filename.regionMatches(0, link.from, 0, link.fromlength)) {
netpath = link.to + filename.substring(link.fromlength); netpath = link.to + filename.substring(link.fromlength);
File file = new File(netpath); File file = new File(netpath);
@@ -823,15 +798,12 @@ public class BaseQ2FileSystem implements FileSystem {
searchpath_t search; searchpath_t search;
String netpath; String netpath;
pack_t pak; pack_t pak;
filelink_t link; File file;
File file = null;
file_from_pak = 0; file_from_pak = 0;
// check for links first // check for links first
for (Iterator<filelink_t> it = fs_links.iterator(); it.hasNext();) { for (filelink_t link : fs_links) {
link = it.next();
// if (!strncmp (filename, link->from, link->fromlength)) // if (!strncmp (filename, link->from, link->fromlength))
if (filename.regionMatches(0, link.from, 0, link.fromlength)) { if (filename.regionMatches(0, link.from, 0, link.fromlength)) {
netpath = link.to + filename.substring(link.fromlength); netpath = link.to + filename.substring(link.fromlength);
@@ -903,7 +875,7 @@ public class BaseQ2FileSystem implements FileSystem {
RandomAccessFile file; RandomAccessFile file;
byte[] buf = null; byte[] buf = null;
int len = 0; int len;
// TODO hack for bad strings (fuck \0) // TODO hack for bad strings (fuck \0)
int index = path.indexOf('\0'); int index = path.indexOf('\0');
@@ -920,6 +892,7 @@ public class BaseQ2FileSystem implements FileSystem {
file = fOpenFile(path); file = fOpenFile(path);
//Read(buf = new byte[len], len, h); //Read(buf = new byte[len], len, h);
buf = new byte[len]; buf = new byte[len];
assert file != null;
file.readFully(buf); file.readFully(buf);
file.close(); file.close();
} catch (IOException e) { } catch (IOException e) {
@@ -937,7 +910,7 @@ public class BaseQ2FileSystem implements FileSystem {
public void read(byte[] buffer, int len, RandomAccessFile file) { public void read(byte[] buffer, int len, RandomAccessFile file) {
int block, remaining; int block, remaining;
int offset = 0; int offset = 0;
int read = 0; int read;
// read in chunks for progress bar // read in chunks for progress bar
remaining = len; remaining = len;