From 13eb3d291d29e4a123f584dee17412dd21e3cf71 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Tue, 23 Sep 2014 14:19:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E6=B8=85=E7=90=86=E5=86=97=E4=BD=99?=
 =?UTF-8?q?=E6=97=B6=E5=88=A0=E9=99=A4=20gid=20=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/hippo/ehviewer/ehclient/ExDownloaderManager.java | 2 +-
 src/com/hippo/ehviewer/ui/SettingsActivity.java          | 4 ++++
 src/com/hippo/ehviewer/util/EhUtils.java                 | 8 ++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/com/hippo/ehviewer/ehclient/ExDownloaderManager.java b/src/com/hippo/ehviewer/ehclient/ExDownloaderManager.java
index 5612aa43a..140a04d0b 100644
--- a/src/com/hippo/ehviewer/ehclient/ExDownloaderManager.java
+++ b/src/com/hippo/ehviewer/ehclient/ExDownloaderManager.java
@@ -54,7 +54,7 @@ public class ExDownloaderManager {
         }
     }
 
-    File getExDownloadInfoDir() {
+    public File getExDownloadInfoDir() {
         return mExDownloadInfoDir;
     }
 
diff --git a/src/com/hippo/ehviewer/ui/SettingsActivity.java b/src/com/hippo/ehviewer/ui/SettingsActivity.java
index 78205d437..14d96abf1 100644
--- a/src/com/hippo/ehviewer/ui/SettingsActivity.java
+++ b/src/com/hippo/ehviewer/ui/SettingsActivity.java
@@ -60,6 +60,7 @@ import com.hippo.ehviewer.UpdateHelper;
 import com.hippo.ehviewer.data.Data;
 import com.hippo.ehviewer.data.DownloadInfo;
 import com.hippo.ehviewer.ehclient.EhInfo;
+import com.hippo.ehviewer.ehclient.ExDownloaderManager;
 import com.hippo.ehviewer.network.HttpHelper;
 import com.hippo.ehviewer.preference.AutoListPreference;
 import com.hippo.ehviewer.util.BgThread;
@@ -595,6 +596,9 @@ public class SettingsActivity extends AbsPreferenceActivity {
                         for (int i = 0; i < targetDirList.size(); i++) {
                             File dir = targetDirList.get(i);
                             Utils.deleteFile(dir);
+                            // Delete gid file
+                            new File(ExDownloaderManager.getInstance().getExDownloadInfoDir(),
+                                    String.valueOf(EhUtils.getGidFromDirname(dir.getName()))).delete();
                             handler.post(new CleanResponder(CleanResponder.STATE_DOING, targetDirList.size(), i + 1));
                         }
                         // Close windows
diff --git a/src/com/hippo/ehviewer/util/EhUtils.java b/src/com/hippo/ehviewer/util/EhUtils.java
index 6bb9d58b5..44ad0a239 100644
--- a/src/com/hippo/ehviewer/util/EhUtils.java
+++ b/src/com/hippo/ehviewer/util/EhUtils.java
@@ -33,6 +33,14 @@ public final class EhUtils {
                 Utils.standardizeFilename(gid + "-" + title));
     }
 
+    public static int getGidFromDirname(String dirname) {
+        int index = dirname.indexOf('-');
+        if (index == -1)
+            return 0;
+        else
+            return Utils.parseIntSafely(dirname.substring(0, index), 0);
+    }
+
     /**
      * Index start from 0
      *