mirror of
https://github.com/mitb-archive/filebot
synced 2024-08-13 17:03:45 -04:00
+ option for how to handle existing files: --conflict override|skip|fail
This commit is contained in:
parent
d3ca067083
commit
f978e7b961
@ -34,6 +34,9 @@ public class ArgumentBean {
|
|||||||
@Option(name = "--action", usage = "Rename action", metaVar = "[move, copy, keeplink, symlink, hardlink, test]")
|
@Option(name = "--action", usage = "Rename action", metaVar = "[move, copy, keeplink, symlink, hardlink, test]")
|
||||||
public String action = "move";
|
public String action = "move";
|
||||||
|
|
||||||
|
@Option(name = "--conflict", usage = "Conflict resolution", metaVar = "[override, skip, fail]")
|
||||||
|
public String conflict = "skip";
|
||||||
|
|
||||||
@Option(name = "--format", usage = "Episode naming scheme", metaVar = "expression")
|
@Option(name = "--format", usage = "Episode naming scheme", metaVar = "expression")
|
||||||
public String format;
|
public String format;
|
||||||
|
|
||||||
|
@ -73,7 +73,7 @@ public class ArgumentProcessor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (args.rename) {
|
if (args.rename) {
|
||||||
cli.rename(files, args.action, args.output, args.format, args.db, args.query, args.order, args.lang, !args.nonStrict);
|
cli.rename(files, args.action, args.conflict, args.output, args.format, args.db, args.query, args.order, args.lang, !args.nonStrict);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (args.check) {
|
if (args.check) {
|
||||||
|
@ -9,7 +9,7 @@ import java.util.List;
|
|||||||
|
|
||||||
public interface CmdlineInterface {
|
public interface CmdlineInterface {
|
||||||
|
|
||||||
List<File> rename(Collection<File> files, String action, String output, String format, String db, String query, String sortOrder, String lang, boolean strict) throws Exception;
|
List<File> rename(Collection<File> files, String action, String conflict, String output, String format, String db, String query, String sortOrder, String lang, boolean strict) throws Exception;
|
||||||
|
|
||||||
|
|
||||||
List<File> getSubtitles(Collection<File> files, String query, String lang, String output, String encoding, boolean strict) throws Exception;
|
List<File> getSubtitles(Collection<File> files, String query, String lang, String output, String encoding, boolean strict) throws Exception;
|
||||||
|
@ -22,7 +22,6 @@ import java.util.ArrayList;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
import java.util.LinkedHashSet;
|
import java.util.LinkedHashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@ -80,11 +79,12 @@ import net.sourceforge.tuned.FileUtilities.FolderFilter;
|
|||||||
public class CmdlineOperations implements CmdlineInterface {
|
public class CmdlineOperations implements CmdlineInterface {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<File> rename(Collection<File> files, String action, String output, String expression, String db, String query, String sortOrder, String lang, boolean strict) throws Exception {
|
public List<File> rename(Collection<File> files, String action, String conflict, String output, String expression, String db, String query, String sortOrder, String lang, boolean strict) throws Exception {
|
||||||
ExpressionFormat format = (expression != null) ? new ExpressionFormat(expression) : null;
|
ExpressionFormat format = (expression != null) ? new ExpressionFormat(expression) : null;
|
||||||
File outputDir = (output != null && output.length() > 0) ? new File(output) : null;
|
File outputDir = (output != null && output.length() > 0) ? new File(output) : null;
|
||||||
Locale locale = getLanguage(lang).toLocale();
|
Locale locale = getLanguage(lang).toLocale();
|
||||||
RenameAction renameAction = StandardRenameAction.forName(action);
|
RenameAction renameAction = StandardRenameAction.forName(action);
|
||||||
|
ConflictAction conflictAction = ConflictAction.forName(conflict);
|
||||||
|
|
||||||
List<File> mediaFiles = filter(files, VIDEO_FILES, SUBTITLE_FILES);
|
List<File> mediaFiles = filter(files, VIDEO_FILES, SUBTITLE_FILES);
|
||||||
if (mediaFiles.isEmpty()) {
|
if (mediaFiles.isEmpty()) {
|
||||||
@ -93,12 +93,12 @@ public class CmdlineOperations implements CmdlineInterface {
|
|||||||
|
|
||||||
if (getEpisodeListProvider(db) != null) {
|
if (getEpisodeListProvider(db) != null) {
|
||||||
// tv series mode
|
// tv series mode
|
||||||
return renameSeries(files, renameAction, outputDir, format, getEpisodeListProvider(db), query, SortOrder.forName(sortOrder), locale, strict);
|
return renameSeries(files, renameAction, conflictAction, outputDir, format, getEpisodeListProvider(db), query, SortOrder.forName(sortOrder), locale, strict);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getMovieIdentificationService(db) != null) {
|
if (getMovieIdentificationService(db) != null) {
|
||||||
// movie mode
|
// movie mode
|
||||||
return renameMovie(files, renameAction, outputDir, format, getMovieIdentificationService(db), query, locale, strict);
|
return renameMovie(files, renameAction, conflictAction, outputDir, format, getMovieIdentificationService(db), query, locale, strict);
|
||||||
}
|
}
|
||||||
|
|
||||||
// auto-determine mode
|
// auto-determine mode
|
||||||
@ -129,14 +129,15 @@ public class CmdlineOperations implements CmdlineInterface {
|
|||||||
|
|
||||||
CLILogger.finest(format("Filename pattern: [%.02f] SxE, [%.02f] CWS", sxe / max, cws / max));
|
CLILogger.finest(format("Filename pattern: [%.02f] SxE, [%.02f] CWS", sxe / max, cws / max));
|
||||||
if (sxe >= (max * 0.65) || cws >= (max * 0.65)) {
|
if (sxe >= (max * 0.65) || cws >= (max * 0.65)) {
|
||||||
return renameSeries(files, renameAction, outputDir, format, getEpisodeListProviders()[0], query, SortOrder.forName(sortOrder), locale, strict); // use default episode db
|
return renameSeries(files, renameAction, conflictAction, outputDir, format, WebServices.TVRage, query, SortOrder.forName(sortOrder), locale, strict); // use default episode db
|
||||||
} else {
|
} else {
|
||||||
return renameMovie(files, renameAction, outputDir, format, getMovieIdentificationServices()[0], query, locale, strict); // use default movie db
|
return renameMovie(files, renameAction, conflictAction, outputDir, format, WebServices.OpenSubtitles, query, locale, strict); // use default movie db
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public List<File> renameSeries(Collection<File> files, RenameAction renameAction, File outputDir, ExpressionFormat format, EpisodeListProvider db, String query, SortOrder sortOrder, Locale locale, boolean strict) throws Exception {
|
public List<File> renameSeries(Collection<File> files, RenameAction renameAction, ConflictAction conflictAction, File outputDir, ExpressionFormat format, EpisodeListProvider db, String query, SortOrder sortOrder, Locale locale,
|
||||||
|
boolean strict) throws Exception {
|
||||||
CLILogger.config(format("Rename episodes using [%s]", db.getName()));
|
CLILogger.config(format("Rename episodes using [%s]", db.getName()));
|
||||||
List<File> mediaFiles = filter(files, VIDEO_FILES, SUBTITLE_FILES);
|
List<File> mediaFiles = filter(files, VIDEO_FILES, SUBTITLE_FILES);
|
||||||
|
|
||||||
@ -199,7 +200,7 @@ public class CmdlineOperations implements CmdlineInterface {
|
|||||||
|
|
||||||
// rename episodes
|
// rename episodes
|
||||||
Analytics.trackEvent("CLI", "Rename", "Episode", renameMap.size());
|
Analytics.trackEvent("CLI", "Rename", "Episode", renameMap.size());
|
||||||
return renameAll(renameMap, renameAction);
|
return renameAll(renameMap, renameAction, conflictAction);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -272,7 +273,8 @@ public class CmdlineOperations implements CmdlineInterface {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public List<File> renameMovie(Collection<File> files, RenameAction renameAction, File outputDir, ExpressionFormat format, MovieIdentificationService service, String query, Locale locale, boolean strict) throws Exception {
|
public List<File> renameMovie(Collection<File> files, RenameAction renameAction, ConflictAction conflictAction, File outputDir, ExpressionFormat format, MovieIdentificationService service, String query, Locale locale, boolean strict)
|
||||||
|
throws Exception {
|
||||||
CLILogger.config(format("Rename movies using [%s]", service.getName()));
|
CLILogger.config(format("Rename movies using [%s]", service.getName()));
|
||||||
|
|
||||||
// handle movie files
|
// handle movie files
|
||||||
@ -422,45 +424,48 @@ public class CmdlineOperations implements CmdlineInterface {
|
|||||||
|
|
||||||
// rename movies
|
// rename movies
|
||||||
Analytics.trackEvent("CLI", "Rename", "Movie", renameMap.size());
|
Analytics.trackEvent("CLI", "Rename", "Movie", renameMap.size());
|
||||||
return renameAll(renameMap, renameAction);
|
return renameAll(renameMap, renameAction, conflictAction);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public List<File> renameAll(Map<File, File> renameMap, RenameAction renameAction) throws Exception {
|
public List<File> renameAll(Map<File, File> renameMap, RenameAction renameAction, ConflictAction conflictAction) throws Exception {
|
||||||
// perform some sanity checks
|
|
||||||
Set<File> destinationSet = new HashSet<File>();
|
|
||||||
|
|
||||||
for (Entry<File, File> mapping : renameMap.entrySet()) {
|
|
||||||
File source = mapping.getKey();
|
|
||||||
File destination = mapping.getValue();
|
|
||||||
|
|
||||||
// resolve destination
|
|
||||||
if (!destination.isAbsolute()) {
|
|
||||||
// same folder, different name
|
|
||||||
destination = new File(source.getParentFile(), destination.getPath());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (destinationSet.contains(destination))
|
|
||||||
throw new IllegalArgumentException("Conflict detected: " + mapping.getValue());
|
|
||||||
|
|
||||||
if (destination.exists() && !source.equals(destination))
|
|
||||||
throw new IllegalArgumentException("File already exists: " + mapping.getValue());
|
|
||||||
|
|
||||||
destinationSet.add(destination);
|
|
||||||
}
|
|
||||||
|
|
||||||
// rename files
|
// rename files
|
||||||
final List<Entry<File, File>> renameLog = new ArrayList<Entry<File, File>>();
|
final List<Entry<File, File>> renameLog = new ArrayList<Entry<File, File>>();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
for (Entry<File, File> it : renameMap.entrySet()) {
|
for (Entry<File, File> it : renameMap.entrySet()) {
|
||||||
try {
|
try {
|
||||||
|
File source = it.getKey();
|
||||||
|
File destination = it.getValue();
|
||||||
|
|
||||||
|
// resolve destination
|
||||||
|
if (!destination.isAbsolute()) {
|
||||||
|
// same folder, different name
|
||||||
|
destination = new File(source.getParentFile(), destination.getPath());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!destination.equals(source) && destination.exists()) {
|
||||||
|
if (conflictAction == ConflictAction.FAIL) {
|
||||||
|
throw new Exception("File already exists: " + destination);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (conflictAction == ConflictAction.OVERRIDE) {
|
||||||
|
if (!destination.delete()) {
|
||||||
|
throw new Exception("Failed to override file: " + destination);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// rename file, throw exception on failure
|
// rename file, throw exception on failure
|
||||||
File destination = renameAction.rename(it.getKey(), it.getValue());
|
if (!destination.equals(source) && !destination.exists()) {
|
||||||
CLILogger.info(format("[%s] Renamed [%s] to [%s]", renameAction, it.getKey(), it.getValue()));
|
destination = renameAction.rename(source, destination);
|
||||||
|
CLILogger.info(format("[%s] Renamed [%s] to [%s]", renameAction, it.getKey(), it.getValue()));
|
||||||
|
} else {
|
||||||
|
CLILogger.info(format("Skipped [%s] because [%s] already exists", source, destination));
|
||||||
|
}
|
||||||
|
|
||||||
// remember successfully renamed matches for history entry and possible revert
|
// remember successfully renamed matches for history entry and possible revert
|
||||||
renameLog.add(new SimpleImmutableEntry<File, File>(it.getKey(), destination));
|
renameLog.add(new SimpleImmutableEntry<File, File>(source, destination));
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
CLILogger.warning(format("[%s] Failed to rename [%s]", renameAction, it.getKey()));
|
CLILogger.warning(format("[%s] Failed to rename [%s]", renameAction, it.getKey()));
|
||||||
throw e;
|
throw e;
|
||||||
|
20
source/net/sourceforge/filebot/cli/ConflictAction.java
Normal file
20
source/net/sourceforge/filebot/cli/ConflictAction.java
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
|
||||||
|
package net.sourceforge.filebot.cli;
|
||||||
|
|
||||||
|
|
||||||
|
public enum ConflictAction {
|
||||||
|
|
||||||
|
OVERRIDE,
|
||||||
|
SKIP,
|
||||||
|
FAIL;
|
||||||
|
|
||||||
|
public static ConflictAction forName(String action) {
|
||||||
|
for (ConflictAction it : values()) {
|
||||||
|
if (it.name().equalsIgnoreCase(action))
|
||||||
|
return it;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new IllegalArgumentException("Illegal conflict action: " + action);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -187,7 +187,7 @@ List.metaClass.sortBySimilarity = { prime, Closure toStringFunction = { obj -> o
|
|||||||
// CLI bindings
|
// CLI bindings
|
||||||
def rename(args) { args = _defaults(args)
|
def rename(args) { args = _defaults(args)
|
||||||
synchronized (_cli) {
|
synchronized (_cli) {
|
||||||
_guarded { _cli.rename(_files(args), args.action, args.output, args.format, args.db, args.query, args.order, args.lang, args.strict) }
|
_guarded { _cli.rename(_files(args), args.action, args.conflict, args.output, args.format, args.db, args.query, args.order, args.lang, args.strict) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -252,6 +252,7 @@ def _files(args) {
|
|||||||
*/
|
*/
|
||||||
def _defaults(args) {
|
def _defaults(args) {
|
||||||
args.action = args.action ?: _args.action
|
args.action = args.action ?: _args.action
|
||||||
|
args.conflict = args.conflict ?: _args.conflict
|
||||||
args.query = args.query ?: _args.query
|
args.query = args.query ?: _args.query
|
||||||
args.format = args.format ?: _args.format
|
args.format = args.format ?: _args.format
|
||||||
args.db = args.db ?: _args.db
|
args.db = args.db ?: _args.db
|
||||||
|
Loading…
Reference in New Issue
Block a user