JDownloader2/jdownloader
1
0
Fork 0
mirror of https://github.com/mirror/jdownloader.git synced 2024-11-27 14:00:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FileSonic: premium is api only now

Browse Source 
Shragle: updated error handling

git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@13845 ebf7c1c2-ba36-0410-9fe8-c592906822b4
This commit is contained in:
jiaz 2011-03-17 07:01:00 +00:00
parent d18ff6240c
commit 6e982b0180
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ressourcen/jd/mime.type
View File

@ -50,4 +50,5 @@ FLV:::464c56.*:::Flv Video:::.+\.flv
CSO:::4349534f.*:::Compressed ISO Image:::.+\.cso
RMF:::2E524D46.*:::RealMediaFile:::.+\.rmvb
FLAC:::664c6143.*:::FLAC:::.+\.flac
ISZ:::49735A.*:::ISZ:::.+\.isz
ISZ:::49735A.*:::ISZ:::.+\.isz
MOV:::0000002066747970.*:::MOV:::.+\.mov

11
src/jd/plugins/hoster/FileSonicCom.java
View File

@ -27,12 +27,12 @@ import jd.parser.html.Form;
import jd.plugins.Account;
import jd.plugins.AccountInfo;
import jd.plugins.DownloadLink;
import jd.plugins.DownloadLink.AvailableStatus;
import jd.plugins.HostPlugin;
import jd.plugins.LinkStatus;
import jd.plugins.Plugin;
import jd.plugins.PluginException;
import jd.plugins.PluginForHost;
import jd.plugins.DownloadLink.AvailableStatus;
import jd.utils.JDUtilities;
import jd.utils.locale.JDL;
@ -42,9 +42,9 @@ import org.appwork.utils.formatter.TimeFormatter;
@HostPlugin(revision = "$Revision$", interfaceVersion = 2, names = { "filesonic.com" }, urls = { "http://[\\w\\.]*?(sharingmatrix|filesonic)\\.[a-z]{2,3}/.*?file/([0-9]+(/.+)?|[a-z0-9]+/[0-9]+(/.+)?)" }, flags = { 2 })
public class FileSonicCom extends PluginForHost {
private static final Object LOCK = new Object();
private static long LAST_FREE_DOWNLOAD = 0l;
private static String geoDomain = null;
private static final Object LOCK = new Object();
private static long LAST_FREE_DOWNLOAD = 0l;
private static String geoDomain = null;
public FileSonicCom(final PluginWrapper wrapper) {
super(wrapper);
@ -386,7 +386,8 @@ public class FileSonicCom extends PluginForHost {
@Override
public void handlePremium(final DownloadLink downloadLink, final Account account) throws Exception {
this.setBrowserExclusive();
this.requestFileInformation(downloadLink);
this.checkLinks(new DownloadLink[] { downloadLink });
if (downloadLink.isAvailabilityStatusChecked() && !downloadLink.isAvailable()) throw new PluginException(LinkStatus.ERROR_FILE_NOT_FOUND);
String resp = downloadAPI(br, account, downloadLink);
String url = new Regex(resp, "CDATA\\[(http://.*?)\\]\\]").getMatch(0);
if (url == null) {

4
src/jd/plugins/hoster/ShragleCom.java
View File

@ -29,11 +29,11 @@ import jd.parser.html.Form;
import jd.plugins.Account;
import jd.plugins.AccountInfo;
import jd.plugins.DownloadLink;
import jd.plugins.DownloadLink.AvailableStatus;
import jd.plugins.HostPlugin;
import jd.plugins.LinkStatus;
import jd.plugins.PluginException;
import jd.plugins.PluginForHost;
import jd.plugins.DownloadLink.AvailableStatus;
@HostPlugin(revision = "$Revision$", interfaceVersion = 2, names = { "shragle.com" }, urls = { "http://[\\w\\.]*?shragle\\.(com|de)/files/[\\w]+/.*" }, flags = { 2 })
public class ShragleCom extends PluginForHost {
@ -154,7 +154,7 @@ public class ShragleCom extends PluginForHost {
if (this.br.containsHTML("Ihre Session-ID ist")) throw new PluginException(LinkStatus.ERROR_TEMPORARILY_UNAVAILABLE, "SESSION-ID Invalid", 10 * 60 * 1000l);
if (this.br.containsHTML("bereits eine Datei herunter")) { throw new PluginException(LinkStatus.ERROR_IP_BLOCKED, "IP is already loading, please wait!", 10 * 60 * 1000l); }
if (this.br.containsHTML("The selected file was not found")) { throw new PluginException(LinkStatus.ERROR_FILE_NOT_FOUND); }
if (this.br.containsHTML("tige Session-ID.")) { throw new PluginException(LinkStatus.ERROR_RETRY);
if (this.br.containsHTML("tige Session-ID.")) { throw new PluginException(LinkStatus.ERROR_TEMPORARILY_UNAVAILABLE, "SESSION-ID Invalid", 10 * 60 * 1000l);
}
if ((this.br.containsHTML("Die von Ihnen angeforderte Datei") && this.br.containsHTML("Bitte versuchen Sie es"))) {