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

build>full

Browse Source 
git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@48254 ebf7c1c2-ba36-0410-9fe8-c592906822b4

Former-commit-id: 2eea551197683be85414ce0421d495e8ffee93c1
This commit is contained in:
jiaz 2023-09-04 15:03:19 +00:00
parent 0992552b6e
commit ef39e6e0f1
3 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/newBuild/build.xml
View File

@ -110,13 +110,13 @@
</copy>
<copy todir="${dist}/libs">
<fileset dir="${res}/libs" includes="**/*">
<exclude name="proxyVole.jar" />
<exclude name="**/*.info" />
</fileset>
</copy>
<copy todir="${dist}/libs">
<fileset dir="${dep.awu}/libs" includes="**/*.jar">
<exclude name="miglayout.jar" />
<exclude name="miglayout.jar" />
<exclude name="**/*.info" />
<exclude name="**/*jackson*" />
</fileset>
@ -382,9 +382,9 @@
<!--<attribute name="Class-Path" value="" />-->
</manifest>
<jar duplicate="fail" file="${dist}/JDownloader.jar" manifest="${dist}/Manifest.MF">
<jar duplicate="fail" file="${dist}/JDownloader.jar" manifest="${dist}/Manifest.MF">
<zipfileset src="${dep.awu}/libs/miglayout.jar" excludes="META-INF/*" />
<zipfileset src="${dep.awu}/libs/proxyVole.jar" excludes="META-INF/*" />
<zipfileset src="${res}/libs/proxyVole.jar" excludes="META-INF/*" />
<zipfileset src="${dep.updateclient}/libs/xz.jar" excludes="META-INF/*" />
<fileset dir="${working}">
<include name="version.nfo" />

17
build/newBuild/build_standalone.xml
View File

@ -6,13 +6,14 @@
<property name="debug" value="true" />
<property name="working" value="dist/standalone" />
<property name="working" value="standalone" />
<property name="cls" value="${working}/bin" />
<property name="dist" value="${working}/dist" />
<property name="res" value="ressourcen" />
<property name="pluginres" value="${dist}/pluginressourcen" />
<property name="jvm_target" value="1.8" />
<property name="jvm_source" value="1.8" />
@ -22,10 +23,7 @@
<fileset dir="${cls}" />
<!-- Dependencies -->
<fileset dir="${dep.awu}/libs" includes="**/*.jar" />
<fileset dir="${dep.browser}/libs" includes="**/*.jar" />
<fileset dir="${res}/libs" includes="**/*.jar" />
<fileset dir="${res}/libs_ext" includes="**/*.jar" />
</path>
@ -89,18 +87,19 @@
<copy todir="${dist}/libs">
<fileset dir="${res}/libs" includes="**/*">
<exclude name="**/*.info" />
<exclude name="proxyVole.jar" />
<exclude name="**/*.info" />
</fileset>
</copy>
<copy todir="${dist}/libs">
<fileset dir="${dep.awu}/libs" includes="**/*.jar">
<exclude name="miglayout.jar" />
<exclude name="**/*.info" />
<exclude name="miglayout.jar" />
<exclude name="**/*.info" />
</fileset>
</copy>
<copy todir="${dist}/libs">
<fileset dir="${dep.browser}/libs" includes="**/*.jar">
<exclude name="**/*.info" />
<exclude name="**/*.info" />
</fileset>
</copy>
@ -331,7 +330,7 @@
<jar duplicate="fail" file="${dist}/JDownloader.jar" manifest="${dist}/Manifest.MF">
<zipfileset src="${dep.awu}/libs/miglayout.jar" excludes="META-INF/*" />
<zipfileset src="${dep.awu}/libs/proxyVole.jar" excludes="META-INF/*" />
<zipfileset src="${res}/libs/proxyVole.jar" excludes="META-INF/*" />
<fileset dir="${working}">
<include name="version.nfo" />
<include name="classpath" />

39
src/jd/plugins/hoster/UpToBoxCom.java
View File

@ -26,6 +26,24 @@ import java.util.Map;
import javax.swing.JComponent;
import javax.swing.JLabel;
import jd.PluginWrapper;
import jd.gui.swing.components.linkbutton.JLink;
import jd.http.Browser;
import jd.nutils.encoding.Encoding;
import jd.parser.html.Form;
import jd.plugins.Account;
import jd.plugins.Account.AccountType;
import jd.plugins.AccountInfo;
import jd.plugins.AccountInvalidException;
import jd.plugins.AccountRequiredException;
import jd.plugins.AccountUnavailableException;
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 org.appwork.storage.JSonMapperException;
import org.appwork.storage.TypeRef;
import org.appwork.swing.MigPanel;
@ -46,24 +64,6 @@ import org.jdownloader.plugins.config.PluginJsonConfig;
import org.jdownloader.plugins.controller.LazyPlugin.FEATURE;
import org.jdownloader.scripting.JavaScriptEngineFactory;
import jd.PluginWrapper;
import jd.gui.swing.components.linkbutton.JLink;
import jd.http.Browser;
import jd.nutils.encoding.Encoding;
import jd.parser.html.Form;
import jd.plugins.Account;
import jd.plugins.Account.AccountType;
import jd.plugins.AccountInfo;
import jd.plugins.AccountInvalidException;
import jd.plugins.AccountRequiredException;
import jd.plugins.AccountUnavailableException;
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;
@HostPlugin(revision = "$Revision$", interfaceVersion = 3, names = {}, urls = {})
public class UpToBoxCom extends PluginForHost {
public UpToBoxCom(PluginWrapper wrapper) {
@ -823,8 +823,7 @@ public class UpToBoxCom extends PluginForHost {
final String apitoken = account.getPass();
if (!isAPIToken(apitoken)) {
throw new AccountInvalidException("Invalid token format! You can find your token here: " + this.getPreferredDomain() + "/my_account -> Token");
}
if (StringUtils.isEmpty(apitoken)) {
} else if (StringUtils.isEmpty(apitoken)) {
throw new AccountInvalidException();
} else if (!verifySession) {
logger.info("Trust apikey without verification");