fix: removes all "." from temporary file names

This commit is contained in:
lantzelot-swe 2021-04-14 23:26:15 +02:00
parent 9f2b45b8de
commit 6caf53133b
2 changed files with 20 additions and 5 deletions

View File

@ -320,7 +320,6 @@ public class ListPanel extends JPanel
@Override
public void setSelectionInterval(int anchor, int lead)
{
System.out.println("anchor=" + anchor + ", lead=" + lead);
if (!uiModel.isDataChanged())
{
super.setSelectionInterval(anchor, lead);

View File

@ -1132,7 +1132,10 @@ public class FileManager
public static File unzipAndPickFirstEntry(File file)
{
String unzippedBasePath = TEMP_PATH + File.separator + FilenameUtils.removeExtension(file.getName()) + File.separator;
String dirName = file.getName();
dirName = dirName.replaceAll("\\.", "");
String unzippedBasePath = TEMP_PATH + File.separator + dirName + File.separator;
String zipFilePath = file.getAbsolutePath();
Path filePath = null;
@ -1147,7 +1150,12 @@ public class FileManager
if (ze != null)
{
String fileName = ze.getName();
File newFile = new File(unzippedBasePath + fileName);
String extension = FilenameUtils.getExtension(fileName);
fileName = FilenameUtils.removeExtension(fileName);
//remove all "." in name ...
fileName = fileName.replaceAll("\\.", "");
File newFile = new File(unzippedBasePath + fileName + "." + extension);
//create directories for sub directories in zip
new File(newFile.getParent()).mkdirs();
FileOutputStream fos = new FileOutputStream(newFile);
@ -1173,7 +1181,9 @@ public class FileManager
public static File unrarAndPickFirstEntry(File file)
{
String unzippedBasePath = TEMP_PATH + File.separator + FilenameUtils.removeExtension(file.getName()) + File.separator;
String dirName = file.getName();
dirName = dirName.replaceAll("\\.", "");
String unzippedBasePath = TEMP_PATH + File.separator + dirName + File.separator;
Path filePath = null;
try (Archive archive = new Archive(file))
{
@ -1181,7 +1191,13 @@ public class FileManager
FileHeader fh = archive.nextFileHeader();
if (fh != null)
{
File fileEntry = new File(unzippedBasePath + fh.getFileNameString().trim());
String fileName = fh.getFileNameString().trim();
String extension = FilenameUtils.getExtension(fileName);
fileName = FilenameUtils.removeExtension(fileName);
//remove all "." in name ...
fileName = fileName.replaceAll("\\.", "");
File fileEntry = new File(unzippedBasePath + fileName + "." + extension);
//create directories for sub directories in rar
new File(fileEntry.getParent()).mkdirs();