#1111

Committed 26 Jul 2025 06:59AM UTC coverage: 3.08% (-0.005%) from 3.085%

Build # #1111

Build Type

push

Committed by

Commit Message

fix #542: support different kinds of zip structure

Run Details

0 of 21 new or added lines in 7 files covered. (0.0%)

1 existing line in 1 file now uncovered.

236 of 7663 relevant lines covered (3.08%)

0.03 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/src/main/java/edu/jiangxin/apktoolbox/swing/extend/plugin/runnable/UnzipRunnable.java

package edu.jiangxin.apktoolbox.swing.extend.plugin.runnable;

import edu.jiangxin.apktoolbox.swing.extend.plugin.ChangeMenuPreparePluginController;
import edu.jiangxin.apktoolbox.swing.extend.plugin.IPreparePluginCallback;
import net.lingala.zip4j.ZipFile;
import net.lingala.zip4j.progress.ProgressMonitor;
import org.apache.commons.io.FileUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import javax.swing.*;
import java.io.File;
import java.io.IOException;

public class UnzipRunnable extends AbstractRunnable {
    private static final Logger LOGGER = LogManager.getLogger(UnzipRunnable.class.getSimpleName());
    private final File pluginFile;
    private final boolean isPluginNeedUnzipToSeparateDir;

    public UnzipRunnable(File pluginFile, boolean isPluginNeedUnzipToSeparateDir, IPreparePluginCallback callback) {
        super("Unzipping...", callback);
        this.pluginFile = pluginFile;
        this.isPluginNeedUnzipToSeparateDir = isPluginNeedUnzipToSeparateDir;
    }

    @Override
    public void run() {
        SwingUtilities.invokeLater(() -> progressBarDialog.setVisible(true));
        LOGGER.info("Unzip file: {}", pluginFile);
        String parentDir = pluginFile.getParent();
        if (isPluginNeedUnzipToSeparateDir) {
            String dirName = pluginFile.getName().substring(0, pluginFile.getName().lastIndexOf('.'));
            parentDir = new File(parentDir, dirName).getAbsolutePath();
            FileUtils.deleteQuietly(new File(parentDir));
            try {
                FileUtils.forceMkdir(new File(parentDir));
            } catch (IOException e) {
                LOGGER.error("forceMkdir failed: IOException");
                callback.onUnzipFinished(ChangeMenuPreparePluginController.RESULT_UNZIP_FAILED);
                return;
            }
        }
        try (ZipFile zipFile = new ZipFile(pluginFile)) {
            zipFile.setRunInThread(true);
            zipFile.extractAll(parentDir);
            while (zipFile.getProgressMonitor().getState() == ProgressMonitor.State.BUSY) {
                if (isCancelled) {
                    zipFile.getProgressMonitor().setCancelAllTasks(true);
                    break;
                }
                progress = zipFile.getProgressMonitor().getPercentDone();
                Thread.sleep(100);
            }
        } catch (IOException e) {
            LOGGER.error("unzipFile failed: IOException");
            callback.onUnzipFinished(ChangeMenuPreparePluginController.RESULT_UNZIP_FAILED);
            return;
        } catch (InterruptedException e) {
            LOGGER.error("unzipFile failed: InterruptedException");
            callback.onUnzipFinished(ChangeMenuPreparePluginController.RESULT_UNZIP_FAILED);
            Thread.currentThread().interrupt();
        }

        if (isCancelled) {
            LOGGER.info("download cancelled");
            String fileName = pluginFile.getAbsolutePath();
            String dirName = fileName.substring(0, fileName.lastIndexOf("."));
            FileUtils.deleteQuietly(new File(dirName));
            callback.onUnzipFinished(ChangeMenuPreparePluginController.RESULT_UNZIP_CANCELLED);
        } else {
            isFinished = true;
            callback.onUnzipFinished(ChangeMenuPreparePluginController.RESULT_UNZIP_SUCCESS);
        }
    }
}

1	package edu.jiangxin.apktoolbox.swing.extend.plugin.runnable;
2
3	import edu.jiangxin.apktoolbox.swing.extend.plugin.ChangeMenuPreparePluginController;
4	import edu.jiangxin.apktoolbox.swing.extend.plugin.IPreparePluginCallback;
5	import net.lingala.zip4j.ZipFile;
6	import net.lingala.zip4j.progress.ProgressMonitor;
7	import org.apache.commons.io.FileUtils;
8	import org.apache.logging.log4j.LogManager;
9	import org.apache.logging.log4j.Logger;
10
11	import javax.swing.*;
12	import java.io.File;
13	import java.io.IOException;
14
15	public class UnzipRunnable extends AbstractRunnable {
16	private static final Logger LOGGER = LogManager.getLogger(UnzipRunnable.class.getSimpleName());	×
17	private final File pluginFile;
18	private final boolean isPluginNeedUnzipToSeparateDir;
19
20	public UnzipRunnable(File pluginFile, boolean isPluginNeedUnzipToSeparateDir, IPreparePluginCallback callback) {
21	super("Unzipping...", callback);	×
22	this.pluginFile = pluginFile;	×
NEW 23	this.isPluginNeedUnzipToSeparateDir = isPluginNeedUnzipToSeparateDir;	×
UNCOV 24	}	×
25
26	@Override
27	public void run() {
28	SwingUtilities.invokeLater(() -> progressBarDialog.setVisible(true));	×
29	LOGGER.info("Unzip file: {}", pluginFile);	×
30	String parentDir = pluginFile.getParent();	×
NEW 31	if (isPluginNeedUnzipToSeparateDir) {	×
NEW 32	String dirName = pluginFile.getName().substring(0, pluginFile.getName().lastIndexOf('.'));	×
NEW 33	parentDir = new File(parentDir, dirName).getAbsolutePath();	×
NEW 34	FileUtils.deleteQuietly(new File(parentDir));	×
35	try {
NEW 36	FileUtils.forceMkdir(new File(parentDir));	×
NEW 37	} catch (IOException e) {	×
NEW 38	LOGGER.error("forceMkdir failed: IOException");	×
NEW 39	callback.onUnzipFinished(ChangeMenuPreparePluginController.RESULT_UNZIP_FAILED);	×
NEW 40	return;	×
NEW 41	}	×
42	}
43	try (ZipFile zipFile = new ZipFile(pluginFile)) {	×
44	zipFile.setRunInThread(true);	×
45	zipFile.extractAll(parentDir);	×
46	while (zipFile.getProgressMonitor().getState() == ProgressMonitor.State.BUSY) {	×
47	if (isCancelled) {	×
48	zipFile.getProgressMonitor().setCancelAllTasks(true);	×
49	break;	×
50	}
51	progress = zipFile.getProgressMonitor().getPercentDone();	×
52	Thread.sleep(100);	×
53	}
54	} catch (IOException e) {	×
55	LOGGER.error("unzipFile failed: IOException");	×
56	callback.onUnzipFinished(ChangeMenuPreparePluginController.RESULT_UNZIP_FAILED);	×
57	return;	×
58	} catch (InterruptedException e) {	×
59	LOGGER.error("unzipFile failed: InterruptedException");	×
60	callback.onUnzipFinished(ChangeMenuPreparePluginController.RESULT_UNZIP_FAILED);	×
61	Thread.currentThread().interrupt();	×
62	}	×
63
64	if (isCancelled) {	×
65	LOGGER.info("download cancelled");	×
66	String fileName = pluginFile.getAbsolutePath();	×
67	String dirName = fileName.substring(0, fileName.lastIndexOf("."));	×
68	FileUtils.deleteQuietly(new File(dirName));	×
69	callback.onUnzipFinished(ChangeMenuPreparePluginController.RESULT_UNZIP_CANCELLED);	×
70	} else {	×
71	isFinished = true;	×
72	callback.onUnzipFinished(ChangeMenuPreparePluginController.RESULT_UNZIP_SUCCESS);	×
73	}
74	}	×
75	}

jiangxincode / ApkToolBoxGUI / #1111

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous