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

*General*

Browse Source 
- AccountInfo: setMultiHostSupport: added more loggers, also log found- but offline supported host entries
- MultiHostHost: minor changes

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

Former-commit-id: 3ddf62271992c8420e0e0b7e201d2fe6ab9b9ee8
This commit is contained in:
psp 2024-09-04 12:36:52 +00:00
parent a60a4322e4
commit 6d7a18b827
2 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/jd/plugins/AccountInfo.java
View File

@ -397,6 +397,7 @@ public class AccountInfo extends Property implements AccountTrafficView {
assignedMultiHostPlugins.add(hostCleaned);
}
}
final HashSet<String> skippedOfflineEntries = new HashSet<String>();
if (!nonTldHosts.isEmpty()) {
final HashMap<String, List<LazyHostPlugin>> map = new HashMap<String, List<LazyHostPlugin>>();
pluginloop: for (final LazyHostPlugin lazyHostPlugin : hpc.list()) {
@ -452,12 +453,15 @@ public class AccountInfo extends Property implements AccountTrafficView {
LazyHostPlugin lazyPlugin = null;
if (list.size() == 1) {
final LazyHostPlugin lazyHostPlugin = list.get(0);
if (!lazyHostPlugin.isOfflinePlugin()) {
lazyPlugin = lazyHostPlugin;
if (lazyHostPlugin.isOfflinePlugin()) {
skippedOfflineEntries.add(host);
continue;
}
lazyPlugin = lazyHostPlugin;
} else if (list.size() > 1) {
for (final LazyHostPlugin lazyHostPlugin : list) {
if (lazyHostPlugin.isOfflinePlugin()) {
skippedOfflineEntries.add(host);
continue;
}
if (lazyPlugin == null) {
@ -511,7 +515,9 @@ public class AccountInfo extends Property implements AccountTrafficView {
}
plugins.add(lazyPlugin);
} else {
if (!lazyPlugin.isOfflinePlugin() && !lazyPlugin.isFallbackPlugin() && !assignedMultiHostPlugins.contains(lazyPlugin.getHost())) {
if (lazyPlugin.isOfflinePlugin()) {
skippedOfflineEntries.add(host);
} else if (!lazyPlugin.isFallbackPlugin() && !assignedMultiHostPlugins.contains(lazyPlugin.getHost())) {
try {
if (!lazyPlugin.isHasAllowHandle()) {
assignedMultiHostPlugins.add(lazyPlugin.getHost());
@ -574,11 +580,18 @@ public class AccountInfo extends Property implements AccountTrafficView {
}
/* Log items without result */
if (unassignedMultiHostSupport.size() > 0 && multiHostPlugin != null) {
logger.info("Found " + unassignedMultiHostSupport.size() + " unassigned entries");
for (final String host : unassignedMultiHostSupport) {
logger.info("Could not assign any host for: " + host);
}
}
if (assignedMultiHostPlugins.size() == 0) {
if (skippedOfflineEntries.size() > 0 && multiHostPlugin != null) {
logger.info("Found " + skippedOfflineEntries.size() + " offline entries");
for (final String host : skippedOfflineEntries) {
logger.info("Offline entry: " + host);
}
}
if (assignedMultiHostPlugins.size() == 0 && multiHostPlugin != null) {
logger.info("Failed to find ANY usable results");
this.removeProperty(propertyKey);
return null;
@ -602,7 +615,7 @@ public class AccountInfo extends Property implements AccountTrafficView {
}
continue;
} else {
List<LazyHostPlugin> best = new ArrayList<LazyHostPlugin>();
final List<LazyHostPlugin> best = new ArrayList<LazyHostPlugin>();
for (LazyHostPlugin plugin : plugins) {
try {
final PluginForHost plg = pluginFinder.getPlugin(plugin);
@ -634,22 +647,26 @@ public class AccountInfo extends Property implements AccountTrafficView {
/** Removes host from list of supported hosts. */
public boolean removeMultiHostSupport(final String host) {
final Object ret = getProperty("multiHostSupport", null);
if (ret != null && ret instanceof List) {
final List<String> list = (List<String>) ret;
if (list.contains(host)) {
if (list.size() > 1) {
final List<String> newList = new CopyOnWriteArrayList<String>(list);
if (newList.remove(host)) {
this.setProperty("multiHostSupport", newList);
return true;
}
} else {
this.setProperty("multiHostSupport", Property.NULL);
return true;
}
}
if (ret == null || !(ret instanceof List)) {
return false;
}
final List<String> list = (List<String>) ret;
if (!list.contains(host)) {
return false;
}
if (list.size() > 1) {
final List<String> newList = new CopyOnWriteArrayList<String>(list);
if (newList.remove(host)) {
this.setProperty("multiHostSupport", newList);
return true;
} else {
return false;
}
} else {
/* This was the only supported host -> Remove property */
this.setProperty("multiHostSupport", Property.NULL);
return true;
}
return false;
}
public List<String> getMultiHostSupport() {

1
src/jd/plugins/MultiHostHost.java
View File

@ -21,6 +21,7 @@ public class MultiHostHost {
OFFLINE;
}
private String name = null;
private String domain = null;
private ArrayList<String> domains = new ArrayList<String>();
private boolean isUnlimitedTraffic = true;