Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,5 @@ build/
/accounts.json
/log/
/.idea/
/src/test/
/debug.cookie
414 changes: 414 additions & 0 deletions .idea/dbnavigator.xml

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
opens xyz.zcraft.acgpicdownload.util.source to com.alibaba.fastjson2;
opens xyz.zcraft.acgpicdownload.util.pixiv to javafx.base, javafx.controls, javafx.graphics, javafx.fxml, com.alibaba.fastjson2;
opens xyz.zcraft.acgpicdownload.util.source.argument to javafx.base, javafx.controls, javafx.graphics, javafx.fxml, com.alibaba.fastjson2;

exports xyz.zcraft.acgpicdownload;
exports xyz.zcraft.acgpicdownload.exceptions;
exports xyz.zcraft.acgpicdownload.gui;
Expand Down
11 changes: 2 additions & 9 deletions src/main/java/xyz/zcraft/acgpicdownload/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import lombok.Getter;
import xyz.zcraft.acgpicdownload.commands.Fetch;
import xyz.zcraft.acgpicdownload.commands.Schedule;
import xyz.zcraft.acgpicdownload.commands.pixiv.Pixiv;
import xyz.zcraft.acgpicdownload.gui.GUI;
import xyz.zcraft.acgpicdownload.util.Logger;
Expand Down Expand Up @@ -74,16 +73,10 @@ public static void main(String[] args) {
argList.remove(0);
Fetch f = new Fetch();
f.enableConsoleProgressBar = true;
f.main(argList, new Logger("Fetch", System.out));
} else if (argList.get(0).equalsIgnoreCase("schedule")) {
err.println("Command schedule will be deprecated soon. See project on GitHub for more information.");
argList.remove(0);
Schedule s = new Schedule();
s.main(argList);
f.invoke(argList, new Logger("Fetch", System.out));
} else if (argList.get(0).equalsIgnoreCase("pixiv")) {
argList.remove(0);
Pixiv p = new Pixiv();
p.revoke(argList, new Logger("Pixiv", System.out));
p.invoke(argList, new Logger("Pixiv", System.out));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ private Source parseSource() {
return s;
}

public void main(ArrayList<String> args, Logger logger) {
public void invoke(ArrayList<String> args, Logger logger) {
this.logger = logger;

if (!parseArguments(args)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@

import static xyz.zcraft.acgpicdownload.util.source.SourceManager.isEmpty;

@Deprecated
public class Schedule {
private final ArrayList<Event> events = new ArrayList<>();
Logger l;

public void main(ArrayList<String> args) {
public void invoke(ArrayList<String> args) {
if (!parseEvent(args)) {
return;
}
Expand Down Expand Up @@ -91,7 +92,7 @@ public void main(ArrayList<String> args) {
public void run() {
Fetch f = new Fetch();
Logger t = new Logger(String.valueOf(this.hashCode()), logger, System.out);
f.main(e.getCommands(), t);
f.invoke(e.getCommands(), t);
t.info("[Event End]");
}
});
Expand Down
Loading