Skip to content

Commit 889d209

Browse files
author
updating-bot
committed
mirroring bot - 2024/10/01
1 parent d4e6748 commit 889d209

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1260
-768
lines changed

‎svn_trunk/src/jd/controlling/downloadcontroller/DownloadController.java‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import jd.controlling.packagecontroller.AbstractNode;
4747
import jd.controlling.packagecontroller.AbstractPackageChildrenNodeFilter;
4848
import jd.controlling.packagecontroller.PackageController;
49-
import jd.controlling.packagecontroller.PackageControllerQueue.ReadOnlyQueueAction;
5049
import jd.parser.Regex;
5150
import jd.plugins.DownloadLink;
5251
import jd.plugins.DownloadLinkProperty;
@@ -603,15 +602,15 @@ private final void setFilePackage(FilePackage filePackage) {
603602

604603
private final ArrayList<IndexedDownloadLink> downloadLinks = new ArrayList<IndexedDownloadLink>();
605604
private final static Comparator<IndexedDownloadLink> COMPARATOR = new Comparator<IndexedDownloadLink>() {
606-
private final int compare(int x, int y) {
607-
return (x < y) ? -1 : ((x == y) ? 0 : 1);
608-
}
605+
private final int compare(int x, int y) {
606+
return (x < y) ? -1 : ((x == y) ? 0 : 1);
607+
}
609608

610-
@Override
611-
public int compare(IndexedDownloadLink o1, IndexedDownloadLink o2) {
612-
return compare(o1.getIndex(), o2.getIndex());
613-
}
614-
};
609+
@Override
610+
public int compare(IndexedDownloadLink o1, IndexedDownloadLink o2) {
611+
return compare(o1.getIndex(), o2.getIndex());
612+
}
613+
};
615614

616615
private FilePackage getLoadedPackage() {
617616
final FilePackage filePackage = this.filePackage;
@@ -1015,7 +1014,6 @@ public void removeListener(final DownloadControllerListener l) {
10151014
* @param file
10161015
*/
10171016
private boolean save(java.util.List<FilePackage> packages, File file) throws IOException {
1018-
final boolean isShuttingDown = ShutdownController.getInstance().isShuttingDown();
10191017
synchronized (SAVELOADLOCK) {
10201018
if (file == null) {
10211019
if (downloadLists.size() > 0) {
@@ -1145,12 +1143,6 @@ public void flush() throws IOException {
11451143
}
11461144
int childIndex = 0;
11471145
for (final DownloadLink link : pkg.getChildren()) {
1148-
if (!isShuttingDown) {
1149-
final QueueAction<?, ? extends Throwable> waiting = DownloadController.this.getQueue().peek();
1150-
if (waiting instanceof ReadOnlyQueueAction) {
1151-
DownloadController.this.getQueue().executeQueuedAction(waiting);
1152-
}
1153-
}
11541146
final DownloadLinkStorable linkStorable = new DownloadLinkStorable(link);
11551147
final String childEntryID = String.format(childFormat, childIndex++);
11561148
final ZipEntry linkEntry = new ZipEntry(packageEntryID + "_" + childEntryID);

‎svn_trunk/src/jd/controlling/linkcollector/LinkCollector.java‎

Lines changed: 56 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,45 @@
3737
import java.util.zip.ZipInputStream;
3838
import java.util.zip.ZipOutputStream;
3939

40+
import jd.config.Property;
41+
import jd.controlling.TaskQueue;
42+
import jd.controlling.downloadcontroller.DownloadController;
43+
import jd.controlling.downloadcontroller.DownloadSession;
44+
import jd.controlling.downloadcontroller.DownloadWatchDog;
45+
import jd.controlling.downloadcontroller.DownloadWatchDogJob;
46+
import jd.controlling.linkchecker.LinkChecker;
47+
import jd.controlling.linkchecker.LinkCheckerHandler;
48+
import jd.controlling.linkcollector.autostart.AutoStartManager;
49+
import jd.controlling.linkcrawler.CheckableLink;
50+
import jd.controlling.linkcrawler.CrawledLink;
51+
import jd.controlling.linkcrawler.CrawledLinkModifier;
52+
import jd.controlling.linkcrawler.CrawledLinkProperty;
53+
import jd.controlling.linkcrawler.CrawledPackage;
54+
import jd.controlling.linkcrawler.CrawledPackage.TYPE;
55+
import jd.controlling.linkcrawler.LinkCrawler;
56+
import jd.controlling.linkcrawler.LinkCrawlerDeepInspector;
57+
import jd.controlling.linkcrawler.LinkCrawlerFilter;
58+
import jd.controlling.linkcrawler.LinkCrawlerHandler;
59+
import jd.controlling.linkcrawler.LinkCrawlerRule;
60+
import jd.controlling.linkcrawler.LinkCrawlerRule.RULE;
61+
import jd.controlling.linkcrawler.PackageInfo;
62+
import jd.controlling.packagecontroller.AbstractNode;
63+
import jd.controlling.packagecontroller.AbstractPackageChildrenNodeFilter;
64+
import jd.controlling.packagecontroller.PackageController;
65+
import jd.controlling.packagecontroller.PackageControllerQueue.ReadOnlyQueueAction;
66+
import jd.gui.swing.jdgui.JDGui;
67+
import jd.gui.swing.jdgui.WarnLevel;
68+
import jd.http.Browser;
69+
import jd.http.URLConnectionAdapter;
70+
import jd.parser.Regex;
71+
import jd.plugins.CrawledLinkStorable;
72+
import jd.plugins.CrawledPackageStorable;
73+
import jd.plugins.DownloadLink;
74+
import jd.plugins.FilePackage;
75+
import jd.plugins.Plugin;
76+
import jd.plugins.PluginForHost;
77+
import jd.utils.JDUtilities;
78+
4079
import org.appwork.controlling.SingleReachableState;
4180
import org.appwork.exceptions.WTFException;
4281
import org.appwork.scheduler.DelayedRunnable;
@@ -53,6 +92,7 @@
5392
import org.appwork.storage.config.handler.KeyHandler;
5493
import org.appwork.uio.UIOManager;
5594
import org.appwork.utils.Application;
95+
import org.appwork.utils.DebugMode;
5696
import org.appwork.utils.Files;
5797
import org.appwork.utils.IO;
5898
import org.appwork.utils.JVMVersion;
@@ -112,44 +152,6 @@
112152
import org.jdownloader.settings.staticreferences.CFG_LINKGRABBER;
113153
import org.jdownloader.translate._JDT;
114154

115-
import jd.config.Property;
116-
import jd.controlling.TaskQueue;
117-
import jd.controlling.downloadcontroller.DownloadController;
118-
import jd.controlling.downloadcontroller.DownloadSession;
119-
import jd.controlling.downloadcontroller.DownloadWatchDog;
120-
import jd.controlling.downloadcontroller.DownloadWatchDogJob;
121-
import jd.controlling.linkchecker.LinkChecker;
122-
import jd.controlling.linkchecker.LinkCheckerHandler;
123-
import jd.controlling.linkcollector.autostart.AutoStartManager;
124-
import jd.controlling.linkcrawler.CheckableLink;
125-
import jd.controlling.linkcrawler.CrawledLink;
126-
import jd.controlling.linkcrawler.CrawledLinkModifier;
127-
import jd.controlling.linkcrawler.CrawledLinkProperty;
128-
import jd.controlling.linkcrawler.CrawledPackage;
129-
import jd.controlling.linkcrawler.CrawledPackage.TYPE;
130-
import jd.controlling.linkcrawler.LinkCrawler;
131-
import jd.controlling.linkcrawler.LinkCrawlerDeepInspector;
132-
import jd.controlling.linkcrawler.LinkCrawlerFilter;
133-
import jd.controlling.linkcrawler.LinkCrawlerHandler;
134-
import jd.controlling.linkcrawler.LinkCrawlerRule;
135-
import jd.controlling.linkcrawler.LinkCrawlerRule.RULE;
136-
import jd.controlling.linkcrawler.PackageInfo;
137-
import jd.controlling.packagecontroller.AbstractNode;
138-
import jd.controlling.packagecontroller.AbstractPackageChildrenNodeFilter;
139-
import jd.controlling.packagecontroller.PackageController;
140-
import jd.gui.swing.jdgui.JDGui;
141-
import jd.gui.swing.jdgui.WarnLevel;
142-
import jd.http.Browser;
143-
import jd.http.URLConnectionAdapter;
144-
import jd.parser.Regex;
145-
import jd.plugins.CrawledLinkStorable;
146-
import jd.plugins.CrawledPackageStorable;
147-
import jd.plugins.DownloadLink;
148-
import jd.plugins.FilePackage;
149-
import jd.plugins.Plugin;
150-
import jd.plugins.PluginForHost;
151-
import jd.utils.JDUtilities;
152-
153155
public class LinkCollector extends PackageController<CrawledPackage, CrawledLink> implements LinkCheckerHandler<CrawledLink>, LinkCrawlerHandler, ShutdownVetoListener {
154156
public static final String SOURCE_VARIANT_ID = "SOURCE_VARIANT_ID";
155157
private final WeakHashMap<JobLinkCrawler, Object> jobLinkCrawlers = new WeakHashMap<JobLinkCrawler, Object>();
@@ -528,7 +530,7 @@ public String toString() {
528530
});
529531
final LinkCollectorConfig cfg = JsonConfig.create(LinkCollectorConfig.class);
530532
this.isDupeManagerEnabled = cfg.isDupeManagerEnabled();
531-
final long minimumDelay = Math.max(5000, cfg.getMinimumSaveDelay());
533+
final long minimumDelay = Math.max(DebugMode.TRUE_IN_IDE_ELSE_FALSE ? 1 : 5000, cfg.getMinimumSaveDelay());
532534
long maximumDelay = cfg.getMaximumSaveDelay();
533535
if (maximumDelay <= 0) {
534536
maximumDelay = -1;
@@ -1465,9 +1467,9 @@ protected Void run() throws RuntimeException {
14651467

14661468
/*
14671469
* converts a CrawledPackage into a FilePackage
1468-
*
1470+
*
14691471
* if plinks is not set, then the original children of the CrawledPackage will get added to the FilePackage
1470-
*
1472+
*
14711473
* if plinks is set, then only plinks will get added to the FilePackage
14721474
*/
14731475
private FilePackage createFilePackage(final CrawledPackage pkg, List<CrawledLink> plinks) {
@@ -2365,9 +2367,10 @@ public synchronized byte[] toByteArray() {
23652367
* @param file
23662368
*/
23672369
private void save(final List<CrawledPackage> packages, final File destFile) {
2368-
QUEUE.add(new QueueAction<Void, RuntimeException>(Queue.QueuePriority.HIGH) {
2370+
QUEUE.add(new ReadOnlyQueueAction<Void, RuntimeException>(Queue.QueuePriority.HIGH) {
23692371
@Override
23702372
protected Void run() throws RuntimeException {
2373+
final boolean isShuttingDown = ShutdownController.getInstance().isShuttingDown();
23712374
File file = destFile;
23722375
if (file == null) {
23732376
if (linkcollectorLists.size() > 0) {
@@ -2494,6 +2497,12 @@ public void flush() throws IOException {
24942497
}
24952498
int childIndex = 0;
24962499
for (final CrawledLink link : pkg.getChildren()) {
2500+
if (!isShuttingDown && DebugMode.TRUE_IN_IDE_ELSE_FALSE) {
2501+
final QueueAction<?, ? extends Throwable> waiting = LinkCollector.this.getQueue().peek();
2502+
if (waiting instanceof ReadOnlyQueueAction) {
2503+
LinkCollector.this.getQueue().executeQueuedAction(waiting);
2504+
}
2505+
}
24972506
final CrawledLinkStorable linkStorable = new CrawledLinkStorable(link);
24982507
CrawledPackageMappingID id = null;
24992508
switch (pkg.getType()) {
@@ -2692,11 +2701,10 @@ public static enum MoveLinksMode {
26922701
}
26932702

26942703
/**
2695-
* This class describes, how a "move links to downloadlist" action shall behave. </br>
2696-
* Examples of what it can influence: </br>
2697-
* - define specific properties that should be set on the items to move e.g. set highest priority </br>
2698-
* - define what should happen afterwards such as "force download-start of added items" </br>
2699-
* - define what happens in linkgrabber afterwards such as "clean all remaining items in linkgrabber"
2704+
* This class describes, how a "move links to downloadlist" action shall behave. </br> Examples of what it can influence: </br> - define
2705+
* specific properties that should be set on the items to move e.g. set highest priority </br> - define what should happen afterwards
2706+
* such as "force download-start of added items" </br> - define what happens in linkgrabber afterwards such as
2707+
* "clean all remaining items in linkgrabber"
27002708
*/
27012709
public final static class ConfirmLinksSettings {
27022710
public final MoveLinksMode getMoveLinksMode() {
@@ -3407,7 +3415,7 @@ private CrawledLink putCrawledLinkByLinkID(final String linkID, final CrawledLin
34073415
}
34083416

34093417
public boolean containsLinkId(final String linkID) {
3410-
return linkID != null && Boolean.TRUE.equals(getQueue().addWait(new QueueAction<Boolean, RuntimeException>() {
3418+
return linkID != null && Boolean.TRUE.equals(getQueue().addWait(new ReadOnlyQueueAction<Boolean, RuntimeException>() {
34113419
@Override
34123420
protected Boolean run() throws RuntimeException {
34133421
return getCrawledLinkByLinkID(linkID) != null;

‎svn_trunk/src/jd/controlling/linkcrawler/LinkCrawlerConfig.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ public interface LinkCrawlerConfig extends ConfigInterface {
4949

5050
void setDeepDecryptFileSizeLimit(int l);
5151

52-
@DefaultStringArrayValue({ "CAPTCHA", "EMPTY_FOLDER", "EMPTY_PROFILE", "FILE_NOT_FOUND", "NO_ACCOUNT", "PLUGIN_DEFECT", "PLUGIN_SETTINGS", "PASSWORD", "GEO", "IP", "HOST_RATE_LIMIT", "UNSUPPORTED_LIVESTREAM", "BLOCKED_BY" })
52+
@DefaultStringArrayValue({ "CAPTCHA", "EMPTY_FOLDER", "EMPTY_PROFILE", "FILE_NOT_FOUND", "HOST", "NO_ACCOUNT", "PLUGIN_DEFECT", "PLUGIN_SETTINGS", "PASSWORD", "GEO", "IP", "HOST_RATE_LIMIT", "UNSUPPORTED_LIVESTREAM", "BLOCKED_BY" })
5353
@AboutConfig
5454
@DescriptionForConfigEntry("Add a retry task for following crawling errors")
55-
String[] getAddRetryCrawlerTasks2();
55+
String[] getAddRetryCrawlerTasks3();
5656

57-
public void setAddRetryCrawlerTasks2(String[] origins);
57+
public void setAddRetryCrawlerTasks3(String[] origins);
5858

5959
@DefaultBooleanValue(true)
6060
@AboutConfig

‎svn_trunk/src/jd/plugins/FilePackageView.java‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,21 @@
55
import java.util.Collections;
66
import java.util.Comparator;
77
import java.util.HashMap;
8+
import java.util.HashSet;
89
import java.util.Locale;
910
import java.util.Map;
11+
import java.util.Set;
1012
import java.util.WeakHashMap;
1113
import java.util.concurrent.atomic.AtomicLong;
1214

1315
import javax.swing.Icon;
1416

17+
import jd.controlling.downloadcontroller.DownloadWatchDog;
18+
import jd.controlling.downloadcontroller.SingleDownloadController;
19+
import jd.controlling.packagecontroller.ChildrenView;
20+
import jd.plugins.DownloadLink.AvailableStatus;
21+
import jd.plugins.download.DownloadInterface;
22+
1523
import org.appwork.storage.config.JsonConfig;
1624
import org.appwork.utils.StringUtils;
1725
import org.appwork.utils.Time;
@@ -33,12 +41,6 @@
3341
import org.jdownloader.settings.GeneralSettings;
3442
import org.jdownloader.settings.GraphicalUserInterfaceSettings;
3543

36-
import jd.controlling.downloadcontroller.DownloadWatchDog;
37-
import jd.controlling.downloadcontroller.SingleDownloadController;
38-
import jd.controlling.packagecontroller.ChildrenView;
39-
import jd.plugins.DownloadLink.AvailableStatus;
40-
import jd.plugins.download.DownloadInterface;
41-
4244
public class FilePackageView extends ChildrenView<FilePackage, DownloadLink> {
4345
private static class LinkInfo {
4446
private long bytesTotal = -1;
@@ -89,10 +91,12 @@ public int getFinalCount() {
8991
return finalCount;
9092
}
9193

92-
private long done = 0;
94+
private long done = 0;
9395
private int enabledCount;
9496
private PluginStateCollection pluginStates;
9597

98+
private PluginProgress singlePluginProgress = null;
99+
96100
public PluginStateCollection getPluginStates() {
97101
return pluginStates;
98102
}
@@ -181,6 +185,7 @@ private class Temp {
181185
private boolean allFinished = true;
182186
private String sameSource = null;
183187
private boolean sameSourceFullUrl = true;
188+
private Set<PluginProgress> pluginProgress = null;
184189
private final HashMap<Object, PluginState<?>> pluginStates = new HashMap<Object, PluginState<?>>();
185190
}
186191

@@ -221,11 +226,11 @@ protected ExtractionPluginState(String message, Icon icon2) {
221226
private final static AbstractIcon EXTRACTICONSTART = new AbstractIcon(IconKey.ICON_EXTRACT_RUN, 16);
222227
private final static AbstractIcon FALSEICON = new AbstractIcon(IconKey.ICON_FALSE, 16);
223228
public final static Comparator<DomainInfo> DOMAININFOCOMPARATOR = new Comparator<DomainInfo>() {
224-
@Override
225-
public int compare(DomainInfo o1, DomainInfo o2) {
226-
return o1.getTld().compareTo(o2.getTld());
227-
}
228-
};
229+
@Override
230+
public int compare(DomainInfo o1, DomainInfo o2) {
231+
return o1.getTld().compareTo(o2.getTld());
232+
}
233+
};
229234

230235
protected void writeTempToFields(final Temp tmp) {
231236
long size = -1;
@@ -306,6 +311,11 @@ protected void writeTempToFields(final Temp tmp) {
306311
if (!tmp.sameSourceFullUrl) {
307312
tmp.sameSource += "[...]";
308313
}
314+
if (tmp.pluginProgress != null && tmp.pluginProgress.size() == 1) {
315+
this.singlePluginProgress = tmp.pluginProgress.iterator().next();
316+
} else {
317+
this.singlePluginProgress = null;
318+
}
309319
this.commonSourceUrl = tmp.sameSource;
310320
this.pluginStates = new PluginStateCollection(tmp.pluginStates.values());
311321
this.offline = tmp.newOffline;
@@ -384,6 +394,10 @@ protected void addLinkToTemp(Temp tmp, final DownloadLink link) {
384394
PluginState<?> ps = null;
385395
final PluginProgress prog = link.getPluginProgress();
386396
if (prog != null) {
397+
if (tmp.pluginProgress == null) {
398+
tmp.pluginProgress = new HashSet<PluginProgress>();
399+
}
400+
tmp.pluginProgress.add(prog);
387401
if (!(prog instanceof ExtractionProgress)) {
388402
final Icon icon = prog.getIcon(this);
389403
if (icon != null) {
@@ -865,6 +879,10 @@ public String getDownloadDirectory() {
865879
return pkg.getDownloadDirectory();
866880
}
867881

882+
public PluginProgress getSinglePluginProgress() {
883+
return singlePluginProgress;
884+
}
885+
868886
public boolean isRunning() {
869887
return lastRunningState;
870888
}

‎svn_trunk/src/jd/plugins/MultiHostHost.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public MultiHostHost() {
4747

4848
public MultiHostHost(final String domain) {
4949
this.name = domain;
50-
this.addDomain(domain);
50+
this.setDomain(domain);
5151
}
5252

5353
public String getName() {

0 commit comments

Comments
 (0)