Ensure files are closed and outputs cleaned up when remapping.

dev/0.11
modmuss50 2021-07-21 23:21:47 +01:00
parent e6793b5ed7
commit 606046e719
2 changed files with 70 additions and 12 deletions

View File

@ -25,6 +25,7 @@
package net.fabricmc.loom.build; package net.fabricmc.loom.build;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -37,6 +38,7 @@ import java.util.function.BiFunction;
import org.gradle.api.Action; import org.gradle.api.Action;
import org.objectweb.asm.commons.Remapper; import org.objectweb.asm.commons.Remapper;
import net.fabricmc.loom.util.CloseableList;
import net.fabricmc.stitch.util.Pair; import net.fabricmc.stitch.util.Pair;
import net.fabricmc.tinyremapper.IMappingProvider; import net.fabricmc.tinyremapper.IMappingProvider;
import net.fabricmc.tinyremapper.InputTag; import net.fabricmc.tinyremapper.InputTag;
@ -89,8 +91,8 @@ public class JarRemapper {
remapper.readInputsAsync(tag, data.input); remapper.readInputsAsync(tag, data.input);
} }
List<OutputConsumerPath> outputConsumers = new ArrayList<>(); //noinspection MismatchedQueryAndUpdateOfCollection
try (CloseableList<OutputConsumerPath> outputConsumers = new CloseableList<>()) {
for (RemapData data : remapData) { for (RemapData data : remapData) {
OutputConsumerPath outputConsumer = new OutputConsumerPath.Builder(data.output).build(); OutputConsumerPath outputConsumer = new OutputConsumerPath.Builder(data.output).build();
outputConsumers.add(outputConsumer); outputConsumers.add(outputConsumer);
@ -102,9 +104,13 @@ public class JarRemapper {
} }
remapper.finish(); remapper.finish();
} catch (Exception e) {
for (RemapData data : remapData) {
// Cleanup bad outputs
Files.deleteIfExists(data.output);
}
for (OutputConsumerPath outputConsumer : outputConsumers) { throw new IOException("Failed to remap %s files".formatted(remapData.size()), e);
outputConsumer.close();
} }
remapData.forEach(RemapData::complete); remapData.forEach(RemapData::complete);

View File

@ -0,0 +1,52 @@
/*
* This file is part of fabric-loom, licensed under the MIT License (MIT).
*
* Copyright (c) 2021 FabricMC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package net.fabricmc.loom.util;
import java.io.Closeable;
import java.io.IOException;
import java.util.ArrayList;
public class CloseableList<T extends Closeable> extends ArrayList<T> implements Closeable {
@Override
public void close() throws IOException {
IOException exception = null;
for (T t : this) {
try {
t.close();
} catch (IOException e) {
if (exception == null) {
exception = new IOException("Failed to close list");
}
exception.addSuppressed(e);
}
}
if (exception != null) {
throw exception;
}
}
}