Skip to content

Commit 8fbd8c8

Browse files
committed
Fix pattern with relative path, fix wrong error message
1 parent 7fad794 commit 8fbd8c8

File tree

3 files changed

+19
-8
lines changed

3 files changed

+19
-8
lines changed

autotag.Core/FileWriter.cs

+16-5
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public static bool write(string filePath, FileMetadata metadata, Action<string>
4949
// overwrite default file name - allows software such as Icaros to display cover art thumbnails - default isn't compliant with Matroska guidelines
5050
file.Tag.Pictures = new TagLib.Picture[] { new TagLib.Picture(downloadFile) { Filename = "cover.jpg" } };
5151
}
52-
} else if (String.IsNullOrEmpty(metadata.CoverFilename)) {
52+
} else if (String.IsNullOrEmpty(metadata.CoverFilename) && config.addCoverArt == true) {
5353
fileSuccess = false;
5454
}
5555

@@ -74,19 +74,30 @@ public static bool write(string filePath, FileMetadata metadata, Action<string>
7474
if (config.mode == 0) {
7575
newPath = Path.Combine(
7676
Path.GetDirectoryName(filePath),
77-
EscapeFilename(String.Format(GetTVRenamePattern(config), metadata.SeriesName, metadata.Season, metadata.Episode.ToString("00"), metadata.Title) + Path.GetExtension(filePath))
78-
);
77+
EscapeFilename(String.Format(
78+
GetTVRenamePattern(config),
79+
metadata.SeriesName,
80+
metadata.Season,
81+
metadata.Episode.ToString("00"),
82+
metadata.Title) + Path.GetExtension(filePath)
83+
)
84+
);
7985
} else {
8086
newPath = Path.Combine(
8187
Path.GetDirectoryName(filePath),
82-
EscapeFilename(String.Format(GetMovieRenamePattern(config), metadata.Title, metadata.Date.Year)) + Path.GetExtension(filePath));
88+
EscapeFilename(String.Format(
89+
GetMovieRenamePattern(config),
90+
metadata.Title,
91+
metadata.Date.Year) + Path.GetExtension(filePath)
92+
)
93+
);
8394
}
8495

8596
if (filePath != newPath) {
8697
try {
8798
File.Move(filePath, newPath);
8899
setPath(newPath);
89-
setStatus($"Successfully renamed file to '{newPath}'", false);
100+
setStatus($"Successfully renamed file to '{Path.GetFileName(newPath)}'", false);
90101
} catch (Exception ex) {
91102
if (config.verbose) {
92103
setStatus($"Error: Failed to rename file - {ex.Message}", true);

autotag.Core/TVProcessor.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public async Task<bool> process(
4646
}
4747
} else {
4848
try {
49-
var match = Regex.Match(filePath, config.parsePattern, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
49+
var match = Regex.Match(Path.GetFullPath(filePath), config.parsePattern, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
5050

5151
episodeData = new FileMetadata(FileMetadata.Types.TV);
5252
episodeData.SeriesName = match.Groups["SeriesName"].Value;

autotag.cli/autotag.cli.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<AssemblyName>autotag</AssemblyName>
55
<OutputType>Exe</OutputType>
66
<TargetFramework>net5.0</TargetFramework>
7-
<AssemblyVersion>3.0.2.0</AssemblyVersion>
8-
<Version>3.0.2</Version>
7+
<AssemblyVersion>3.0.3.0</AssemblyVersion>
8+
<Version>3.0.3</Version>
99
</PropertyGroup>
1010

1111
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

0 commit comments

Comments
 (0)