Skip to content

Commit

Permalink
v2.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@Beelink
Beelink committed Oct 11, 2020
1 parent 438e33d commit d698da7
Show file tree
Hide file tree
Showing 26 changed files with 43 additions and 37 deletions.
Binary file modified .vs/quick-picture-viewer/v16/.suo
View file
Binary file not shown.
Binary file modified .vs/quick-picture-viewer/v16/Server/sqlite3/storage.ide
View file
Binary file not shown.
Binary file removed .vs/quick-picture-viewer/v16/Server/sqlite3/storage.ide-shm
View file
Binary file not shown.
Binary file removed .vs/quick-picture-viewer/v16/Server/sqlite3/storage.ide-wal
View file
Binary file not shown.
Binary file modified inno-setup/QuickPictureViewer-Setup.exe
View file
Binary file not shown.
10 changes: 7 additions & 3 deletions inno-setup/quick-picture-viewer.iss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "Quick Picture Viewer"
#define MyAppVersion "2.2.0"
#define MyAppVersion "2.2.1"
#define MyAppPublisher "Module Art"
#define MyAppURL "https://moduleart.github.io"
#define MyAppExeName "quick-picture-viewer.exe"
Expand Down Expand Up @@ -47,9 +47,11 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{

[Files]
Source: "D:\Projects\DotNet\quick-picture-viewer\quick-picture-viewer\bin\Release\quick-picture-viewer.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\Projects\DotNet\quick-picture-viewer\quick-picture-viewer\bin\Release\Newtonsoft.Json.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\Projects\DotNet\quick-picture-viewer\quick-picture-viewer\bin\Release\Newtonsoft.Json.xml"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\Projects\DotNet\quick-picture-viewer\quick-picture-viewer\bin\Release\Fizzler.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\Projects\DotNet\quick-picture-viewer\quick-picture-viewer\bin\Release\libwebp_x64.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\Projects\DotNet\quick-picture-viewer\quick-picture-viewer\bin\Release\libwebp_x86.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\Projects\DotNet\quick-picture-viewer\quick-picture-viewer\resources\dlls\libwebp_x64.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\Projects\DotNet\quick-picture-viewer\quick-picture-viewer\resources\dlls\libwebp_x86.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\Projects\DotNet\quick-picture-viewer\quick-picture-viewer\bin\Release\Octokit.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\Projects\DotNet\quick-picture-viewer\quick-picture-viewer\bin\Release\Pfim.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\Projects\DotNet\quick-picture-viewer\quick-picture-viewer\bin\Release\QuickLibrary.dll"; DestDir: "{app}"; Flags: ignoreversion
Expand All @@ -61,6 +63,8 @@ Source: "D:\Projects\DotNet\quick-picture-viewer\quick-picture-viewer\bin\Releas
Source: "D:\Projects\DotNet\quick-picture-viewer\quick-picture-viewer\resources\quick-picture-viewer.VisualElementsManifest.xml"; DestDir: "{app}"; Flags: ignoreversion
Source: "D:\Projects\DotNet\quick-picture-viewer\quick-picture-viewer\resources\imgs\picture.ico"; DestDir: "{app}"; Flags: ignoreversion

Source: "D:\Projects\DotNet\quick-picture-viewer\quick-picture-viewer\bin\Debug\plugins\*"; DestDir: "{app}\plugins"; Flags: ignoreversion recursesubdirs

Source: "D:\Projects\DotNet\quick-picture-viewer\quick-picture-viewer\resources\imgs\file-types\bmp.ico"; DestDir: "{app}\icons"; Flags: ignoreversion
Source: "D:\Projects\DotNet\quick-picture-viewer\quick-picture-viewer\resources\imgs\file-types\dds.ico"; DestDir: "{app}\icons"; Flags: ignoreversion
Source: "D:\Projects\DotNet\quick-picture-viewer\quick-picture-viewer\resources\imgs\file-types\dib.ico"; DestDir: "{app}\icons"; Flags: ignoreversion
Expand Down
56 changes: 29 additions & 27 deletions quick-picture-viewer/PluginManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,45 +36,47 @@ public static PluginInfo[] GetPlugins(bool onlyAvailable)
{
List<PluginInfo> plugins = new List<PluginInfo>();
DirectoryInfo di = new DirectoryInfo(pluginsFolder);

List<FileInfo> files = new List<FileInfo>();
DirectoryInfo[] dirs = di.GetDirectories();
for (int i = 0; i < dirs.Length; i++)
{
files.AddRange(dirs[i].GetFiles());
dirs[i] = null;
}

for (int i = 0; i < files.Count; i++)
if (di.Exists)
{
if (Path.GetExtension(files[i].Name) == ".json")
List<FileInfo> files = new List<FileInfo>();
DirectoryInfo[] dirs = di.GetDirectories();
for (int i = 0; i < dirs.Length; i++)
{
files.AddRange(dirs[i].GetFiles());
dirs[i] = null;
}
for (int i = 0; i < files.Count; i++)
{
string ver = Assembly.GetExecutingAssembly().GetName().Version.ToString();
int lastDotIndex = ver.LastIndexOf('.');
ver = ver.Substring(0, lastDotIndex);
if (Path.GetExtension(files[i].Name) == ".json")
{
string ver = Assembly.GetExecutingAssembly().GetName().Version.ToString();
int lastDotIndex = ver.LastIndexOf('.');
ver = ver.Substring(0, lastDotIndex);

PluginInfo pi = PluginInfo.FromJson(File.ReadAllText(Path.Combine(di.FullName, files[i].DirectoryName, files[i].Name)));
PluginInfo pi = PluginInfo.FromJson(File.ReadAllText(Path.Combine(di.FullName, files[i].DirectoryName, files[i].Name)));

if (onlyAvailable)
{
for (int j = 0; j < pi.targets.Length; j++)
if (onlyAvailable)
{
if (pi.targets[j].name == "quick-picture-viewer" && ver.CompareTo(pi.targets[j].minVersion) >= 0)
for (int j = 0; j < pi.targets.Length; j++)
{
if (pi.targets[j].maxVersion == null || pi.targets[j].maxVersion == "" || ver.CompareTo(pi.targets[j].maxVersion) <= 0)
if (pi.targets[j].name == "quick-picture-viewer" && ver.CompareTo(pi.targets[j].minVersion) >= 0)
{
plugins.Add(pi);
break;
Console.WriteLine(pi.targets[j].maxVersion);
if (pi.targets[j].maxVersion == null || pi.targets[j].maxVersion == "" || ver.CompareTo(pi.targets[j].maxVersion) <= 0)
{
plugins.Add(pi);
break;
}
}
}
}
else
{
plugins.Add(pi);
}
}
else
{
plugins.Add(pi);
}
files[i] = null;
}
files[i] = null;
}
return plugins.ToArray();
}
Expand Down
4 changes: 2 additions & 2 deletions quick-picture-viewer/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.2.0")]
[assembly: AssemblyFileVersion("2.2.0")]
[assembly: AssemblyVersion("2.2.1")]
[assembly: AssemblyFileVersion("2.2.1")]
[assembly: NeutralResourcesLanguage("en")]
8 changes: 4 additions & 4 deletions quick-picture-viewer/SettingsForm.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion quick-picture-viewer/bin/Debug/plugins/qpv-blur/qpv-blur.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{
"name": "quick-picture-viewer",
"minVersion": "2.2.0",
"maxVersion": "2.2.0"
"maxVersion": "2.2.1"
}
],
"functions": [
Expand Down
Binary file modified quick-picture-viewer/bin/Debug/quick-picture-viewer.exe
View file
Binary file not shown.
Binary file modified quick-picture-viewer/bin/Debug/quick-picture-viewer.pdb
View file
Binary file not shown.
Binary file removed quick-picture-viewer/bin/Release/libwebp_x64.dll
View file
Binary file not shown.
Binary file removed quick-picture-viewer/bin/Release/libwebp_x86.dll
View file
Binary file not shown.
Binary file modified quick-picture-viewer/bin/Release/quick-picture-viewer.exe
View file
Binary file not shown.
Binary file modified quick-picture-viewer/bin/Release/quick-picture-viewer.pdb
View file
Binary file not shown.
Binary file modified quick-picture-viewer/obj/Debug/quick-picture-viewer.csproj.GenerateResource.cache
View file
Binary file not shown.
Binary file modified quick-picture-viewer/obj/Debug/quick-picture-viewer.csprojAssemblyReference.cache
View file
Binary file not shown.
Binary file modified quick-picture-viewer/obj/Debug/quick-picture-viewer.exe
View file
Binary file not shown.
Binary file modified quick-picture-viewer/obj/Debug/quick-picture-viewer.pdb
View file
Binary file not shown.
Binary file added quick-picture-viewer/obj/Release/DesignTimeResolveAssemblyReferences.cache
View file
Binary file not shown.
Binary file added quick-picture-viewer/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
View file
Binary file not shown.
Binary file modified quick-picture-viewer/obj/Release/quick-picture-viewer.csproj.GenerateResource.cache
View file
Binary file not shown.
Binary file modified quick-picture-viewer/obj/Release/quick-picture-viewer.csprojAssemblyReference.cache
View file
Binary file not shown.
Binary file modified quick-picture-viewer/obj/Release/quick-picture-viewer.exe
View file
Binary file not shown.
Binary file modified quick-picture-viewer/obj/Release/quick-picture-viewer.pdb
View file
Binary file not shown.

0 comments on commit d698da7

Please sign in to comment.