diff --git a/README.md b/README.md
index 57c9a03..6602610 100644
--- a/README.md
+++ b/README.md
@@ -4,5 +4,5 @@ org.arong.egdownloader.ui.Main
适合里站，表站未知;
-百度网盘：[egdownloader0.90.exe](https://pan.baidu.com/s/19Z7eqOm41arJ9IJV-Ascog) 下载。
+百度网盘：[egdownloader0.95.exe](https://pan.baidu.com/s/1Za_diYdowWLzZmybEcSkjA) 提取码：jww2。
diff --git a/ext/egdownloader.jar b/ext/egdownloader.jar
index 88a3497..57f4797 100644
Binary files a/ext/egdownloader.jar and b/ext/egdownloader.jar differ
diff --git a/script/egversion b/script/egversion
index 521bc81..7848751 100644
--- a/script/egversion
+++ b/script/egversion
@@ -1 +1 @@
-{"version":"0.90","url":"https://pan.baidu.com/s/19Z7eqOm41arJ9IJV-Ascog","jarVersion":"1","jarUrl":"https://raw.githubusercontent.com/dipoo/egdownloader/master/ext/egdownloader.jar"}
\ No newline at end of file
+{"version":"0.95","url":"https://pan.baidu.com/s/1Za_diYdowWLzZmybEcSkjA","baidu_pan_code":"jww2","jarVersion":"1","jarUrl":"https://raw.githubusercontent.com/dipoo/egdownloader/master/ext/egdownloader.jar"}
\ No newline at end of file
diff --git a/src/org/arong/egdownloader/db/impl/PictureDom4jDbTemplate.java b/src/org/arong/egdownloader/db/impl/PictureDom4jDbTemplate.java
index c7ab631..49e6134 100644
--- a/src/org/arong/egdownloader/db/impl/PictureDom4jDbTemplate.java
+++ b/src/org/arong/egdownloader/db/impl/PictureDom4jDbTemplate.java
@@ -14,7 +14,7 @@
import org.arong.egdownloader.model.Picture;
import org.arong.egdownloader.ui.ComponentConst;
import org.arong.util.Dom4jUtil;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
@@ -43,7 +43,7 @@ public static void updateDom(){
try {
dom = Dom4jUtil.getDOM(ComponentConst.PICTURE_XML_DATA_PATH);
} catch (DocumentException e) {
- FileUtil.ifNotExistsThenCreate(ComponentConst.DATA_PATH);
+ FileUtil2.ifNotExistsThenCreate(ComponentConst.DATA_PATH);
String xml = "";
int length = 0; //每一次读取的长度
char[] buffer = new char[2048]; //设缓冲最大值为2048字符
diff --git a/src/org/arong/egdownloader/db/impl/SettingDom4jDbTemplate.java b/src/org/arong/egdownloader/db/impl/SettingDom4jDbTemplate.java
index a0c50bd..40f3e57 100644
--- a/src/org/arong/egdownloader/db/impl/SettingDom4jDbTemplate.java
+++ b/src/org/arong/egdownloader/db/impl/SettingDom4jDbTemplate.java
@@ -13,7 +13,7 @@
import org.arong.egdownloader.ui.ComponentConst;
import org.arong.util.CodeUtil;
import org.arong.util.Dom4jUtil;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
@@ -36,7 +36,7 @@ public static void updateDom(){
try {
dom = Dom4jUtil.getDOM(ComponentConst.SETTING_XML_DATA_PATH);
} catch (DocumentException e) {
- FileUtil.ifNotExistsThenCreate(ComponentConst.DATA_PATH);
+ FileUtil2.ifNotExistsThenCreate(ComponentConst.DATA_PATH);
String xml = "";
int length = 0; //每一次读取的长度
char[] buffer = new char[2048]; //设缓冲最大值为2048字符
diff --git a/src/org/arong/egdownloader/db/impl/TaskDom4jDbTemplate.java b/src/org/arong/egdownloader/db/impl/TaskDom4jDbTemplate.java
index a948d26..da7638f 100644
--- a/src/org/arong/egdownloader/db/impl/TaskDom4jDbTemplate.java
+++ b/src/org/arong/egdownloader/db/impl/TaskDom4jDbTemplate.java
@@ -18,7 +18,7 @@
import org.arong.egdownloader.model.TaskStatus;
import org.arong.egdownloader.ui.ComponentConst;
import org.arong.util.Dom4jUtil;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
@@ -47,7 +47,7 @@ public static void updateDom(){
try {
dom = Dom4jUtil.getDOM(ComponentConst.TASK_XML_DATA_PATH);
} catch (DocumentException e) {
- FileUtil.ifNotExistsThenCreate(ComponentConst.DATA_PATH);
+ FileUtil2.ifNotExistsThenCreate(ComponentConst.DATA_PATH);
String xml = "";
int length = 0; //每一次读取的长度
char[] buffer = new char[2048]; //设缓冲最大值为2048字符
diff --git a/src/org/arong/egdownloader/model/ScriptParser.java b/src/org/arong/egdownloader/model/ScriptParser.java
index 4d20a9f..4e49c22 100644
--- a/src/org/arong/egdownloader/model/ScriptParser.java
+++ b/src/org/arong/egdownloader/model/ScriptParser.java
@@ -25,7 +25,7 @@
import org.arong.egdownloader.spider.WebClient;
import org.arong.egdownloader.ui.window.CreatingWindow;
import org.arong.egdownloader.version.Version;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
import org.arong.util.JsonUtil;
import org.arong.util.Tracker;
@@ -143,7 +143,7 @@ public static Task buildTaskByJavaScript(Task task, Setting setting, JDialog win
}
String source = WebClient.getRequestUseJavaWithCookie(task.getUrl(), "UTF-8", setting.getCookieInfo());//WebClient.postRequestWithCookie(task.getUrl(), setting.getCookieInfo());
//保存源文件
- FileUtil.storeStr2file(source, "source/", "task.html");
+ FileUtil2.storeStr2file(source, "source/", "task.html");
Map param = new HashMap();
param.put("htmlSource", source);
@@ -232,10 +232,10 @@ public static Task buildTaskByJavaScript(Task task, Setting setting, JDialog win
private static String genSaveDir(Task task){
String s = null;
if(task.isSaveDirAsSubname() && StringUtils.isNotBlank(task.getSubname())){
- s = FileUtil.filterDir(task.getSubname());
+ s = FileUtil2.filterDir(task.getSubname());
}
if(StringUtils.isBlank(s)){
- s = FileUtil.filterDir(task.getName());
+ s = FileUtil2.filterDir(task.getName());
}
return task.getSaveDir() + "/" + s;
}
@@ -328,7 +328,7 @@ public static String getdownloadUrl(Task task, String sourceUrl, Setting setting
String source = WebClient.getRequestUseJavaWithCookie(sourceUrl, "UTF-8", setting.getCookieInfo());
try {
//保存源文件
- FileUtil.storeStr2file(source, "source/", "download.html");
+ FileUtil2.storeStr2file(source, "source/", "download.html");
Map param = new HashMap();
param.put("htmlSource", source);
param.put("version", Version.VERSION);
diff --git a/src/org/arong/egdownloader/model/Task.java b/src/org/arong/egdownloader/model/Task.java
index d47c964..37ae2f2 100644
--- a/src/org/arong/egdownloader/model/Task.java
+++ b/src/org/arong/egdownloader/model/Task.java
@@ -20,7 +20,7 @@
import org.arong.egdownloader.ui.work.CreateWorker;
import org.arong.egdownloader.ui.work.DownloadWorker;
import org.arong.egdownloader.ui.work.ReCreateWorker;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
/**
* 任务模型
* @author 阿荣
@@ -91,7 +91,7 @@ public int storeStream(String path, String name, InputStream in) throws IOExcept
return 0;
}
File dir = new File(path);
- FileUtil.ifNotExistsThenCreate(dir);
+ FileUtil2.ifNotExistsThenCreate(dir);
BufferedInputStream bis = null;
BufferedOutputStream bos = null;
int size = 0;
@@ -104,7 +104,7 @@ public int storeStream(String path, String name, InputStream in) throws IOExcept
while ((len = bis.read(buff)) != -1) {
size += len;
byteLength += len;
- FileUtil.byteLength += len;
+ FileUtil2.byteLength += len;
bos.write(buff, 0, len);
}
bos.flush();
@@ -411,7 +411,7 @@ public TimerTask getTimerTask() {
public void run() {
//当前一秒内的流量
Long length = byteLength - oldByteLength;
- setDownSpeed(FileUtil.showSizeStr(length) + "/S");
+ setDownSpeed(FileUtil2.showSizeStr(length) + "/S");
if(byteLength > 999900000){
byteLength = 0L;
oldByteLength = 0L;
@@ -490,8 +490,8 @@ public void setSaveDirAsSubname(boolean saveDirAsSubname) {
public String getRealSaveDirName(){
if(saveDirAsSubname && subname != null){
- return FileUtil.filterDir(StringUtils.isNotBlank(subname.trim()) ? subname.trim() : name);
+ return FileUtil2.filterDir(StringUtils.isNotBlank(subname.trim()) ? subname.trim() : name);
}
- return FileUtil.filterDir(name);
+ return FileUtil2.filterDir(name);
}
}
diff --git a/src/org/arong/egdownloader/ui/SwingPrintStream.java b/src/org/arong/egdownloader/ui/SwingPrintStream.java
index ff5c010..6489f59 100644
--- a/src/org/arong/egdownloader/ui/SwingPrintStream.java
+++ b/src/org/arong/egdownloader/ui/SwingPrintStream.java
@@ -13,7 +13,7 @@
import org.arong.egdownloader.ui.panel.ConsolePanel;
import org.arong.util.DateUtil;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
import org.arong.utils.StringUtil;
/**
@@ -31,11 +31,11 @@ public class SwingPrintStream extends PrintStream {
}
static BufferedWriter logfw = null;
static{
- String binPath = FileUtil.getAppPath(SwingPrintStream.class);
+ String binPath = FileUtil2.getProjectPath();
if(binPath.endsWith("bin")){
binPath = binPath.substring(0, binPath.length() - 3);
}else{
- FileUtil.ifNotExistsThenCreate("");
+ FileUtil2.ifNotExistsThenCreate("");
File f = new File("");
binPath = f.getAbsolutePath();
}
@@ -44,7 +44,7 @@ public class SwingPrintStream extends PrintStream {
try {
//大于20M则另存为
if(logfile.exists() && logfile.length() > 1024 * 1024 * 20){
- logfile.renameTo(new File(FileUtil.getProjectPath() + File.separator + "console.log." + sdf2.format(new Date())));
+ logfile.renameTo(new File(FileUtil2.getProjectPath() + File.separator + "console.log." + sdf2.format(new Date())));
}
logfw = new BufferedWriter(new FileWriter(logfile, true), 4096);
} catch (IOException e) {
diff --git a/src/org/arong/egdownloader/ui/list/GroupList.java b/src/org/arong/egdownloader/ui/list/GroupList.java
index 8e6f3be..65fd3c2 100644
--- a/src/org/arong/egdownloader/ui/list/GroupList.java
+++ b/src/org/arong/egdownloader/ui/list/GroupList.java
@@ -28,7 +28,7 @@
import org.arong.egdownloader.ui.window.EgDownloaderWindow;
import org.arong.egdownloader.ui.window.GroupWindow;
import org.arong.egdownloader.ui.window.InitWindow;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
import org.arong.util.Tracker;
/**
* 任务组列表
@@ -136,7 +136,7 @@ public void actionPerformed(ActionEvent e) {
}
File file = new File(ComponentConst.ROOT_DATA_PATH + "/" + name);
if(file.exists()){
- FileUtil.deleteFile(file);
+ FileUtil2.deleteFile(file);
}
File dataFile = new File(ComponentConst.ROOT_DATA_PATH);
if(!dataFile.exists()){
diff --git a/src/org/arong/egdownloader/ui/menuitem/OpenLogMenuItem.java b/src/org/arong/egdownloader/ui/menuitem/OpenLogMenuItem.java
index bd53d08..662927f 100644
--- a/src/org/arong/egdownloader/ui/menuitem/OpenLogMenuItem.java
+++ b/src/org/arong/egdownloader/ui/menuitem/OpenLogMenuItem.java
@@ -10,7 +10,7 @@
import javax.swing.JMenuItem;
import org.arong.egdownloader.ui.window.EgDownloaderWindow;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
import org.arong.util.Tracker;
/**
* 打开日志文件
@@ -27,12 +27,12 @@ public OpenLogMenuItem(String text, final EgDownloaderWindow mainWindow){
this.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ae) {
try {
- String binPath = FileUtil.getAppPath(getClass());
+ String binPath = FileUtil2.getAppPath(getClass());
if(binPath.endsWith("bin")){
binPath = binPath.substring(0, binPath.length() - 3);
}else{
String defaultSavePath = mainWindow.setting.getDefaultSaveDir();
- FileUtil.ifNotExistsThenCreate(defaultSavePath);
+ FileUtil2.ifNotExistsThenCreate(defaultSavePath);
File f = new File(defaultSavePath);
binPath = f.getAbsolutePath().replaceAll(defaultSavePath, "");
}
diff --git a/src/org/arong/egdownloader/ui/menuitem/OpenRootMenuItem.java b/src/org/arong/egdownloader/ui/menuitem/OpenRootMenuItem.java
index 3bf1f33..b139aae 100644
--- a/src/org/arong/egdownloader/ui/menuitem/OpenRootMenuItem.java
+++ b/src/org/arong/egdownloader/ui/menuitem/OpenRootMenuItem.java
@@ -11,7 +11,7 @@
import org.arong.egdownloader.ui.IconManager;
import org.arong.egdownloader.ui.window.EgDownloaderWindow;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
import org.arong.util.Tracker;
/**
* 打开根目录
@@ -28,12 +28,12 @@ public OpenRootMenuItem(String text, final EgDownloaderWindow window){
this.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ae) {
try {
- String binPath = FileUtil.getAppPath(getClass());
+ String binPath = FileUtil2.getAppPath(getClass());
if(binPath.endsWith("bin")){
binPath = binPath.substring(0, binPath.length() - 3);
}else{
String defaultSavePath = window.setting.getDefaultSaveDir();
- FileUtil.ifNotExistsThenCreate(defaultSavePath);
+ FileUtil2.ifNotExistsThenCreate(defaultSavePath);
File f = new File(defaultSavePath);
binPath = f.getAbsolutePath().replaceAll(defaultSavePath, "");
}
diff --git a/src/org/arong/egdownloader/ui/panel/SearchImagePanel.java b/src/org/arong/egdownloader/ui/panel/SearchImagePanel.java
index 86e2652..699a558 100644
--- a/src/org/arong/egdownloader/ui/panel/SearchImagePanel.java
+++ b/src/org/arong/egdownloader/ui/panel/SearchImagePanel.java
@@ -17,7 +17,7 @@
import org.arong.egdownloader.ui.IconManager;
import org.arong.egdownloader.ui.popmenu.SearchWindowPopMenu;
import org.arong.egdownloader.ui.window.EgDownloaderWindow;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
public class SearchImagePanel extends JLabel {
private EgDownloaderWindow mainWindow;
@@ -67,7 +67,7 @@ public void mouseEntered(MouseEvent e) {
JLabel l = (JLabel) e.getSource();
l.setBorder(BorderFactory.createLineBorder(Color.PINK, 2));
l.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
- if(l.getIcon().getIconWidth() == DEFAULTWIDTH && new File(ComponentConst.CACHE_PATH + "/" + FileUtil.filterDir(mainWindow.searchComicWindow.searchTasks.get(Integer.parseInt(l.getName()) - 1).getUrl())).exists()){
+ if(l.getIcon().getIconWidth() == DEFAULTWIDTH && new File(ComponentConst.CACHE_PATH + "/" + FileUtil2.filterDir(mainWindow.searchComicWindow.searchTasks.get(Integer.parseInt(l.getName()) - 1).getUrl())).exists()){
flush(mainWindow.searchComicWindow.searchTasks.get(Integer.parseInt(l.getName()) - 1));
}
}
@@ -99,7 +99,7 @@ public void flush(SearchTask task, final long delay){
this.setToolTipText(task.getName() + (StringUtils.isNotBlank(task.getUploader()) ? "[" + task.getUploader() + "]" : ""));
final SearchImagePanel this_ = this;
- final String path = ComponentConst.CACHE_PATH + "/" + FileUtil.filterDir(task.getUrl());
+ final String path = ComponentConst.CACHE_PATH + "/" + FileUtil2.filterDir(task.getUrl());
File cover = new File(path);
if(cover == null || !cover.exists()){
this.setSize(DEFAULTWIDTH, DEFAULTHEIGHT);
diff --git a/src/org/arong/egdownloader/ui/panel/TaskInfoPanel.java b/src/org/arong/egdownloader/ui/panel/TaskInfoPanel.java
index adc7257..b34fbfa 100644
--- a/src/org/arong/egdownloader/ui/panel/TaskInfoPanel.java
+++ b/src/org/arong/egdownloader/ui/panel/TaskInfoPanel.java
@@ -20,7 +20,7 @@
import org.arong.egdownloader.ui.swing.AJTextPane;
import org.arong.egdownloader.ui.window.EgDownloaderWindow;
import org.arong.egdownloader.ui.window.SearchComicWindow;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
public class TaskInfoPanel extends JScrollPane {
@@ -91,8 +91,8 @@ public void parseTask(Task t, int index){
.replace("@t_createTime", t.getCreateTime() == null ? "" : t.getCreateTime())
.replace("@t_completedTime", t.getCompletedTime() == null ? "" : t.getCompletedTime())
.replace("@t_current", t.getCurrent() + "")
- .replace("@t_ocurrentSize", FileUtil.showSizeStr(size))
- .replace("@t_onepsize", t.getCurrent() == 0 ? "0B" : FileUtil.showSizeStr(size / t.getCurrent()))
+ .replace("@t_ocurrentSize", FileUtil2.showSizeStr(size))
+ .replace("@t_onepsize", t.getCurrent() == 0 ? "0B" : FileUtil2.showSizeStr(size / t.getCurrent()))
.replace("@t_ocurrentrate", getSchedule(t.getCurrent(), t.getTotal()))
.replace("@t_start", t.getStart() + "")
.replace("@t_end", t.getEnd() + "")
diff --git a/src/org/arong/egdownloader/ui/popmenu/SearchWindowPopMenu.java b/src/org/arong/egdownloader/ui/popmenu/SearchWindowPopMenu.java
index 0a08ace..e7cadd3 100644
--- a/src/org/arong/egdownloader/ui/popmenu/SearchWindowPopMenu.java
+++ b/src/org/arong/egdownloader/ui/popmenu/SearchWindowPopMenu.java
@@ -25,7 +25,7 @@
import org.arong.egdownloader.ui.window.SimpleSearchWindow;
import org.arong.egdownloader.ui.window.form.AddFormDialog;
import org.arong.egdownloader.ui.work.interfaces.IMenuListenerTask;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
public class SearchWindowPopMenu extends JPopupMenu {
public EgDownloaderWindow mainWindow;
@@ -154,7 +154,7 @@ public void doWork(Window window, ActionEvent e) {
public void doWork(Window window, ActionEvent e) {
EgDownloaderWindow mainWindow = (EgDownloaderWindow) window;
SearchTask task = mainWindow.searchComicWindow.searchTasks.get(mainWindow.searchComicWindow.selectTaskIndex);
- String path = ComponentConst.CACHE_PATH + "/" + FileUtil.filterDir(task.getUrl());
+ String path = ComponentConst.CACHE_PATH + "/" + FileUtil2.filterDir(task.getUrl());
File coverFile = new File(path);
if(coverFile.exists()){
coverFile.delete();
diff --git a/src/org/arong/egdownloader/ui/table/PictureTableCellRenderer.java b/src/org/arong/egdownloader/ui/table/PictureTableCellRenderer.java
index e9f7edc..0eb623a 100644
--- a/src/org/arong/egdownloader/ui/table/PictureTableCellRenderer.java
+++ b/src/org/arong/egdownloader/ui/table/PictureTableCellRenderer.java
@@ -15,7 +15,7 @@
import org.arong.egdownloader.ui.IconManager;
import org.arong.egdownloader.ui.swing.AJButton;
import org.arong.egdownloader.ui.swing.AJLabel;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
/**
* 图片表格单元格渲染器
* @author 阿荣
@@ -53,7 +53,7 @@ public Component getTableCellRendererComponent(JTable table, Object value,
TableColumn tc = table.getColumnModel().getColumn(column);
tc.setPreferredWidth(80);
tc.setMaxWidth(120);
- val = FileUtil.showSizeStr(Long.parseLong(val));
+ val = FileUtil2.showSizeStr(Long.parseLong(val));
}else if(column == 4){//分别率
TableColumn tc = table.getColumnModel().getColumn(column);
tc.setPreferredWidth(80);
diff --git a/src/org/arong/egdownloader/ui/window/AboutMenuWindow.java b/src/org/arong/egdownloader/ui/window/AboutMenuWindow.java
index 6419f26..3724903 100644
--- a/src/org/arong/egdownloader/ui/window/AboutMenuWindow.java
+++ b/src/org/arong/egdownloader/ui/window/AboutMenuWindow.java
@@ -24,7 +24,7 @@
import org.arong.egdownloader.ui.swing.AJTextPane;
import org.arong.egdownloader.ui.work.JarUpdateWorker;
import org.arong.egdownloader.version.Version;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
import org.arong.util.JsonUtil;
/**
@@ -115,12 +115,12 @@ public void checkVersion(){
}
}else if(! Version.JARVERSION.equals(version.get("jarVersion")) && StringUtils.isNotBlank(version.get("jarUrl"))){
- String binPath = FileUtil.getAppPath(getClass());
+ String binPath = FileUtil2.getAppPath(getClass());
if(binPath.endsWith("bin")){
binPath = binPath.substring(0, binPath.length() - 3);
}else{
String defaultSavePath = mainWindow.setting.getDefaultSaveDir();
- FileUtil.ifNotExistsThenCreate(defaultSavePath);
+ FileUtil2.ifNotExistsThenCreate(defaultSavePath);
File f = new File(defaultSavePath);
binPath = f.getAbsolutePath().replaceAll(defaultSavePath, "");
}
diff --git a/src/org/arong/egdownloader/ui/window/EgDownloaderWindow.java b/src/org/arong/egdownloader/ui/window/EgDownloaderWindow.java
index 31852de..e7018ec 100644
--- a/src/org/arong/egdownloader/ui/window/EgDownloaderWindow.java
+++ b/src/org/arong/egdownloader/ui/window/EgDownloaderWindow.java
@@ -82,7 +82,7 @@
import org.arong.egdownloader.ui.work.listenerWork.StartTaskWork;
import org.arong.egdownloader.ui.work.listenerWork.StopTaskWork;
import org.arong.egdownloader.version.Version;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
/**
* 主线程类
@@ -139,14 +139,14 @@ private void setupNetSpeedtimer(final EgDownloaderWindow mainWindow){
TimerTask timerTask = new TimerTask() {
public void run() {
//当前一秒内的流量
- Long length = FileUtil.byteLength - FileUtil.oldByteLength;
+ Long length = FileUtil2.byteLength - FileUtil2.oldByteLength;
//显示到标题栏
- mainWindow.setTitle(mainWindow.wtitle + " (" + FileUtil.showSizeStr(length) + "/S)");
- if(FileUtil.byteLength > 999900000){
- FileUtil.byteLength = 0L;
- FileUtil.oldByteLength = 0L;
+ mainWindow.setTitle(mainWindow.wtitle + " (" + FileUtil2.showSizeStr(length) + "/S)");
+ if(FileUtil2.byteLength > 999900000){
+ FileUtil2.byteLength = 0L;
+ FileUtil2.oldByteLength = 0L;
}else{
- FileUtil.oldByteLength = FileUtil.byteLength;
+ FileUtil2.oldByteLength = FileUtil2.byteLength;
}
}
};
diff --git a/src/org/arong/egdownloader/ui/window/InitWindow.java b/src/org/arong/egdownloader/ui/window/InitWindow.java
index 87ba5a7..b6927c1 100644
--- a/src/org/arong/egdownloader/ui/window/InitWindow.java
+++ b/src/org/arong/egdownloader/ui/window/InitWindow.java
@@ -42,7 +42,7 @@
import org.arong.egdownloader.ui.table.TaskingTable;
import org.arong.egdownloader.ui.work.UpdateScriptWorker;
import org.arong.egdownloader.version.Version;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
/**
* 程序初始化窗口
* @author 阿荣
@@ -176,7 +176,7 @@ protected void paintComponent(Graphics g) {
try {
scriptVersion = WebClient.getRequestUseJava(ComponentConst.SCRIPT_VERSION_URL, null);
//V.2015.03.26
- String currentVersion = FileUtil.getTextFromReader(new FileReader("script/version"));
+ String currentVersion = FileUtil2.getTextFromReader(new FileReader("script/version"));
//版本返回信息需要以V.2字符串开头，否则可能获取的数据不正确，不做更新操作
if(scriptVersion.startsWith("V.2") && scriptVersion != null && !currentVersion.equals(scriptVersion)){
diff --git a/src/org/arong/egdownloader/ui/window/SearchComicWindow.java b/src/org/arong/egdownloader/ui/window/SearchComicWindow.java
index 5e34428..f90d62c 100644
--- a/src/org/arong/egdownloader/ui/window/SearchComicWindow.java
+++ b/src/org/arong/egdownloader/ui/window/SearchComicWindow.java
@@ -52,7 +52,7 @@
import org.arong.egdownloader.ui.swing.AJTextField;
import org.arong.egdownloader.ui.table.SearchTasksTable;
import org.arong.egdownloader.ui.work.SearchComicWorker;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
import com.sun.awt.AWTUtilities;
@@ -377,7 +377,7 @@ public void mouseReleased(MouseEvent e) {
});
//检测是否存在缓存目录,不存在则创建
- FileUtil.ifNotExistsThenCreate(ComponentConst.CACHE_PATH);
+ FileUtil2.ifNotExistsThenCreate(ComponentConst.CACHE_PATH);
}
diff --git a/src/org/arong/egdownloader/ui/window/SearchCoverWindow.java b/src/org/arong/egdownloader/ui/window/SearchCoverWindow.java
index 8179cd6..90e3086 100644
--- a/src/org/arong/egdownloader/ui/window/SearchCoverWindow.java
+++ b/src/org/arong/egdownloader/ui/window/SearchCoverWindow.java
@@ -16,7 +16,7 @@
import org.arong.egdownloader.ui.ComponentConst;
import org.arong.egdownloader.ui.IconManager;
import org.arong.egdownloader.ui.swing.AJLabel;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
/**
* 搜索结果封面窗口
* @author dipoo
@@ -82,7 +82,7 @@ public void showCover(Task task, Point p){
*/
public void showCover(SearchTask task, Point p){
//检测封面是否已下载http://exhentai.org/g/794884/2278359e3a
- String path = ComponentConst.CACHE_PATH + "/" + FileUtil.filterDir(task.getUrl());
+ String path = ComponentConst.CACHE_PATH + "/" + FileUtil2.filterDir(task.getUrl());
File cover = new File(path);
if(cover == null || !cover.exists()){
this.setSize(20, 20);
diff --git a/src/org/arong/egdownloader/ui/window/SearchTagWindow.java b/src/org/arong/egdownloader/ui/window/SearchTagWindow.java
index cf9c8a0..6139b5b 100644
--- a/src/org/arong/egdownloader/ui/window/SearchTagWindow.java
+++ b/src/org/arong/egdownloader/ui/window/SearchTagWindow.java
@@ -45,7 +45,7 @@
import org.arong.egdownloader.ui.swing.AJPopupMenu;
import org.arong.egdownloader.ui.swing.AJTextField;
import org.arong.egdownloader.ui.work.interfaces.IMenuListenerTask;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
import org.jb2011.lnf.beautyeye.ch3_button.BEButtonUI;
public class SearchTagWindow extends JDialog {
@@ -79,7 +79,7 @@ public SearchTagWindow(SearchComicWindow searchComicWindow){
tags.load(new FileReader(ComponentConst.TAG_FILE_PATH));
} catch (FileNotFoundException e1) {
try {
- FileUtil.storeStr2file("", ComponentConst.ROOT_DATA_PATH, ComponentConst.TAG_FILE_NAME);
+ FileUtil2.storeStr2file("", ComponentConst.ROOT_DATA_PATH, ComponentConst.TAG_FILE_NAME);
} catch (IOException e2) {
e2.printStackTrace();
}
diff --git a/src/org/arong/egdownloader/ui/window/SettingWindow.java b/src/org/arong/egdownloader/ui/window/SettingWindow.java
index 8c92bd4..44fefaf 100644
--- a/src/org/arong/egdownloader/ui/window/SettingWindow.java
+++ b/src/org/arong/egdownloader/ui/window/SettingWindow.java
@@ -40,7 +40,7 @@
import org.arong.egdownloader.ui.swing.AJTextPane;
import org.arong.egdownloader.ui.work.UpdateScriptWorker;
import org.arong.egdownloader.ui.work.interfaces.IListenerTask;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
/**
* 配置窗口
* @author 阿荣
@@ -177,7 +177,7 @@ public void doWork(Window window, MouseEvent e) {
try {
String path = ComponentConst.getSavePathPreffix() + saveDirField.getText();
File f = new File(path);
- FileUtil.ifNotExistsThenCreate(f);
+ FileUtil2.ifNotExistsThenCreate(f);
Desktop.getDesktop().open(f);
} catch (Exception e1) {
e1.printStackTrace();
@@ -260,7 +260,7 @@ public void doWork(Window window, MouseEvent e) {
try {
String path = "script";
File f = new File(path);
- FileUtil.ifNotExistsThenCreate(f);
+ FileUtil2.ifNotExistsThenCreate(f);
Desktop.getDesktop().open(f);
} catch (Exception e1) {
e1.printStackTrace();
diff --git a/src/org/arong/egdownloader/ui/window/form/AddGroupDialog.java b/src/org/arong/egdownloader/ui/window/form/AddGroupDialog.java
index a382290..1a954ac 100644
--- a/src/org/arong/egdownloader/ui/window/form/AddGroupDialog.java
+++ b/src/org/arong/egdownloader/ui/window/form/AddGroupDialog.java
@@ -29,7 +29,7 @@
import org.arong.egdownloader.ui.window.GroupWindow;
import org.arong.egdownloader.ui.window.InitWindow;
import org.arong.egdownloader.ui.work.interfaces.IListenerTask;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
/**
* 新建任务窗口
* @author dipoo
@@ -56,10 +56,10 @@ public void doWork(Window dialog, MouseEvent event) {
//验证名称
if("".equals(groupName)){
JOptionPane.showMessageDialog(null, "名称不能为空");
- }else if(! FileUtil.dirValidate(groupName)){
+ }else if(! FileUtil2.dirValidate(groupName)){
JOptionPane.showMessageDialog(null, "名称不能包含? | * . < > : / \\等特殊字符");
}else{
- FileUtil.ifNotExistsThenCreate(ComponentConst.ROOT_DATA_PATH);
+ FileUtil2.ifNotExistsThenCreate(ComponentConst.ROOT_DATA_PATH);
File dataFile = new File(ComponentConst.ROOT_DATA_PATH);
for(File file : dataFile.listFiles()){
if(file.getName().equals(groupName)){
@@ -77,7 +77,7 @@ public void doWork(Window dialog, MouseEvent event) {
ComponentConst.changeDataPath(groupName);
ComponentConst.changeDataXmlPath();
if(mainWindow != null){
- FileUtil.ifNotExistsThenCreate(ComponentConst.getXmlDirPath());
+ FileUtil2.ifNotExistsThenCreate(ComponentConst.getXmlDirPath());
/**
* 更新dom
*/
diff --git a/src/org/arong/egdownloader/ui/work/CreateWorker.java b/src/org/arong/egdownloader/ui/work/CreateWorker.java
index d103367..f87b75f 100644
--- a/src/org/arong/egdownloader/ui/work/CreateWorker.java
+++ b/src/org/arong/egdownloader/ui/work/CreateWorker.java
@@ -17,7 +17,7 @@
import org.arong.egdownloader.ui.window.CreatingWindow;
import org.arong.egdownloader.ui.window.EgDownloaderWindow;
import org.arong.egdownloader.ui.window.form.AddFormDialog;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
import org.arong.util.Tracker;
/**
* 新建任务线程类
@@ -69,7 +69,7 @@ protected Void doInBackground() throws Exception {
window.creatingWindow.setTitle("正在下载封面");
//下载封面
is = WebClient.getStreamUseJavaWithCookie(task.getCoverUrl(), setting.getCookieInfo());
- FileUtil.storeStream(ComponentConst.getSavePathPreffix() + task.getSaveDir(), "cover.jpg", is);//保存到目录
+ FileUtil2.storeStream(ComponentConst.getSavePathPreffix() + task.getSaveDir(), "cover.jpg", is);//保存到目录
//设置最后创建时间
setting.setLastCreateTime(task.getCreateTime());
diff --git a/src/org/arong/egdownloader/ui/work/DeleteWorker.java b/src/org/arong/egdownloader/ui/work/DeleteWorker.java
index 1cf6106..671a24e 100644
--- a/src/org/arong/egdownloader/ui/work/DeleteWorker.java
+++ b/src/org/arong/egdownloader/ui/work/DeleteWorker.java
@@ -13,7 +13,7 @@
import org.arong.egdownloader.ui.table.TaskingTable;
import org.arong.egdownloader.ui.window.DeletingWindow;
import org.arong.egdownloader.ui.window.EgDownloaderWindow;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
import org.arong.util.Tracker;
/**
* 删除任务线程类
@@ -70,7 +70,7 @@ protected Void doInBackground() throws Exception {
for(int i = 0; i < tasks.size(); i ++){
file = new File(ComponentConst.getSavePathPreffix() + tasks.get(i).getSaveDir());
if(file.exists()){
- FileUtil.deleteFile(file);
+ FileUtil2.deleteFile(file);
}
}
}
diff --git a/src/org/arong/egdownloader/ui/work/DownloadCacheCoverWorker.java b/src/org/arong/egdownloader/ui/work/DownloadCacheCoverWorker.java
index 6e4898e..b7911bd 100644
--- a/src/org/arong/egdownloader/ui/work/DownloadCacheCoverWorker.java
+++ b/src/org/arong/egdownloader/ui/work/DownloadCacheCoverWorker.java
@@ -9,7 +9,7 @@
import org.arong.egdownloader.spider.WebClient;
import org.arong.egdownloader.ui.ComponentConst;
import org.arong.egdownloader.ui.window.EgDownloaderWindow;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
/**
* 搜索漫画缓存封面下载的线程
* @author dipoo
@@ -29,7 +29,7 @@ protected Void doInBackground() throws Exception {
if(tasks != null){
for(int i = 0; i < tasks.size(); i ++){
final SearchTask task = tasks.get(i);
- localPath = ComponentConst.CACHE_PATH + "/" + FileUtil.filterDir(task.getUrl());
+ localPath = ComponentConst.CACHE_PATH + "/" + FileUtil2.filterDir(task.getUrl());
cover = new File(localPath);
if(cover == null || !cover.exists()){
try {
@@ -38,12 +38,12 @@ protected Void doInBackground() throws Exception {
new CommonSwingWorker(new Runnable() {
public void run() {
try{
- FileUtil.storeStream(ComponentConst.CACHE_PATH, FileUtil.filterDir(task.getUrl()),
+ FileUtil2.storeStream(ComponentConst.CACHE_PATH, FileUtil2.filterDir(task.getUrl()),
WebClient.getStreamUseJavaWithCookie(task.getCoverUrl(), mainWindow.setting.getCookieInfo()));
}catch(Exception e){
//最多下两次
try{
- FileUtil.storeStream(ComponentConst.CACHE_PATH, FileUtil.filterDir(task.getUrl()),
+ FileUtil2.storeStream(ComponentConst.CACHE_PATH, FileUtil2.filterDir(task.getUrl()),
WebClient.getStreamUseJavaWithCookie(task.getCoverUrl(), mainWindow.setting.getCookieInfo()));
}catch(Exception e1){
diff --git a/src/org/arong/egdownloader/ui/work/DownloadSinglePicWorker.java b/src/org/arong/egdownloader/ui/work/DownloadSinglePicWorker.java
index 46f6471..2144222 100644
--- a/src/org/arong/egdownloader/ui/work/DownloadSinglePicWorker.java
+++ b/src/org/arong/egdownloader/ui/work/DownloadSinglePicWorker.java
@@ -19,7 +19,7 @@
import org.arong.egdownloader.ui.ComponentConst;
import org.arong.egdownloader.ui.panel.PicturesInfoPanel;
import org.arong.egdownloader.ui.window.EgDownloaderWindow;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
import org.arong.util.SimpleImageInfo;
import org.arong.util.Tracker;
/**
@@ -78,7 +78,7 @@ protected Void doInBackground() throws Exception {
}else if(totalLength - 1024 * 10 > size){
//误差在10K以上则不算下载成功
pic.setRealUrl(null);
- Tracker.println(task.getDisplayName() + ":" + pic.getName()+ "(" + FileUtil.showSizeStr((long)size) + "):下载不完整(" + FileUtil.showSizeStr((long)totalLength) + ")");
+ Tracker.println(task.getDisplayName() + ":" + pic.getName()+ "(" + FileUtil2.showSizeStr((long)size) + "):下载不完整(" + FileUtil2.showSizeStr((long)totalLength) + ")");
}
pic.setSize(size);//设置图片大小
pic.setTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));//下载完成时间
@@ -99,7 +99,7 @@ protected Void doInBackground() throws Exception {
} catch (Exception e) {
e.printStackTrace();
}
- Tracker.println(DownloadSinglePicWorker.class ,task.getDisplayName() + ":" + pic.getName() + "(" + FileUtil.showSizeStr((long)size) + ", " + pic.getPpi() + ")下载完成。");
+ Tracker.println(DownloadSinglePicWorker.class ,task.getDisplayName() + ":" + pic.getName() + "(" + FileUtil2.showSizeStr((long)size) + ", " + pic.getPpi() + ")下载完成。");
if(mainWindow.infoTabbedPane.getSelectedIndex() == 2){
PicturesInfoPanel infoPanel = (PicturesInfoPanel) mainWindow.infoTabbedPane.getComponent(2);
diff --git a/src/org/arong/egdownloader/ui/work/DownloadWorker.java b/src/org/arong/egdownloader/ui/work/DownloadWorker.java
index b69658d..d019829 100644
--- a/src/org/arong/egdownloader/ui/work/DownloadWorker.java
+++ b/src/org/arong/egdownloader/ui/work/DownloadWorker.java
@@ -28,7 +28,7 @@
import org.arong.egdownloader.ui.panel.PicturesInfoPanel;
import org.arong.egdownloader.ui.table.TaskingTable;
import org.arong.egdownloader.ui.window.EgDownloaderWindow;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
import org.arong.util.SimpleImageInfo;
import org.arong.util.Tracker;
/**
@@ -131,7 +131,7 @@ protected Void doInBackground() throws Exception {
}else if(totalLength - 1024 * 10 > size){
//误差在10K以上则不算下载成功
pic.setRealUrl(null);
- Tracker.println(task.getDisplayName() + ":" + pic.getName()+ "(" + FileUtil.showSizeStr((long)size) + "):下载不完整(" + FileUtil.showSizeStr((long)totalLength) + ")");
+ Tracker.println(task.getDisplayName() + ":" + pic.getName()+ "(" + FileUtil2.showSizeStr((long)size) + "):下载不完整(" + FileUtil2.showSizeStr((long)totalLength) + ")");
delete(existNameFs);
exceptionNum ++;
continue;
@@ -159,7 +159,7 @@ protected Void doInBackground() throws Exception {
pic.setCompleted(true);//设置为已下载完成
task.setCurrent(task.getCurrent() + 1);//更新task的已下载数
- Tracker.println(DownloadWorker.class ,task.getDisplayName() + ":" + pic.getName() + "(" + FileUtil.showSizeStr((long)size) + ", " + pic.getPpi() + ")下载完成。");
+ Tracker.println(DownloadWorker.class ,task.getDisplayName() + ":" + pic.getName() + "(" + FileUtil2.showSizeStr((long)size) + ", " + pic.getPpi() + ")下载完成。");
if(mainWindow.tasks.get(mainWindow.runningTable.selectRowIndex) == task){
//刷新信息面板
if(mainWindow.infoTabbedPane.getSelectedIndex() == 1){
diff --git a/src/org/arong/egdownloader/ui/work/DownloadWorker2.java b/src/org/arong/egdownloader/ui/work/DownloadWorker2.java
index 7baa9de..fcbb7b7 100644
--- a/src/org/arong/egdownloader/ui/work/DownloadWorker2.java
+++ b/src/org/arong/egdownloader/ui/work/DownloadWorker2.java
@@ -20,7 +20,7 @@
import org.arong.egdownloader.ui.ComponentConst;
import org.arong.egdownloader.ui.table.TaskingTable;
import org.arong.egdownloader.ui.window.EgDownloaderWindow;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
import org.arong.util.Tracker;
/**
* 下载线程类，执行耗时的下载任务
@@ -168,7 +168,7 @@ private Boolean download(Picture pic){
}
existNameFs = null;
}
- size = FileUtil.storeStream(ComponentConst.getSavePathPreffix() + task.getSaveDir(), name, is);//保存到目录
+ size = FileUtil2.storeStream(ComponentConst.getSavePathPreffix() + task.getSaveDir(), name, is);//保存到目录
if(this.isCancelled())//是否暂停
return null;
//Picture [id=41b2c042-7560-422b-a521-e76b56720a77, num=01, name=P213_.jpg, url=http://exhentai.org/s/b0f5fe0e5c/698928-1, realUrl=http://36.233.48.163:8888/h/b0f5fe0e5c10d164456ed3f2000d8b0ef258ab5d-1385766-1279-1850-jpg/keystamp=1401206100-f2b9d0361c/P213_.jpg, size=0, time=null, saveAsName=true, isCompleted=false, isRunning=false]
diff --git a/src/org/arong/egdownloader/ui/work/JarUpdateWorker.java b/src/org/arong/egdownloader/ui/work/JarUpdateWorker.java
index 8d688c4..16223fa 100644
--- a/src/org/arong/egdownloader/ui/work/JarUpdateWorker.java
+++ b/src/org/arong/egdownloader/ui/work/JarUpdateWorker.java
@@ -10,7 +10,7 @@
import org.arong.egdownloader.spider.WebClient;
import org.arong.egdownloader.ui.window.EgDownloaderWindow;
import org.arong.egdownloader.version.Version;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
/**
* Jar包更新任务线程类
* @author dipoo
@@ -45,18 +45,18 @@ protected Void doInBackground() throws Exception {
Object[] o = WebClient.getStreamAndLengthUseJavaWithCookie(url, null);
is = (InputStream) o[0];
int totalLength = (Integer) o[1];
- System.out.println("jar文件大小：" + FileUtil.showSizeStr((long)totalLength));
+ System.out.println("jar文件大小：" + FileUtil2.showSizeStr((long)totalLength));
if(is == null){
JOptionPane.showMessageDialog(null, "jar文件更新失败");
}else{
//备份
String bakPath = binPath + File.separator + "bak" + File.separator + Version.JARVERSION + File.separator;
- FileUtil.ifNotExistsThenCreate(bakPath);
+ FileUtil2.ifNotExistsThenCreate(bakPath);
org.arong.utils.FileUtil.copyFile(oldjar.getPath(), bakPath + jarName);
//保存
- int fsize = FileUtil.storeStream(oldjar.getParent(), jarName, is);
+ int fsize = FileUtil2.storeStream(oldjar.getParent(), jarName, is);
if(fsize != totalLength){
- JOptionPane.showMessageDialog(null, "更新失败，jar文件下载不完整(" + FileUtil.showSizeStr((long)fsize) + ")，请重试");
+ JOptionPane.showMessageDialog(null, "更新失败，jar文件下载不完整(" + FileUtil2.showSizeStr((long)fsize) + ")，请重试");
}else{
JOptionPane.showMessageDialog(null, "jar文件更新成功，重启后生效。");
}
diff --git a/src/org/arong/egdownloader/ui/work/ReCreateWorker.java b/src/org/arong/egdownloader/ui/work/ReCreateWorker.java
index 887cab4..dd5eea5 100644
--- a/src/org/arong/egdownloader/ui/work/ReCreateWorker.java
+++ b/src/org/arong/egdownloader/ui/work/ReCreateWorker.java
@@ -18,7 +18,7 @@
import org.arong.egdownloader.ui.table.TaskingTable;
import org.arong.egdownloader.ui.window.CreatingWindow;
import org.arong.egdownloader.ui.window.EgDownloaderWindow;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
/**
* 重新新建任务线程类
* @author 阿荣
@@ -52,7 +52,7 @@ protected Void doInBackground() throws Exception {
if(task.getCoverUrl() == null){
//下载封面
is = WebClient.getStreamUseJava(task.getCoverUrl());
- FileUtil.storeStream(ComponentConst.getSavePathPreffix() + task.getSaveDir(), "cover.jpg", is);//保存到目录
+ FileUtil2.storeStream(ComponentConst.getSavePathPreffix() + task.getSaveDir(), "cover.jpg", is);//保存到目录
}
//保存到数据库
diff --git a/src/org/arong/egdownloader/ui/work/SearchComicWorker.java b/src/org/arong/egdownloader/ui/work/SearchComicWorker.java
index 516e38b..9fa166e 100644
--- a/src/org/arong/egdownloader/ui/work/SearchComicWorker.java
+++ b/src/org/arong/egdownloader/ui/work/SearchComicWorker.java
@@ -13,7 +13,7 @@
import org.arong.egdownloader.ui.ComponentConst;
import org.arong.egdownloader.ui.window.EgDownloaderWindow;
import org.arong.egdownloader.ui.window.SearchComicWindow;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
import org.arong.util.JsonUtil;
import org.arong.util.Tracker;
/**
@@ -40,7 +40,7 @@ protected Void doInBackground() throws Exception {
return null;
}
//保存源文件
- FileUtil.storeStr2file(source, "source/", "search.html");
+ FileUtil2.storeStr2file(source, "source/", "search.html");
String[] result = ScriptParser.search(source, mainWindow.setting);
if(result != null){
String json = result[1];
diff --git a/src/org/arong/egdownloader/ui/work/UpdateScriptWorker.java b/src/org/arong/egdownloader/ui/work/UpdateScriptWorker.java
index 4cd5a7e..8cc5b75 100644
--- a/src/org/arong/egdownloader/ui/work/UpdateScriptWorker.java
+++ b/src/org/arong/egdownloader/ui/work/UpdateScriptWorker.java
@@ -14,7 +14,7 @@
import org.arong.egdownloader.ui.window.InitWindow;
import org.arong.egdownloader.ui.window.SettingWindow;
import org.arong.egdownloader.version.Version;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
/**
* 更新脚本线程类
* @author dipoo
@@ -32,7 +32,7 @@ public UpdateScriptWorker(Window window){
protected Void doInBackground() throws Exception {
String dir = "script/";
- FileUtil.ifNotExistsThenCreate(dir);
+ FileUtil2.ifNotExistsThenCreate(dir);
if(window instanceof EgDownloaderWindow){
mainWindow = (EgDownloaderWindow)window;
SettingWindow settingWindow = (SettingWindow) mainWindow.settingWindow;
@@ -48,31 +48,31 @@ protected Void doInBackground() throws Exception {
if(initWindow != null){
initWindow.textLabel.setText(Version.NAME + "-更新createTask.js");
}
- FileUtil.storeStream(dir, "createTask.js", WebClient.getStreamUseJava(ComponentConst.SCRIPT_CREATE_URL));
+ FileUtil2.storeStream(dir, "createTask.js", WebClient.getStreamUseJava(ComponentConst.SCRIPT_CREATE_URL));
//更新collectPicture.js
if(initWindow != null){
initWindow.textLabel.setText(Version.NAME + "-更新collectPicture.js");
}
- FileUtil.storeStream(dir, "collectPicture.js", WebClient.getStreamUseJava(ComponentConst.SCRIPT_COLLECT_URL));
+ FileUtil2.storeStream(dir, "collectPicture.js", WebClient.getStreamUseJava(ComponentConst.SCRIPT_COLLECT_URL));
//更新download.js
if(initWindow != null){
initWindow.textLabel.setText(Version.NAME + "-更新download.js");
}
- FileUtil.storeStream(dir, "download.js", WebClient.getStreamUseJava(ComponentConst.SCRIPT_DOWNLOAD_URL));
+ FileUtil2.storeStream(dir, "download.js", WebClient.getStreamUseJava(ComponentConst.SCRIPT_DOWNLOAD_URL));
//更新search.js
if(initWindow != null){
initWindow.textLabel.setText(Version.NAME + "-更新search.js");
}
- FileUtil.storeStream(dir, "search.js", WebClient.getStreamUseJava(ComponentConst.SCRIPT_SEARCH_URL));
+ FileUtil2.storeStream(dir, "search.js", WebClient.getStreamUseJava(ComponentConst.SCRIPT_SEARCH_URL));
//更新search2.js
- if(initWindow != null){
+ /*if(initWindow != null){
initWindow.textLabel.setText(Version.NAME + "-更新search2.js");
}
- FileUtil.storeStream(dir, "search2.js", WebClient.getStreamUseJava(ComponentConst.SCRIPT_SEARCH2_URL));
+ FileUtil2.storeStream(dir, "search2.js", WebClient.getStreamUseJava(ComponentConst.SCRIPT_SEARCH2_URL));*/
//更新脚本解析器
ScriptParser.clearFiles();
//保存版本号
- FileUtil.storeStr2file(ComponentConst.remoteScriptVersion, "script/", "version");
+ FileUtil2.storeStr2file(ComponentConst.remoteScriptVersion, "script/", "version");
ComponentConst.localScriptVersion = ComponentConst.remoteScriptVersion;
ComponentConst.scriptChange = false;
if(initWindow != null){
diff --git a/src/org/arong/egdownloader/ui/work/listenerWork/DownloadCoverWork.java b/src/org/arong/egdownloader/ui/work/listenerWork/DownloadCoverWork.java
index b62f799..55faaa4 100644
--- a/src/org/arong/egdownloader/ui/work/listenerWork/DownloadCoverWork.java
+++ b/src/org/arong/egdownloader/ui/work/listenerWork/DownloadCoverWork.java
@@ -17,7 +17,7 @@
import org.arong.egdownloader.ui.window.EgDownloaderWindow;
import org.arong.egdownloader.ui.work.CommonSwingWorker;
import org.arong.egdownloader.ui.work.interfaces.IMenuListenerTask;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
/**
* 下载漫画封面（先检测是否存在，不存在才去下载）
* @author 阿荣
@@ -43,7 +43,7 @@ public void run() {
//下载封面
is = WebClient.getStreamUseJavaWithCookie(task.getCoverUrl(), mainWindow.setting.getCookieInfo());//getStreamUseJava(task.getCoverUrl());
- int size = FileUtil.storeStream(ComponentConst.getSavePathPreffix() + task.getSaveDir(), "cover.jpg", is);//保存到目录
+ int size = FileUtil2.storeStream(ComponentConst.getSavePathPreffix() + task.getSaveDir(), "cover.jpg", is);//保存到目录
if(size == 0){
JOptionPane.showMessageDialog(mainWindow, "下载失败，地址错误或者地址不可访问");
}else{
diff --git a/src/org/arong/egdownloader/ui/work/listenerWork/ShowDetailWork.java b/src/org/arong/egdownloader/ui/work/listenerWork/ShowDetailWork.java
index f303a66..71167e9 100644
--- a/src/org/arong/egdownloader/ui/work/listenerWork/ShowDetailWork.java
+++ b/src/org/arong/egdownloader/ui/work/listenerWork/ShowDetailWork.java
@@ -16,7 +16,7 @@
import org.arong.egdownloader.ui.window.DetailWindow;
import org.arong.egdownloader.ui.window.EgDownloaderWindow;
import org.arong.egdownloader.ui.work.interfaces.IMenuListenerTask;
-import org.arong.util.FileUtil;
+import org.arong.util.FileUtil2;
import org.arong.util.Tracker;
/**
* 下载任务详细信息窗口
@@ -60,7 +60,7 @@ public void doWork(Window window, ActionEvent e) {
size += pic.getSize();
}
}
- dw.taskDownSizeLabel.setText(FileUtil.showSizeStr(size));
+ dw.taskDownSizeLabel.setText(FileUtil2.showSizeStr(size));
dw.pictureTable.updateUI();
//隐藏tablePopupMenu
mainWindow.tablePopupMenu.setVisible(false);
diff --git a/src/org/arong/egdownloader/version/Version.java b/src/org/arong/egdownloader/version/Version.java
index 271377f..e486636 100644
--- a/src/org/arong/egdownloader/version/Version.java
+++ b/src/org/arong/egdownloader/version/Version.java
@@ -8,12 +8,12 @@ public final class Version {
// 程序名
public final static String NAME = "EG下载器";
// 程序版本号
- public final static String VERSION = "0.90";
+ public final static String VERSION = "0.95";
// jar版本号
public final static String JARVERSION = "1";
// 程序作者
public final static String AUTHOR = "dipoo";
// 程序最后修改时间
- public final static String MODIFLIED = "2019-03-22";
+ public final static String MODIFLIED = "2019-04-15";
}
diff --git a/src/org/arong/util/Dom4jUtil.java b/src/org/arong/util/Dom4jUtil.java
index 44fc306..09a7557 100644
--- a/src/org/arong/util/Dom4jUtil.java
+++ b/src/org/arong/util/Dom4jUtil.java
@@ -40,7 +40,7 @@ public static void deleteElement(Element parent, Element ele){
}
public static void writeDOM2XML(String file_path, Document doc) throws Exception{
- FileUtil.ifNotExistsThenCreate(file_path.substring(0, file_path.lastIndexOf("/")));
+ FileUtil2.ifNotExistsThenCreate(file_path.substring(0, file_path.lastIndexOf("/")));
writeDOM2XML(new File(file_path), doc);
}
diff --git a/src/org/arong/util/FileUtil.java b/src/org/arong/util/FileUtil2.java
similarity index 98%
rename from src/org/arong/util/FileUtil.java
rename to src/org/arong/util/FileUtil2.java
index 6df97ec..23dcc1f 100644
--- a/src/org/arong/util/FileUtil.java
+++ b/src/org/arong/util/FileUtil2.java
@@ -19,7 +19,7 @@
* @author 阿荣
* @since 2014-05-26
*/
-public final class FileUtil {
+public final class FileUtil2 {
/** 当前下载的字节数:用于storeStream方法的下载速度计算 */
public static Long byteLength = 0L;
/** 上次下载的字节数:用于storeStream方法的下载速度计算 */
@@ -57,7 +57,7 @@ public static int storeStream(String path, String name, InputStream in) throws I
return 0;
}
File dir = new File(path);
- FileUtil.ifNotExistsThenCreate(dir);
+ FileUtil2.ifNotExistsThenCreate(dir);
BufferedInputStream bis = null;
BufferedOutputStream bos = null;
int size = 0;
@@ -105,7 +105,7 @@ public static void storeStr2file(String str, String path, String name) throws IO
return;
}
File dir = new File(path);
- FileUtil.ifNotExistsThenCreate(dir);
+ FileUtil2.ifNotExistsThenCreate(dir);
FileWriter fw = new FileWriter(path + File.separator + name);
fw.write(str);
if(fw != null){
@@ -169,7 +169,7 @@ public static String filterDir(String dir){
}
}catch(Exception e){
- Tracker.println(FileUtil.class, e.getMessage());
+ Tracker.println(FileUtil2.class, e.getMessage());
}
return null;
}