improved search and download functionalities:

- auto server connect - automatic use of all search engines - auomatically resume of your downloads when restart application TODO: - auto resume when transition state is WORKING - ABORTED - pagination on search result - add more info on download page - include download page and search page in unique single page
muten84 · Mar 14, 2015 · eac0f1c · eac0f1c
1 parent 32c02e8
commit eac0f1c
Show file tree

Hide file tree

Showing 34 changed files with 633 additions and 316 deletions.
diff --git a/xdcc4j/build.gradle b/xdcc4j/build.gradle
@@ -8,6 +8,7 @@ allprojects{
 	project.ext{
 		sourceCompatibility = 1.8
 		targetCompatibility = 1.8
+		projectVersion='1.0-beta'
 	}
 	if (project.hasProperty('javaVersion')) {
 		project.sourceCompatibility = project.javaVersion
@@ -61,7 +62,8 @@ allprojects{
 subprojects{
 	apply plugin: 'maven'
 	project.group='it.luigibifulco.xdcc4j'
-	project.version='1.0'
+
+	project.version= projectVersion
 	dependencies{
 		compile fileTree(dir: '../libs', include: '*.jar')
 		compile('com.google.inject:guice:4.0-beta5')

diff --git a/xdcc4j/xdcc-common/.classpath b/xdcc4j/xdcc-common/.classpath
@@ -1,27 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="output" path="bin"/>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8" exported="true"/>
-	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER" exported="true"/>
-	<classpathentry sourcepath="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.0-beta5/4b7aabf26faff4f2ea094b4ab2d405acec532e4f/guice-4.0-beta5-sources.jar" kind="lib" path="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.0-beta5/fdf5df843620978a6f2929fd56f719a20d713c2b/guice-4.0-beta5.jar" exported="true"/>
-	<classpathentry sourcepath="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/com.google.inject.extensions/guice-multibindings/4.0-beta5/1e4465922d3aeebff27a228a989891408d5ab678/guice-multibindings-4.0-beta5-sources.jar" kind="lib" path="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/com.google.inject.extensions/guice-multibindings/4.0-beta5/f432356db0a167127ffe4a7921238d7205b12682/guice-multibindings-4.0-beta5.jar" exported="true"/>
-	<classpathentry sourcepath="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/com.google.inject.extensions/guice-assistedinject/4.0-beta5/7bdd877035ca008278e0ad6dc3adc2a8ad7b7ea4/guice-assistedinject-4.0-beta5-sources.jar" kind="lib" path="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/com.google.inject.extensions/guice-assistedinject/4.0-beta5/820f10e0650cd9ed2591f398937df50f330b147d/guice-assistedinject-4.0-beta5.jar" exported="true"/>
-	<classpathentry sourcepath="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/ch.qos.logback/logback-classic/1.1.2/decd76e2c461157804473468bbdc6b8eb6d6121b/logback-classic-1.1.2-sources.jar" kind="lib" path="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/ch.qos.logback/logback-classic/1.1.2/b316e9737eea25e9ddd6d88eaeee76878045c6b2/logback-classic-1.1.2.jar" exported="true"/>
-	<classpathentry sourcepath="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.10/11fb3d88ae7e3b757d70237064210ceb954a5a04/commons-codec-1.10-sources.jar" kind="lib" path="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.10/4b95f4897fa13f2cd904aee711aeafc0c5295cd8/commons-codec-1.10.jar" exported="true"/>
-	<classpathentry kind="lib" path="C:/Users/Luigi/.m2/repository/org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.jar" exported="true"/>
-	<classpathentry sourcepath="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-annotations/2.5.1/46e0be991f38bfa0589b5a08147bf5c51d864624/jackson-annotations-2.5.1-sources.jar" kind="lib" path="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-annotations/2.5.1/71c1992c0cf5e0ce62574e96009572062ba0f4d9/jackson-annotations-2.5.1.jar" exported="true"/>
-	<classpathentry sourcepath="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar" kind="lib" path="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar" exported="true"/>
-	<classpathentry sourcepath="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/org.easymock/easymock/3.3.1/c12cd9074f40555a2e4f9960e32a17db18f2ec0a/easymock-3.3.1-sources.jar" kind="lib" path="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/org.easymock/easymock/3.3.1/a497d7f00c9af78b72b6d8f24762d9210309148a/easymock-3.3.1.jar" exported="true"/>
-	<classpathentry kind="lib" path="C:/Users/Luigi/.m2/repository/javax/inject/javax.inject/1/javax.inject-1.jar" exported="true"/>
-	<classpathentry kind="lib" path="C:/Users/Luigi/.m2/repository/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" exported="true"/>
-	<classpathentry sourcepath="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/16.0.1/2477d012cd5379f9696e0d9d3ccc62ad13a09ca4/guava-16.0.1-sources.jar" kind="lib" path="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/16.0.1/5fa98cd1a63c99a44dd8d3b77e4762b066a5d0c5/guava-16.0.1.jar" exported="true"/>
-	<classpathentry sourcepath="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/ch.qos.logback/logback-core/1.1.2/502e1c764542fe747896c1dc04f023acfe0e5cbc/logback-core-1.1.2-sources.jar" kind="lib" path="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/ch.qos.logback/logback-core/1.1.2/2d23694879c2c12f125dac5076bdfd5d771cc4cb/logback-core-1.1.2.jar" exported="true"/>
-	<classpathentry sourcepath="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.6/97bb93c1badeae97a3d37e3c902df2985ee3de34/slf4j-api-1.7.6-sources.jar" kind="lib" path="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.6/562424e36df3d2327e8e9301a76027fca17d54ea/slf4j-api-1.7.6.jar" exported="true"/>
-	<classpathentry kind="lib" path="C:/Users/Luigi/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" exported="true"/>
-	<classpathentry sourcepath="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/cglib/cglib/3.1/e651cbd93cb1c2155afdea6675c50e567f7ce91e/cglib-3.1-sources.jar" kind="lib" path="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/cglib/cglib/3.1/1f1cb6c7a7479e0c7fd7987109e503914bebe84a/cglib-3.1.jar" exported="true"/>
-	<classpathentry sourcepath="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm/5.0.3/f0f24f6666c1a15c7e202e91610476bd4ce59368/asm-5.0.3-sources.jar" kind="lib" path="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm/5.0.3/dcc2193db20e19e1feca8b1240dbbc4e190824fa/asm-5.0.3.jar" exported="true"/>
-	<classpathentry sourcepath="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/org.objenesis/objenesis/2.1/611a57d836e2c320d59f9851d4ad587f3c8472e/objenesis-2.1-sources.jar" kind="lib" path="C:/Users/Luigi/.gradle/caches/modules-2/files-2.1/org.objenesis/objenesis/2.1/87c0ea803b69252868d09308b4618f766f135a96/objenesis-2.1.jar" exported="true"/>
-	<classpathentry kind="lib" path="C:/Users/Luigi/git/xdcc4j/xdcc4j/libs/pircbot.jar" exported="true"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
+	<classpathentry exported="true" kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/xdcc4j/xdcc-common/src/main/java/it/luigibifulco/xdcc4j/common/model/DownloadBean.java b/xdcc4j/xdcc-common/src/main/java/it/luigibifulco/xdcc4j/common/model/DownloadBean.java
@@ -30,6 +30,8 @@ public class DownloadBean implements Serializable {
 
 	private String resource;
 
+	private String statusMessage;
+
 	public DownloadBean() {
 
 	}
@@ -144,4 +146,12 @@ public void setChannel(String channel) {
 		this.channel = channel;
 	}
 
+	public String getStatusMessage() {
+		return statusMessage;
+	}
+
+	public void setStatusMessage(String statusMessage) {
+		this.statusMessage = statusMessage;
+	}
+
 }
diff --git a/xdcc4j/xdcc-common/src/main/java/it/luigibifulco/xdcc4j/common/util/XdccRequestCreator.java b/xdcc4j/xdcc-common/src/main/java/it/luigibifulco/xdcc4j/common/util/XdccRequestCreator.java
@@ -40,6 +40,22 @@ public static XdccRequest convertFromXdccItResult(String result) {
 
 	}
 
+	public static XdccRequest convertFromCmPlus(String result) {
+
+		String[] splitted = result.split(",");
+		if (splitted.length == 5) {
+			String channel = splitted[3].trim();
+			String peer = splitted[4].trim();
+			String resource = splitted[0].replace("#", "").trim();
+			XdccRequest request = create(channel, peer, resource);
+			request.setDescription(splitted[2]);
+			request.setHost("irc.crocmax.net");
+			request.setChannel("cm-plus");
+			return identify(request);
+		}
+		return null;
+	}
+
 	public static XdccRequest convertFromXdccFinderResult(String result) {
 
 		String[] splitted = result.split(",");

diff --git a/xdcc4j/xdcc-db/build.gradle b/xdcc4j/xdcc-db/build.gradle
@@ -1,5 +1,5 @@
 dependencies{
 	//compile project(':xdcc-common')
-	compile('it.luigibifulco.xdcc4j:xdcc-common:1.0')
+	compile('it.luigibifulco.xdcc4j:xdcc-common:'+projectVersion)
 	compile('org.neodatis.odb:neodatis-odb:1.9+')
 }
diff --git a/xdcc4j/xdcc-downloader/.classpath b/xdcc4j/xdcc-downloader/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="src" path="src/test/resources"/>
-	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/xdcc4j/xdcc-downloader/.gitignore b/xdcc4j/xdcc-downloader/.gitignore
@@ -2,4 +2,6 @@
 /build/
 /bin/
 /.classpath
-/*.avi
+/*.avi
+/Gotham.1x01.Le.Regole.Di.Gotham.ITA.WEB-DLMux.x264-iGM.mp4
+/Gotham.1x03.L.Uomo.Dei.Palloncini.ITA.ENG.DLMux.XviD-Pir8.ZIP
diff --git a/xdcc4j/xdcc-downloader/.project b/xdcc4j/xdcc-downloader/.project
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>xdcc-downloader</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>xdcc-downloader</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/xdcc4j/xdcc-downloader/build.gradle b/xdcc4j/xdcc-downloader/build.gradle
@@ -1,8 +1,8 @@
 apply plugin:'application'
 mainClassName = "it.luigibifulco.xdcc4j.downloader.Main"
 dependencies{
-	compile('it.luigibifulco.xdcc4j:xdcc-ft:1.0')
-	testCompile('it.luigibifulco.xdcc4j:xdcc-test-util:1.0')
+	compile('it.luigibifulco.xdcc4j:xdcc-ft:'+projectVersion)
+	testCompile('it.luigibifulco.xdcc4j:xdcc-test-util:'+projectVersion)
 	testCompile('org.apache.httpcomponents:httpclient:4.3.6')
 	compile('com.google.inject.extensions:guice-servlet:4.0-beta5')
 	//8.1.14.v20131031

diff --git a/.../xdcc-downloader/src/main/java/it/luigibifulco/xdcc4j/downloader/core/XdccDownloader.java b/.../xdcc-downloader/src/main/java/it/luigibifulco/xdcc4j/downloader/core/XdccDownloader.java
@@ -50,4 +50,6 @@ public void addDownloadStatusListener(String downloadId,
 	public String isConnected();
 
 	public boolean removeDownload(String id);
+
+	public int resumeAllDownloads();
 }