mirror of
https://github.com/Rogiel/httpchannel
synced 2025-12-06 07:32:50 +00:00
Add support for new services on multiupload, removes the maven archetype
This commit is contained in:
@@ -9,5 +9,5 @@
|
||||
<artifactId>httpchannel-service-multiupload</artifactId>
|
||||
<groupId>com.rogiel.httpchannel.services</groupId>
|
||||
<name>HttpChannel/Service/MultiUpload</name>
|
||||
<description>Provides upload access to multiupload.com</description>
|
||||
<description>Provides upload access to multiupload.nl</description>
|
||||
</project>
|
||||
@@ -64,9 +64,9 @@ import com.rogiel.httpchannel.util.htmlparser.HTMLPage;
|
||||
|
||||
|
||||
/**
|
||||
* This service handles uploads to MultiUpload.com.
|
||||
* This service handles uploads to MultiUpload.nl.
|
||||
*
|
||||
* @author <a href="http://www.rogiel.com/">Rogiel</a>
|
||||
* @author <a href="http://www.rogiel.nl/">Rogiel</a>
|
||||
* @since 1.0
|
||||
*/
|
||||
public class MultiUploadService extends AbstractHttpService implements Service,
|
||||
@@ -78,15 +78,15 @@ public class MultiUploadService extends AbstractHttpService implements Service,
|
||||
*/
|
||||
public static final ServiceID SERVICE_ID = ServiceID.create("multiupload");
|
||||
|
||||
// http://www52.multiupload.com/upload/?UPLOAD_IDENTIFIER=73132658610746
|
||||
// http://www52.multiupload.nl/upload/?UPLOAD_IDENTIFIER=73132658610746
|
||||
private static final Pattern UPLOAD_URI_PATTERN = Pattern
|
||||
.compile("http://www([0-9]*)\\.multiupload\\.com/upload/\\?UPLOAD_IDENTIFIER=[0-9]*");
|
||||
.compile("http://www([0-9]*)\\.multiupload\\.nl/upload/\\?UPLOAD_IDENTIFIER=[0-9]*");
|
||||
private static final Pattern DOWNLOAD_ID_PATTERN = Pattern
|
||||
.compile("\"downloadid\":\"([0-9a-zA-Z]*)\"");
|
||||
private static final Pattern DOWNLOAD_LINK_PATTERN = Pattern
|
||||
.compile("http://(www\\.)?multiupload\\.com/([0-9a-zA-Z]*)");
|
||||
.compile("http://(www\\.)?multiupload\\.nl/([0-9a-zA-Z]*)");
|
||||
private static final Pattern DIRECT_DOWNLOAD_LINK_PATTERN = Pattern
|
||||
.compile("http://www[0-9]*\\.multiupload\\.com(:[0-9]*)?/files/([0-9a-zA-Z]*)/(.*)");
|
||||
.compile("http://www[0-9]*\\.multiupload\\.nl(:[0-9]*)?/files/([0-9a-zA-Z]*)/(.*)");
|
||||
|
||||
@Override
|
||||
public ServiceID getServiceID() {
|
||||
@@ -217,8 +217,8 @@ public class MultiUploadService extends AbstractHttpService implements Service,
|
||||
|
||||
@Override
|
||||
public UploadChannel openChannel() throws IOException {
|
||||
logger.debug("Starting upload to multiupload.com");
|
||||
final String uri = get("http://www.multiupload.com/").asPage()
|
||||
logger.debug("Starting upload to multiupload.nl");
|
||||
final String uri = get("http://www.multiupload.nl/").asPage()
|
||||
.findFormAction(UPLOAD_URI_PATTERN);
|
||||
logger.debug("Upload URI is {}", uri);
|
||||
final LinkedUploadChannel channel = createLinkedChannel(this);
|
||||
@@ -247,10 +247,10 @@ public class MultiUploadService extends AbstractHttpService implements Service,
|
||||
try {
|
||||
final String linkId = PatternUtils.find(DOWNLOAD_ID_PATTERN,
|
||||
uploadFuture.get(), 1);
|
||||
logger.debug("Upload to multiupload.com finished");
|
||||
logger.debug("Upload to multiupload.nl finished");
|
||||
if (linkId == null)
|
||||
return null;
|
||||
return new StringBuilder("http://www.multiupload.com/").append(
|
||||
return new StringBuilder("http://www.multiupload.nl/").append(
|
||||
linkId).toString();
|
||||
} catch (InterruptedException e) {
|
||||
return null;
|
||||
@@ -292,7 +292,7 @@ public class MultiUploadService extends AbstractHttpService implements Service,
|
||||
|
||||
@Override
|
||||
public AccountDetails login() throws IOException {
|
||||
final HTMLPage page = post("http://www.multiupload.com/login")
|
||||
final HTMLPage page = post("http://www.multiupload.nl/login")
|
||||
.parameter("username", credential.getUsername())
|
||||
.parameter("password", credential.getPassword()).asPage();
|
||||
|
||||
@@ -303,7 +303,7 @@ public class MultiUploadService extends AbstractHttpService implements Service,
|
||||
|
||||
@Override
|
||||
public void logout() throws IOException {
|
||||
post("http://www.multiupload.com/login").parameter("do", "logout")
|
||||
post("http://www.multiupload.nl/login").parameter("do", "logout")
|
||||
.request();
|
||||
// TODO check logout status
|
||||
}
|
||||
|
||||
@@ -54,8 +54,9 @@ public class MultiUploadUploaderConfiguration extends
|
||||
* @author <a href="http://www.rogiel.com">Rogiel</a>
|
||||
*/
|
||||
public enum MultiUploadMirrorService {
|
||||
MEGAUPLOAD(1), UPLOADKING(16), DEPOSIT_FILES(7), HOTFILE(9), UPLOAD_HERE(
|
||||
17), ZSHARE(6), FILE_SONIC(15), FILE_SERVE(18), WUPLOAD(19);
|
||||
MEGAUPLOAD(1), UPLOADKING(16), DEPOSIT_FILES(7), HOTFILE(9), TWO_SHARED(
|
||||
11), UPLOAD_HERE(17), ZSHARE(6), FILE_SONIC(15), FILE_SERVE(18), PUT_LOCKER(
|
||||
19), ORON(20), FILE_FACTORY(21), FREAK_SHARED(23);
|
||||
|
||||
/**
|
||||
* The internal multiupload id
|
||||
|
||||
@@ -61,7 +61,7 @@ public class MultiUploadServiceTest {
|
||||
public void testDownloader() throws IOException, NoSuchAlgorithmException {
|
||||
final byte[] data = ChannelUtils
|
||||
.toByteArray(((DownloadService<?>) service).getDownloader(
|
||||
URI.create("http://www.multiupload.com/TJOYWB4JEW"))
|
||||
URI.create("http://www.multiupload.nl/ITPPI2YSYX"))
|
||||
.openChannel());
|
||||
assertChecksum("Downloaded data checksum did not matched", "SHA1",
|
||||
data, EXPECTED_FULL_CHECKSUM);
|
||||
@@ -72,7 +72,7 @@ public class MultiUploadServiceTest {
|
||||
NoSuchAlgorithmException {
|
||||
final byte[] data = ChannelUtils
|
||||
.toByteArray(((DownloadService<?>) service).getDownloader(
|
||||
URI.create("http://www.multiupload.com/TJOYWB4JEW"))
|
||||
URI.create("http://www.multiupload.nl/ITPPI2YSYX"))
|
||||
.openChannel(50));
|
||||
assertChecksum("Downloaded data checksum did not matched", "SHA1",
|
||||
data, EXPECTED_RESUME_CHECKSUM);
|
||||
|
||||
Reference in New Issue
Block a user