diff options
Diffstat (limited to 'org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DatabaseHelper.java')
| -rwxr-xr-x | org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DatabaseHelper.java | 63 |
1 files changed, 29 insertions, 34 deletions
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DatabaseHelper.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DatabaseHelper.java index fbe02e9..5316be4 100755 --- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DatabaseHelper.java +++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/DatabaseHelper.java @@ -276,7 +276,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { c.close();
}
- public void rescanDirectory(String comicsDir, final boolean fullRescan, final DirectoryScanListener listener) {
+ public void rescanDirectory(String comicsDir, final DirectoryScanListener listener) {
AsyncTask<String, Integer, Integer> task = new AsyncTask<String, Integer, Integer>() {
@@ -312,51 +312,46 @@ public class DatabaseHelper extends SQLiteOpenHelper { } else if (archive.getName().toLowerCase().matches(".*\\.(cbz|zip)")) {
try {
- int size = getSize(filePath);
+ ComicArchive cba = null;
- if (size == -1 || fullRescan) {
-
- ComicArchive cba = null;
-
- if (archive.getName().toLowerCase().matches(".*\\.(cbz|zip)")) {
- cba = new CbzComicArchive(filePath);
- }
-
- if (cba != null && cba.getCount() > 0) {
- // Get cover
+ if (archive.getName().toLowerCase().matches(".*\\.(cbz|zip)")) {
+ cba = new CbzComicArchive(filePath);
+ }
- try {
- File thumbnailFile = new File(CommonActivity.getCacheFileName(m_context, filePath));
+ if (cba != null && cba.getCount() > 0) {
+ // Get cover
- if (CommonActivity.isStorageWritable()) {
- if (!thumbnailFile.exists() || fullRescan) {
- InputStream is = cba.getItem(0);
+ try {
+ File thumbnailFile = new File(CommonActivity.getCacheFileName(m_context, filePath));
- if (is != null) {
- FileOutputStream fos = new FileOutputStream(thumbnailFile);
+ if (CommonActivity.isStorageWritable()) {
+ if (!thumbnailFile.exists()) {
+ InputStream is = cba.getItem(0);
- byte[] buffer = new byte[1024];
- int len;
- while ((len = is.read(buffer)) != -1) {
- fos.write(buffer, 0, len);
- }
+ if (is != null) {
+ FileOutputStream fos = new FileOutputStream(thumbnailFile);
- fos.close();
- is.close();
+ byte[] buffer = new byte[1024];
+ int len;
+ while ((len = is.read(buffer)) != -1) {
+ fos.write(buffer, 0, len);
}
- } else if (thumbnailFile.exists()) {
- thumbnailFile.setLastModified(new Date().getTime());
+
+ fos.close();
+ is.close();
}
+ } else if (thumbnailFile.exists()) {
+ thumbnailFile.setLastModified(new Date().getTime());
}
-
- } catch (IOException e) {
- e.printStackTrace();
}
- size = cba.getCount();
-
- setSize(filePath, size);
+ } catch (IOException e) {
+ e.printStackTrace();
}
+
+ int size = cba.getCount();
+
+ setSize(filePath, size);
}
} catch (IOException e) {
e.printStackTrace();
|