();
private static Object taskLock = new Object();
-
private static OnDownloadMangaListener listener;
+ private static DownloadService mService;
+
+ private static boolean mStop = false;
public static void init() {
- mNotifyManager = (NotificationManager)mContext
- .getSystemService(Context.NOTIFICATION_SERVICE);
- mBuilder = new NotificationCompat.Builder(mContext);
- mBuilder.setSmallIcon(R.drawable.ic_launcher);
+
}
public static void setOnDownloadMangaListener(OnDownloadMangaListener listener) {
DownloadMangaManager.listener = listener;
}
+ public static void setDownloadService(DownloadService service) {
+ DownloadMangaManager.mService = service;
+ }
+
/**
* Add a download task to task queue
*
@@ -1207,90 +1217,283 @@ public class EhClient {
* @param foldName
* @return
*/
- public static int add(String detailUrlStr, String foldName) {
- int newId = ++id;
- if (newId < 0)
- newId = id = 0;
- mDownloadQueue.add(new DMTaskInfo(newId, detailUrlStr, foldName));
-
+ public static void add(DownloadInfo di) {
synchronized (taskLock) {
- if (curDownloadId == INVALID_ID && mDownloadQueue.size() != 0)
+ mDownloadQueue.add(di);
+ if (curDownloadInfo == null && mDownloadQueue.size() != 0)
start();
}
- return newId;
+ }
+
+ public static void cancel(String id) {
+ synchronized (taskLock) {
+ DownloadInfo di = Download.get(id);
+ if (di != null) {
+ di.status = DownloadInfo.STOP;
+ mDownloadQueue.remove(di);
+ if (!id.equals(getCurDownloadId())) {
+ mService.notifyUpdate();
+ Download.notify(id);
+ }
+ }
+ }
+ }
+
+ public static String getCurDownloadId() {
+ synchronized (taskLock) {
+ if (curDownloadInfo == null)
+ return null;
+ else
+ return curDownloadInfo.gid;
+ }
+ }
+
+ public static boolean isWaiting(String str) {
+ synchronized (taskLock) {
+ for (DownloadInfo di : mDownloadQueue) {
+ if (di.gid.equals(str))
+ return true;
+ }
+ }
+ return false;
}
private static void start(){
- if(curDownloadId != INVALID_ID){
+ if(curDownloadInfo != null){
return;
}
new Thread(new Runnable(){
@Override
public void run() {
- if (listener != null)
- listener.onDownloadMangaAllStart();
+ listener.onDownloadMangaAllStart();
+ Parser parser = new Parser();
+ Downloader imageDownloader = new Downloader();
+ imageDownloader.setOnDownloadListener(new Downloader.OnDownloadListener() {
+ @Override
+ public void onDownloadStart(int totalSize) {
+ if (curDownloadInfo != null) {
+ curDownloadInfo.downloadSize = 0;
+ curDownloadInfo.totalSize = totalSize/1024.0f;
+ mService.notifyUpdate();
+ }
+ }
+
+ @Override
+ public void onDownloadStatusUpdate(int downloadSize,
+ int totalSize) {
+ curDownloadInfo.downloadSize = downloadSize/1024.0f;
+ curDownloadInfo.totalSize = totalSize/1024.0f;
+ mService.notifyUpdate();
+ }
+ });
while(mDownloadQueue.size() > 0){
- DMTaskInfo ti = mDownloadQueue.get(0);
- curDownloadId = ti.id;
- mDownloadQueue.remove(0);
-
- StringBuffer sb = new StringBuffer();
- int pageSum = getFirstPageForDetail(ti.detailUrlStr, sb);
- if (listener != null)
- listener.onDownloadMangaStart(curDownloadId, pageSum);
-
+ synchronized (taskLock) {
+ curDownloadInfo = mDownloadQueue.get(0);
+ curDownloadInfo.status = DownloadInfo.DOWNLOADING;
+ mDownloadQueue.remove(0);
+ }
+ Download.notify(String.valueOf(curDownloadInfo.gid));
+ if (curDownloadInfo.type == DownloadInfo.DETAIL_URL) {
+ listener.onDownloadMangaStart(curDownloadInfo.gid);
+ mService.notifyUpdate();
+ if (parser.getFirstPagePageSumForDetail(curDownloadInfo.detailUrlStr)) { // Get page info
+ curDownloadInfo.type = DownloadInfo.PAGE_URL;
+ curDownloadInfo.lastStartIndex = 1;
+ curDownloadInfo.pageSum = parser.getPageSum();
+ curDownloadInfo.pageUrlStr = parser.getFirstPage();
+ Download.notify(curDownloadInfo.gid);
+
+ } else { // If get info error
+ listener.onDownloadMangaOver(curDownloadInfo.gid, false);
+ curDownloadInfo.status = DownloadInfo.FAILED;
+ mService.notifyUpdate();
+ Download.notify(String.valueOf(curDownloadInfo.gid));
+ continue;
+ }
+ }
+ //Create folder
+ File folder = new File(Environment.getExternalStorageDirectory() + DOWNLOAD_PATH + curDownloadInfo.title); // TODO
+ if (!folder.mkdirs() && !folder.isDirectory()) {
+ folder = new File(Environment.getExternalStorageDirectory() + DOWNLOAD_PATH + curDownloadInfo.gid);
+ if (!folder.mkdirs() && !folder.isDirectory()) {
+ listener.onDownloadMangaOver(curDownloadInfo.gid, false);
+ curDownloadInfo.status = DownloadInfo.FAILED;
+ mService.notifyUpdate();
+ Download.notify(String.valueOf(curDownloadInfo.gid));
+ continue;
+ }
+ }
+ String nextPage = curDownloadInfo.pageUrlStr;
+ curDownloadInfo.pageUrlStr = null;
+ String imageUrlStr = null;
+ boolean mComplete = true;
+ boolean mStop = false;
+ // Get page
+ curDownloadInfo.lastStartIndex--;
+ while (!nextPage.equals(curDownloadInfo.pageUrlStr)) {
+ curDownloadInfo.pageUrlStr = nextPage;
+ curDownloadInfo.lastStartIndex++;
+ Download.notify(String.valueOf(curDownloadInfo.gid));
+ listener.onDownloadPage(curDownloadInfo.gid, curDownloadInfo.pageSum, curDownloadInfo.lastStartIndex-1);
+ mService.notifyUpdate();
+
+ if (parser.getPageInfoSumForPage(curDownloadInfo.pageUrlStr)) {
+ nextPage = parser.getNextPage();
+ imageUrlStr = parser.getImageUrlStr();
+
+ // Check stop
+ if (curDownloadInfo.status == DownloadInfo.STOP) {
+ listener.onDownloadMangaStop(curDownloadInfo.gid);
+ mService.notifyUpdate();
+ Download.notify(String.valueOf(curDownloadInfo.gid));
+ mComplete = false;
+ mStop = true;
+ break;
+ }
+
+ try {
+ imageDownloader.resetData(folder.toString(),
+ String.format("%05d", curDownloadInfo.lastStartIndex) + "." + Util.getExtension(imageUrlStr),
+ imageUrlStr, curDownloadInfo);
+ imageDownloader.run();
+
+ curDownloadInfo.downloadSize = 0;
+ curDownloadInfo.totalSize = 0;
+
+ int downloadStatus = imageDownloader.getStatus();
+ if (downloadStatus == Downloader.STOP) { // If stop by user
+ listener.onDownloadMangaStop(curDownloadInfo.gid);
+ mService.notifyUpdate();
+ Download.notify(String.valueOf(curDownloadInfo.gid));
+ mComplete = false;
+ mStop = true;
+ break;
+ } else if (downloadStatus != Downloader.COMPLETED) { // If get image error
+ Log.e(TAG, "Download image error, downloadStatus is " + downloadStatus);
+ mComplete = false;
+ break;
+ }
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ } else {
+ mComplete = false;
+ break;
+ }
+ }
+ if (mComplete) {
+ listener.onDownloadMangaOver(curDownloadInfo.gid, true);
+ curDownloadInfo.status = DownloadInfo.COMPLETED;
+ mService.notifyUpdate();
+ Download.notify(String.valueOf(curDownloadInfo.gid));
+ } else if (!mStop) {
+ listener.onDownloadMangaOver(curDownloadInfo.gid, false);
+ curDownloadInfo.status = DownloadInfo.FAILED;
+ mService.notifyUpdate();
+ Download.notify(String.valueOf(curDownloadInfo.gid));
+ }
}
synchronized (taskLock) {
- curDownloadId = INVALID_ID;
- if (listener != null)
- listener.onDownloadMangaAllOver();
+ curDownloadInfo = null;
+ listener.onDownloadMangaAllOver();
}
}
}).start();
}
+
+ public static boolean isEmpty() {
+ synchronized (taskLock) {
+ return curDownloadInfo == null;
+ }
+ }
}
- public static int getFirstPageForDetail(String detailUrlStr, StringBuffer firstPage) {
- int retry_times = 0;
- int errorMessageId;
- String pageContent;
- StringBuffer sb = new StringBuffer();
+ private static class Parser {
- // Get content
- while (sb.length() == 0) {
- errorMessageId = get(detailUrlStr, sb);
- pageContent = sb.toString();
-
- retry_times++;
- if (retry_times > DOWNLOAD_RETRY_TIMES)
- break;
+ private int errorMegId;
+
+ private int pageSum;
+ private String firstPage;
+
+ private String prePage;
+ private String nextPage;
+ private String imageUrlStr;
+
+
+ public int getPageSum() {
+ return pageSum;
}
- // If error
- if (sb.length() == 0)
- return 0;
+ public String getFirstPage() {
+ return firstPage;
+ }
- // TODO
+ public String getPrePage() {
+ return prePage;
+ }
+ public String getNextPage() {
+ return nextPage;
+ }
- return 0;
- }
-
-
- public static class DMTaskInfo {
- public int id;
- public String detailUrlStr;
- public String foldName;
+ public String getImageUrlStr() {
+ return imageUrlStr;
+ }
- public DMTaskInfo(int id, String detailUrlStr, String foldName) {
- this.id = id;
- this.detailUrlStr = detailUrlStr;
- this.foldName = foldName;
+ public String getPageContent(String urlStr) {
+ int retry_times = 0;
+ StringBuffer sb = new StringBuffer();
+
+ // Get content
+ while (sb.length() == 0) {
+ errorMegId = get(urlStr, sb);
+ retry_times++;
+ if (retry_times > RETRY_TIMES)
+ break;
+ }
+ return sb.toString();
+ }
+
+ public boolean getFirstPagePageSumForDetail(String detailUrlStr) {
+ String pageContent = getPageContent(detailUrlStr);
+ if (pageContent.length() == 0)
+ return false;
+
+ Pattern p = Pattern.compile("Showing [\\d|,]+ - [\\d|,]+ of ([\\d|,]+) images
.+]*>(?:]*>)?]*href=\"([^<>\"]+)\"[^<>]*>");
+ Matcher m = p.matcher(pageContent);
+ if (m.find()) {
+ pageSum = Integer.parseInt(m.group(1).replace(",", ""));
+ firstPage = m.group(2);
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Get page info, previous page, next page, image url
+ *
+ * @param pageUrlStr
+ * @return True if get
+ */
+ public boolean getPageInfoSumForPage(String pageUrlStr) {
+ String pageContent = getPageContent(pageUrlStr);
+ if (pageContent.length() == 0)
+ return false;
+
+ Pattern p = Pattern.compile("]*id=\"prev\"[^<>]*href=\"([^<>\"]+)\">]*/>.+]id=\"next\"[^<>]*href=\"([^<>\"]+)\">]*/>.+]*src=\"([^<>\"]+?)\"[^<>]*style=\"[^<>\"]*\"[^<>]*/>");
+ Matcher m = p.matcher(pageContent);
+ if (m.find()) {
+ prePage = m.group(1);
+ nextPage = m.group(2);
+ imageUrlStr = StringEscapeUtils.unescapeHtml4(m.group(3));
+ return true;
+ }
+ return false;
}
}
diff --git a/src/com/hippo/ehviewer/util/Favourite.java b/src/com/hippo/ehviewer/util/Favourite.java
index 954ce59a8..6b91e497f 100644
--- a/src/com/hippo/ehviewer/util/Favourite.java
+++ b/src/com/hippo/ehviewer/util/Favourite.java
@@ -109,10 +109,6 @@ public class Favourite {
* @return True if remove successfully
*/
public static boolean remove(int index) {
- if (!mInit) {
- throw new IllegalStateException("Please init Favourite first.");
- }
-
mFavouriteLmd.remove(index);
String key = mListOrder.remove(index);
Util.putStrings(mFavouritePre, LIST_ORDER, mListOrder);
@@ -126,9 +122,6 @@ public class Favourite {
* @return
*/
public static ArrayList getFavouriteList() {
- if (!mInit) {
- throw new IllegalStateException("Please init Favourite first.");
- }
return mFavouriteLmd;
}
diff --git a/src/com/hippo/ehviewer/util/Tag.java b/src/com/hippo/ehviewer/util/Tag.java
index 18b4053e7..0e7963705 100644
--- a/src/com/hippo/ehviewer/util/Tag.java
+++ b/src/com/hippo/ehviewer/util/Tag.java
@@ -25,9 +25,8 @@ public class Tag {
private static ArrayList mTags = new ArrayList();
private static boolean mInit = false;
- private static final String NOT_INIT_ERROR_INFO = "Please init Tag first.";
/**
- * Init Favourite
+ * Init Tag
*
* @param context Application context
*/
@@ -51,9 +50,6 @@ public class Tag {
}
private static void getTag() {
- if (!mInit)
- throw new IllegalStateException(NOT_INIT_ERROR_INFO);
-
String[] allOrder = Util.getStrings(mTagPre, LIST_ORDER);
if (allOrder == null)
@@ -82,9 +78,6 @@ public class Tag {
* @return
*/
public static boolean add(String key, ListUrls tag) {
- if (!mInit)
- throw new IllegalStateException(NOT_INIT_ERROR_INFO);
-
// Check contain this item or not
if (mListOrder.indexOf(key) == -1) {
mListOrder.add(key);
@@ -133,9 +126,6 @@ public class Tag {
* @return True if remove successfully
*/
public static boolean remove(String key) {
- if (!mInit)
- throw new IllegalStateException(NOT_INIT_ERROR_INFO);
-
int index = mListOrder.indexOf(key);
if (index != -1) {
mListOrder.remove(index);
@@ -154,9 +144,6 @@ public class Tag {
* @return True if remove successfully
*/
public static boolean remove(int index) {
- if (!mInit)
- throw new IllegalStateException(NOT_INIT_ERROR_INFO);
-
mTags.remove(index);
String key = mListOrder.remove(index);
mTagPre.edit().remove(key).apply();
@@ -198,8 +185,6 @@ public class Tag {
* @return
*/
public static ArrayList getTagList() {
- if (!mInit)
- throw new IllegalStateException(NOT_INIT_ERROR_INFO);
return mTags;
}
@@ -209,8 +194,6 @@ public class Tag {
* @return
*/
public static ArrayList getKeyList() {
- if (!mInit)
- throw new IllegalStateException(NOT_INIT_ERROR_INFO);
return mListOrder;
}
diff --git a/src/com/hippo/ehviewer/util/Ui.java b/src/com/hippo/ehviewer/util/Ui.java
index ccd825c4a..cc4d31b44 100644
--- a/src/com/hippo/ehviewer/util/Ui.java
+++ b/src/com/hippo/ehviewer/util/Ui.java
@@ -150,6 +150,7 @@ public class Ui {
}
if (viewGroup == null || rawRateString == null)
return;
+ viewGroup.removeAllViews();
float num = 0;
try{
num = Float.parseFloat(rawRateString);
diff --git a/src/com/hippo/ehviewer/util/Util.java b/src/com/hippo/ehviewer/util/Util.java
index a05ead698..fb59e1635 100644
--- a/src/com/hippo/ehviewer/util/Util.java
+++ b/src/com/hippo/ehviewer/util/Util.java
@@ -38,7 +38,7 @@ public class Util {
private static String TAG = "Util";
/**
- * Put InputStream to File, default bufferSize is 16 * 1024
+ * Put InputStream to File, default bufferSize is 512 * 1024
*
* @param is
* @param file
@@ -50,7 +50,7 @@ public class Util {
}
public static void copy(InputStream is, OutputStream os) throws IOException {
- byte[] buffer = new byte[16 * 1024];
+ byte[] buffer = new byte[512 * 1024];
int bytesRead;
while((bytesRead = is.read(buffer)) !=-1)
os.write(buffer, 0, bytesRead);
@@ -65,11 +65,36 @@ public class Util {
public static int getResourcesType(String url) {
int type = BITMAP;
int index = url.lastIndexOf('.');
- if (index != -1 && url.substring(index + 1).toLowerCase().equals("gif"))
+ if (index != -1 && getExtension(url).equals("gif"))
type = MOVIE;
return type;
}
+ public static String getExtension(String url) {
+ int index = url.lastIndexOf('.');
+ if (index != -1)
+ return url.substring(index + 1).toLowerCase();
+ else
+ return "png";
+ }
+
+ public static String getName(String fileName) {
+ int index = fileName.lastIndexOf('.');
+ if (index != -1)
+ return fileName.substring(0, index).toLowerCase();
+ else
+ return "png";
+ }
+
+ public static boolean isNumber(String str) {
+ for (int i = 0; i < str.length(); i++) {
+ char ch = str.charAt(i);
+ if (ch < '0' || ch > '9')
+ return false;
+ }
+ return true;
+ }
+
public static String byteArrayToHexString(byte[] b) {
StringBuilder sb = new StringBuilder(b.length * 2);
for (byte element : b) {
@@ -130,4 +155,20 @@ public class Util {
sb.delete(length - 1, length);
shaper.edit().putString(key, byteArrayToHexString(sb.toString().getBytes())).apply();
}
+
+ public static void closeStreamQuietly (InputStream is) {
+ try {
+ if (is != null)
+ is.close();
+ } catch (IOException e) {
+ }
+ }
+
+ public static void closeStreamQuietly (OutputStream os) {
+ try {
+ if (os != null)
+ os.close();
+ } catch (IOException e) {
+ }
+ }
}