Skip to content

Code Quality: Enforced usage of FileExtensionHelpers #18050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lamparter wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Code Quality: Enforced usage of FileExtensionHelpers #18050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e50e677
Unify extension helpers
Lamparter Jan 11, 2026
2825aea
Do what Copilot says
Lamparter Jan 11, 2026
e335d60
Remove `.mdx`
Lamparter Jan 12, 2026
204fc32
Add back image types
Lamparter Jan 12, 2026
da4dc3d
Add svg file check method
Lamparter Jan 12, 2026
18ff307
Fix
Lamparter Jan 12, 2026
53bc118
Make variable names consistent
Lamparter Jan 25, 2026
e04df89
Remove duplicated methods
Lamparter Apr 27, 2026
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
3 changes: 2 additions & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<!-- Copyright (c) Files Community. Licensed under the MIT License. -->
<!-- Copyright (c) Files Community. Licensed under the MIT License. -->
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="ByteSize" Version="2.1.2" />
<PackageVersion Include="ColorCode.Core" Version="2.0.15" />
<PackageVersion Include="ColorCode.WinUI" Version="2.0.15" />
<PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.250206-build.2040" />
<PackageVersion Include="CommunityToolkit.Labs.WinUI.DependencyPropertyGenerator" Version="0.1.250206-build.2040" />
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/Helpers/Layout/AdaptiveLayoutHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Files Community
// Copyright (c) Files Community
// Licensed under the MIT License.

using Files.App.ViewModels.Previews;
Expand Down
10 changes: 5 additions & 5 deletions src/Files.App/ViewModels/UserControls/InfoPaneViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Files Community
// Copyright (c) Files Community
// Licensed under the MIT License.

using Files.App.UserControls.FilePreviews;
Expand Down Expand Up @@ -319,7 +319,7 @@ private async Task<UserControl> GetBuiltInPreviewControlAsync(ListedItem item, b
return new MarkdownPreview(model);
}

if (ImagePreviewViewModel.ContainsExtension(ext))
if (FileExtensionHelpers.IsImageFile(ext))
{
var model = new ImagePreviewViewModel(item);
await model.LoadAsync();
Expand All @@ -335,15 +335,15 @@ private async Task<UserControl> GetBuiltInPreviewControlAsync(ListedItem item, b
return new TextPreview(model);
}

/*if (PDFPreviewViewModel.ContainsExtension(ext))
/*if (FileExtensionHelpers.IsPdfFile(ext))
{
var model = new PDFPreviewViewModel(item);
await model.LoadAsync();

return new PDFPreview(model);
}*/

/*if (HtmlPreviewViewModel.ContainsExtension(ext))
/*if (FileExtensionHelpers.IsHtmlFile(ext))
{
var model = new HtmlPreviewViewModel(item);
await model.LoadAsync();
Expand All @@ -359,7 +359,7 @@ private async Task<UserControl> GetBuiltInPreviewControlAsync(ListedItem item, b
return new RichTextPreview(model);
}

if (CodePreviewViewModel.ContainsExtension(ext))
if (FileExtensionHelpers.IsCodeFile(ext))
{
var model = new CodePreviewViewModel(item);
await model.LoadAsync();
Expand Down
45 changes: 3 additions & 42 deletions src/Files.App/ViewModels/UserControls/Previews/CodePreviewViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
// Copyright (c) Files Community
// Copyright (c) Files Community
// Licensed under the MIT License.

using ColorCode;
using Files.App.ViewModels.Properties;
using Files.Shared.Helpers;
using System.Collections.Frozen;

namespace Files.App.ViewModels.Previews
{
public sealed partial class CodePreviewViewModel : BasePreviewModel
{
private static readonly FrozenDictionary<string, ILanguage> extensions = GetDictionary();

private string textValue;
public string TextValue
{
Expand All @@ -30,9 +29,6 @@ public CodePreviewViewModel(ListedItem item)
{
}

public static bool ContainsExtension(string extension)
=> extensions.ContainsKey(extension);

public async override Task<List<FileProperty>> LoadPreviewAndDetailsAsync()
{
var details = new List<FileProperty>();
Expand All @@ -42,7 +38,7 @@ public async override Task<List<FileProperty>> LoadPreviewAndDetailsAsync()
var text = TextValue ?? await ReadFileAsTextAsync(Item.ItemFile);
details.Add(GetFileProperty("PropertyLineCount", text.Split('\n').Length));

CodeLanguage = extensions[Item.FileExtension.ToLowerInvariant()];
CodeLanguage = FileExtensionHelpers.CodeFileExtensions[Item.FileExtension.ToLowerInvariant()];
TextValue = text.Left(Constants.PreviewPane.TextCharacterLimit);
}
catch (Exception e)
Expand All @@ -52,40 +48,5 @@ public async override Task<List<FileProperty>> LoadPreviewAndDetailsAsync()

return details;
}

private static FrozenDictionary<string, ILanguage> GetDictionary()
{
var items = new Dictionary<ILanguage, string>
{
[Languages.Aspx] = "aspx",
[Languages.AspxCs] = "acsx",
[Languages.Cpp] = "cpp,c++,cc,cp,cxx,h,h++,hh,hpp,hxx,inc,inl,ino,ipp,re,tcc,tpp",
[Languages.CSharp] = "cs,cake,csx,linq",
[Languages.Css] = "css,scss",
[Languages.FSharp] = "fs,fsi,fsx",
[Languages.Haskell] = "hs",
[Languages.Html] = "razor,cshtml,vbhtml,svelte",
[Languages.Java] = "java",
[Languages.JavaScript] = "js,jsx",
[Languages.Php] = "php",
[Languages.PowerShell] = "pwsh,ps1,psd1,psm1",
[Languages.Typescript] = "ts,tsx",
[Languages.VbDotNet] = "vb,vbs",
[Languages.Xml] = "xml,axml,xaml,xsd,xsl,xslt,xlf",
};

var dictionary = new Dictionary<string, ILanguage>();

foreach (var item in items)
{
var extensions = item.Value.Split(',').Select(ext => $".{ext}");
foreach (var extension in extensions)
{
dictionary.Add(extension, item.Key);
}
}

return dictionary.ToFrozenDictionary();
}
}
}
5 changes: 1 addition & 4 deletions src/Files.App/ViewModels/UserControls/Previews/HtmlPreviewViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Files Community
// Copyright (c) Files Community
// Licensed under the MIT License.

using Files.App.ViewModels.Properties;
Expand All @@ -12,9 +12,6 @@ public HtmlPreviewViewModel(ListedItem item)
{
}

public static bool ContainsExtension(string extension)
=> extension is ".htm" or ".html" or ".svg";

public async override Task<List<FileProperty>> LoadPreviewAndDetailsAsync()
=> [];
}
Expand Down
6 changes: 1 addition & 5 deletions src/Files.App/ViewModels/UserControls/Previews/ImagePreviewViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Files Community
// Copyright (c) Files Community
// Licensed under the MIT License.

using Files.App.ViewModels.Properties;
Expand All @@ -23,10 +23,6 @@ public ImagePreviewViewModel(ListedItem item)
{
}

// TODO: Use existing helper mothods
public static bool ContainsExtension(string extension)
Copy link
Copy Markdown
Member

@yair100 yair100 Apr 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IsImageFile contains more extensions than this list. Did you check that all of the extensions work with the preview pane?

Copy link
Copy Markdown
Contributor Author

@Lamparter Lamparter Apr 27, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new file extension I added to that method is JFIF, which I can confirm works:
image

=> extension is ".png" or ".jpg" or ".jpeg" or ".bmp" or ".gif" or ".tiff" or ".ico" or ".webp" or ".jxr";

public override async Task<List<FileProperty>> LoadPreviewAndDetailsAsync()
{
using IRandomAccessStream stream = await Item.ItemFile.OpenAsync(FileAccessMode.Read);
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/ViewModels/UserControls/Previews/MarkdownPreviewViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Files Community
// Copyright (c) Files Community
// Licensed under the MIT License.

using Files.App.ViewModels.Properties;
Expand Down
5 changes: 1 addition & 4 deletions src/Files.App/ViewModels/UserControls/Previews/PDFPreviewViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Files Community
// Copyright (c) Files Community
// Licensed under the MIT License.

using Files.App.ViewModels.Properties;
Expand Down Expand Up @@ -34,9 +34,6 @@ public PDFPreviewViewModel(ListedItem item)
{
}

public static bool ContainsExtension(string extension)
=> extension is ".pdf";

public async override Task<List<FileProperty>> LoadPreviewAndDetailsAsync()
{
var fileStream = await Item.ItemFile.OpenReadAsync();
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/ViewModels/UserControls/Previews/RichTextPreviewViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Files Community
// Copyright (c) Files Community
// Licensed under the MIT License.

using Files.App.ViewModels.Properties;
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/ViewModels/UserControls/Previews/TextPreviewViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) Files Community
// Copyright (c) Files Community
// Licensed under the MIT License.

using Files.App.UserControls.FilePreviews;
Expand Down
1 change: 1 addition & 0 deletions src/Files.Shared/Files.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<PackageReference Include="Microsoft.Extensions.Logging" />
<PackageReference Include="System.IO.Hashing" />
<PackageReference Include="System.Threading.Tasks.Dataflow" />
<PackageReference Include="ColorCode.Core" />
</ItemGroup>

</Project>
Loading
Loading