Merge branch 'dev'

conf1102 · conf1102 · commit 0c97ee1fea93 · 2017-03-12T00:11:11.000-08:00
diff --git a/group20/404130810/src/com/coderising/download/DownloadThread.java b/group20/404130810/src/com/coderising/download/DownloadThread.java
@@ -1,6 +1,9 @@
 package com.coderising.download;
 
+import java.io.File;
 import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.util.concurrent.CountDownLatch;
 
 import com.coderising.download.api.Connection;
 
@@ -9,19 +12,34 @@ public class DownloadThread extends Thread{
 	Connection conn;
 	int startPos;
 	int endPos;
+	CountDownLatch latch;  
+	
+	File file = new File("C://download.mp3");
 
-	public DownloadThread( Connection conn, int startPos, int endPos){
-		
+	public DownloadThread( Connection conn, int startPos, int endPos, CountDownLatch latch){
 		this.conn = conn;		
 		this.startPos = startPos;
 		this.endPos = endPos;
+		this.latch = latch;
 	}
 	public void run(){	
+		RandomAccessFile raf = null;
 		try {
-			conn.read(startPos, endPos);
+			byte[] byteRead = conn.read(startPos, endPos);
+			raf = new RandomAccessFile(file, "rw");;
+			raf.seek(startPos);
+			raf.write(byteRead);
+
 		} catch (IOException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
+		}finally{
+			latch.countDown();
+			try {
+				raf.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+			conn.close();
 		}
 	}
 }
diff --git a/group20/404130810/src/com/coderising/download/FileDownloader.java b/group20/404130810/src/com/coderising/download/FileDownloader.java
@@ -1,6 +1,8 @@
 package com.coderising.download;
 
 import java.io.IOException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.CyclicBarrier;
 
 import com.coderising.download.api.Connection;
 import com.coderising.download.api.ConnectionException;
@@ -43,22 +45,25 @@ public void execute() throws IOException {
 			conn = cm.open(url);
 			int length = conn.getContentLength();
 			int[] posArr = FileDownloadUtil.generateDownloadPosArr(length);
+			CountDownLatch latch = new CountDownLatch(3);
 			for (int i = 0; i < posArr.length; i++) {
-				if(i == posArr.length - 1){
-					new DownloadThread(cm.open(url), posArr[i], length).start();
-				}else{
-					new DownloadThread(cm.open(url), posArr[i], posArr[i + 1] - 1).start();
+				if (i == posArr.length - 1) {
+					new DownloadThread(cm.open(url), posArr[i], length, latch).start();
+				} else {
+					new DownloadThread(cm.open(url), posArr[i], posArr[i + 1] - 1, latch).start();
 				}
 			}
-
+			latch.await();
+			System.out.println("Download Finished");
 		} catch (ConnectionException e) {
 			e.printStackTrace();
+		} catch (InterruptedException e) {
+			e.printStackTrace();
 		} finally {
 			if (conn != null) {
 				conn.close();
 			}
 		}
-
 	}
 
 	public void setListener(DownloadListener listener) {
diff --git a/group20/404130810/src/com/coderising/download/FileDownloaderTest.java b/group20/404130810/src/com/coderising/download/FileDownloaderTest.java
@@ -23,7 +23,7 @@ public void tearDown() throws Exception {
 	@Test
 	public void testDownload() throws IOException {
 		
-		String url = "http://localhost:8080/test.jpg";
+		String url = "http://localhost:8080/MyServer/Test.mp3";
 		
 		FileDownloader downloader = new FileDownloader(url);
 
@@ -38,7 +38,6 @@ public void notifyFinished() {
 			}
 
 		});
-
 		
 		downloader.execute();
 		
diff --git a/group20/404130810/src/com/coderising/download/impl/ConnectionImpl.java b/group20/404130810/src/com/coderising/download/impl/ConnectionImpl.java
@@ -1,5 +1,7 @@
 package com.coderising.download.impl;
 
+import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.RandomAccessFile;
@@ -24,16 +26,29 @@ public ConnectionImpl(String urlStr) {
 
 	@Override
 	public byte[] read(int startPos, int endPos) throws IOException {
-		int length = endPos - startPos;
-		byte[] rtnByte = new byte[length];
-		
-		RandomAccessFile raf = new RandomAccessFile("test.mp3", "rw"); 
-		raf.seek(startPos);
+		System.out.println("Start Reading");
+		System.out.println("StartPos: " + startPos);
+		System.out.println("EndPos: " + endPos);
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		InputStream is = httpConn.getInputStream();
-		while ((length = is.read(rtnByte)) != -1) {  
-            raf.write(rtnByte, 0, length);  
-        }  
-		return rtnByte;
+		is.skip(startPos);
+
+		int downloadLengh = endPos - startPos;
+
+		byte[] b = new byte[1024];
+		int total = 0;
+		int len = -1;
+		while ((len = is.read(b)) != -1) {
+			baos.write(b, 0, len);
+			total = total + len;
+			if (total == downloadLengh) {
+				break;
+			}
+		}
+		is.close();
+		baos.close();
+		System.out.println("End Reading");
+		return baos.toByteArray();
 	}
 
 	@Override
