Dev

[ZayrexDev]

No description provided.

[Copilot]

Pull request overview

This PR refactors Pixiv artwork JSON handling by removing the stored “original JSON” blob from PixivArtwork, switching naming/full-result JSON output to re-serialize the PixivArtwork object, and expands the Pixiv CLI fetch subcommand to support additional modes and related-artwork traversal.

Changes:

• Removed origJson persistence from PixivArtwork and updated consumers to use JSONObject.from(artwork) instead.
• Updated Pixiv CLI subcommands to support saving/loading PixivArtwork lists and added richer fetch modes (user/ranking/search) including optional related-artwork expansion.
• Replaced several new URL(...) constructions with URI.create(...).toURL() and adjusted Pixiv download full-result JSON output.

Reviewed changes

Copilot reviewed 10 out of 10 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
src/main/java/xyz/zcraft/acgpicdownload/util/pixiv/PixivFetchUtil.java	Stops attaching raw JSON blobs to PixivArtwork instances during fetch/parse flows.
src/main/java/xyz/zcraft/acgpicdownload/util/pixiv/PixivArtwork.java	Makes several fields transient, adds isComplete(), and marks derived getters as non-serializable.
src/main/java/xyz/zcraft/acgpicdownload/util/pixiv/PixivAccount.java	Marks token transient to avoid serialization.
src/main/java/xyz/zcraft/acgpicdownload/util/pixiv/NamingRule.java	Switches naming argument source from origJson to JSONObject.from(artwork).
src/main/java/xyz/zcraft/acgpicdownload/util/dl/DownloadUtil.java	Uses URI.create(...).toURL() and serializes full-result JSON from PixivArtwork instead of origJson.
src/main/java/xyz/zcraft/acgpicdownload/Main.java	Uses getFirst()/removeFirst() for argument handling under Java 21.
src/main/java/xyz/zcraft/acgpicdownload/commands/pixiv/sub/Save.java	Saves List<PixivArtwork> directly to JSON instead of saving origJson objects.
src/main/java/xyz/zcraft/acgpicdownload/commands/pixiv/sub/Load.java	Loads PixivArtwork list from JSON and changes append behavior.
src/main/java/xyz/zcraft/acgpicdownload/commands/pixiv/sub/Fetch.java	Implements/expands Pixiv fetch modes and adds related-artwork expansion.
src/main/java/xyz/zcraft/acgpicdownload/commands/pixiv/sub/Complete.java	Switches incompleteness detection to !isComplete().

Comments suppressed due to low confidence (2)

src/main/java/xyz/zcraft/acgpicdownload/commands/pixiv/sub/Complete.java:74

• result and failedList are plain LinkedList instances that are mutated concurrently by multiple worker threads (result.add(...) and failedList.add(...)). This is not thread-safe and can corrupt the lists or throw exceptions. Use a thread-safe collection (e.g., ConcurrentLinkedQueue) or synchronize mutations / collect per-thread results and merge after the executor finishes.

        final List<PixivArtwork> result = new LinkedList<>();

        previous.stream().filter(p -> p.getLikeCount() != 0 || p.getBookmarkData() != null).forEach(result::add);
        final List<PixivArtwork> list = previous.stream().filter(a -> !a.isComplete()).toList();
        final List<PixivArtwork> failedList = new LinkedList<>();

        out.info("Got " + list.size() + " artworks to complete data.");

        AtomicInteger completed = new AtomicInteger();
        AtomicInteger failed = new AtomicInteger();

        try (ThreadPoolExecutor tpe = (ThreadPoolExecutor) Executors.newFixedThreadPool(threads)) {
            list.forEach(t -> tpe.execute(() -> {
                int tries = 1;
                while (tries <= retries) {
                    try {
                        result.add(PixivFetchUtil.getArtwork(t.getId(), profile.cookie(), profile.proxyHost(), profile.proxyPort()));
                        completed.getAndIncrement();
                        return;
                    } catch (IOException e) {
                        tries++;
                    }
                }

                failedList.add(t);
                failed.getAndIncrement();
            }));

src/main/java/xyz/zcraft/acgpicdownload/util/dl/DownloadUtil.java:88

• URI.create(r.getUrl()).toURL() can throw IllegalArgumentException (unchecked) and will not be caught by the current catch(IOException) retry path, so invalid URLs will fail without retries and may escape as runtime exceptions. Consider validating/wrapping URI.create failures into IOException so the existing retry and error reporting behaves consistently.

            URL url = URI.create(r.getUrl()).toURL();
            URLConnection c = url.openConnection();

            if (referer != null) {
                c.setRequestProperty("referer", referer);
            }

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.