commit f87f5ed9078274be387be8264c27964de68bde83
parent 4daf94fd5530daca1410ffab04713db25a6109bc
Author: rwa <apollo@rw-net.de>
Date: Mon, 1 Oct 2018 21:36:22 +0200
wip #7 - ignore errors when sidecarfilefolder is missing
implements #12 - empty status label when operation is started
Diffstat:
11 files changed, 101 insertions(+), 74 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
obj
-/OldSilkypixFileCleaner/bin
+bin
+/.vs/SilkypixFileMover/v15
diff --git a/OldSilkypixFileCleaner/OldSilkypixFileCleaner.csproj b/OldSilkypixFileCleaner/OldSilkypixFileCleaner.csproj
@@ -27,10 +27,14 @@
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
- <SccProjectName>SAK</SccProjectName>
- <SccLocalPath>SAK</SccLocalPath>
- <SccAuxPath>SAK</SccAuxPath>
- <SccProvider>SAK</SccProvider>
+ <SccProjectName>
+ </SccProjectName>
+ <SccLocalPath>
+ </SccLocalPath>
+ <SccAuxPath>
+ </SccAuxPath>
+ <SccProvider>
+ </SccProvider>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -54,7 +58,7 @@
<RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup>
- <SignAssembly>true</SignAssembly>
+ <SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>..\..\StrongName.snk</AssemblyOriginatorKeyFile>
diff --git a/SilkypixFileMover.sln b/SilkypixFileMover.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.28010.2036
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SilkypixFileMover", "SilkypixFileMover\SilkypixFileMover.csproj", "{58BB320E-C90D-4F35-A23E-10FA8D3FF47B}"
EndProject
@@ -25,14 +25,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
- GlobalSection(SourceCodeControl) = preSolution
- SccNumberOfProjects = 3
- SccLocalPath0 = .
- SccProjectUniqueName1 = SilkypixFileMover\\SilkypixFileMover.csproj
- SccLocalPath1 = .
- SccProjectFilePathRelativizedFromConnection1 = SilkypixFileMover\\
- SccProjectUniqueName2 = OldSilkypixFileCleaner\\OldSilkypixFileCleaner.csproj
- SccLocalPath2 = .
- SccProjectFilePathRelativizedFromConnection2 = OldSilkypixFileCleaner\\
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {42762F61-48AA-4812-95D9-06FDCF85D2A0}
EndGlobalSection
EndGlobal
diff --git a/SilkypixFileMover/Helpers/FileHelpers.cs b/SilkypixFileMover/Helpers/FileHelpers.cs
@@ -32,6 +32,10 @@ namespace SilkypixFileMover.Helpers
foreach ( string file in fileList )
{
string sourceFullPath = Path.Combine( sourceFolder, file );
+ if ( !Directory.Exists(Path.GetDirectoryName(sourceFullPath)))
+ {
+ continue;
+ }
string destFullPath = Path.Combine( destinationFolder, Path.GetFileName( file ) );
SaveMove( sourceFullPath, destFullPath );
diff --git a/SilkypixFileMover/MainForm.cs b/SilkypixFileMover/MainForm.cs
@@ -106,6 +106,7 @@ namespace SilkypixFileMover
/// <param name="files">Ein Array von Dateinamen inkl. Verzeichnisangabe.</param>
private void AddItemsToListView(string[] files)
{
+ statusLabel.Text = string.Empty;
bool added = false;
foreach ( string file in files )
{
@@ -256,6 +257,7 @@ namespace SilkypixFileMover
private void PrepareWorker( WorkerAction workerAction )
{
+ statusLabel.Text = string.Empty;
if ( !bgwWorker.IsBusy )
{
statusProgress.Maximum = pendingFiles.Count;
diff --git a/SilkypixFileMover/MainForm.resx b/SilkypixFileMover/MainForm.resx
@@ -251,18 +251,6 @@
<metadata name="statusBar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
- <data name="statusLabel.Size" type="System.Drawing.Size, System.Drawing">
- <value>503, 17</value>
- </data>
- <data name="statusLabel.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
- <value>MiddleLeft</value>
- </data>
- <data name="statusCounter.Size" type="System.Drawing.Size, System.Drawing">
- <value>4, 17</value>
- </data>
- <data name="statusProgress.Size" type="System.Drawing.Size, System.Drawing">
- <value>100, 16</value>
- </data>
<data name="statusBar.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 419</value>
</data>
@@ -284,6 +272,18 @@
<data name=">>statusBar.ZOrder" xml:space="preserve">
<value>10</value>
</data>
+ <data name="statusLabel.Size" type="System.Drawing.Size, System.Drawing">
+ <value>472, 17</value>
+ </data>
+ <data name="statusLabel.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+ <value>MiddleLeft</value>
+ </data>
+ <data name="statusCounter.Size" type="System.Drawing.Size, System.Drawing">
+ <value>4, 17</value>
+ </data>
+ <data name="statusProgress.Size" type="System.Drawing.Size, System.Drawing">
+ <value>100, 16</value>
+ </data>
<data name="btnMove.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
</data>
@@ -383,6 +383,27 @@
<data name="lviFiles.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
+ <data name="lviFiles.Location" type="System.Drawing.Point, System.Drawing">
+ <value>12, 32</value>
+ </data>
+ <data name="lviFiles.Size" type="System.Drawing.Size, System.Drawing">
+ <value>600, 304</value>
+ </data>
+ <data name="lviFiles.TabIndex" type="System.Int32, mscorlib">
+ <value>10</value>
+ </data>
+ <data name=">>lviFiles.Name" xml:space="preserve">
+ <value>lviFiles</value>
+ </data>
+ <data name=">>lviFiles.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>lviFiles.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>lviFiles.ZOrder" xml:space="preserve">
+ <value>7</value>
+ </data>
<data name="colFileName.Text" xml:space="preserve">
<value>Name</value>
</data>
@@ -407,27 +428,6 @@
<data name="colTimestamp.Width" type="System.Int32, mscorlib">
<value>120</value>
</data>
- <data name="lviFiles.Location" type="System.Drawing.Point, System.Drawing">
- <value>12, 32</value>
- </data>
- <data name="lviFiles.Size" type="System.Drawing.Size, System.Drawing">
- <value>600, 304</value>
- </data>
- <data name="lviFiles.TabIndex" type="System.Int32, mscorlib">
- <value>10</value>
- </data>
- <data name=">>lviFiles.Name" xml:space="preserve">
- <value>lviFiles</value>
- </data>
- <data name=">>lviFiles.Type" xml:space="preserve">
- <value>System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>lviFiles.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>lviFiles.ZOrder" xml:space="preserve">
- <value>7</value>
- </data>
<data name="btnDelete.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
</data>
@@ -738,30 +738,30 @@
<metadata name="trayIconContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>408, 17</value>
</metadata>
+ <data name="trayIconContextMenu.Size" type="System.Drawing.Size, System.Drawing">
+ <value>258, 54</value>
+ </data>
+ <data name=">>trayIconContextMenu.Name" xml:space="preserve">
+ <value>trayIconContextMenu</value>
+ </data>
+ <data name=">>trayIconContextMenu.Type" xml:space="preserve">
+ <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
<data name="toogleWindowItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>237, 22</value>
+ <value>257, 22</value>
</data>
<data name="toogleWindowItem.Text" xml:space="preserve">
<value>Programmfenster ein-/ausblenden</value>
</data>
<data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
- <value>234, 6</value>
+ <value>254, 6</value>
</data>
<data name="beendenItem.Size" type="System.Drawing.Size, System.Drawing">
- <value>237, 22</value>
+ <value>257, 22</value>
</data>
<data name="beendenItem.Text" xml:space="preserve">
<value>Beenden</value>
</data>
- <data name="trayIconContextMenu.Size" type="System.Drawing.Size, System.Drawing">
- <value>238, 54</value>
- </data>
- <data name=">>trayIconContextMenu.Name" xml:space="preserve">
- <value>trayIconContextMenu</value>
- </data>
- <data name=">>trayIconContextMenu.Type" xml:space="preserve">
- <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
<metadata name="trayIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>313, 17</value>
</metadata>
diff --git a/SilkypixFileMover/Properties/AssemblyInfo.cs b/SilkypixFileMover/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@ using System;
[assembly: AssemblyConfiguration( "" )]
[assembly: AssemblyCompany( "René Wagner" )]
[assembly: AssemblyProduct( "spFileMover" )]
-[assembly: AssemblyCopyright( "Copyright René Wagner © 2014-2017" )]
+[assembly: AssemblyCopyright("Copyright René Wagner © 2014-2018")]
[assembly: AssemblyTrademark( "" )]
[assembly: AssemblyCulture( "" )]
@@ -33,6 +33,6 @@ using System;
// 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("1.5.9.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
[assembly: NeutralResourcesLanguage( "de" )]
-[assembly: AssemblyFileVersion("1.5.9.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/SilkypixFileMover/RawFileWizard.snk b/SilkypixFileMover/RawFileWizard.snk
Binary files differ.
diff --git a/SilkypixFileMover/SilkypixFileMover.csproj b/SilkypixFileMover/SilkypixFileMover.csproj
@@ -11,13 +11,17 @@
<AssemblyName>RawFileWizard</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
- <SccProjectName>SAK</SccProjectName>
- <SccLocalPath>SAK</SccLocalPath>
- <SccAuxPath>SAK</SccAuxPath>
- <SccProvider>SAK</SccProvider>
+ <SccProjectName>
+ </SccProjectName>
+ <SccLocalPath>
+ </SccLocalPath>
+ <SccAuxPath>
+ </SccAuxPath>
+ <SccProvider>
+ </SccProvider>
<IsWebBootstrapper>true</IsWebBootstrapper>
<TargetFrameworkProfile />
- <PublishUrl>ftp://rw-net.de/</PublishUrl>
+ <PublishUrl>C:\Users\winuser\Music\</PublishUrl>
<Install>true</Install>
<InstallFrom>Web</InstallFrom>
<UpdateEnabled>true</UpdateEnabled>
@@ -34,8 +38,8 @@
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>index.htm</WebPage>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
- <ApplicationRevision>1</ApplicationRevision>
- <ApplicationVersion>1.5.9.%2a</ApplicationVersion>
+ <ApplicationRevision>2</ApplicationRevision>
+ <ApplicationVersion>1.6.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted>
@@ -70,7 +74,7 @@
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
- <AssemblyOriginatorKeyFile>..\..\StrongName.snk</AssemblyOriginatorKeyFile>
+ <AssemblyOriginatorKeyFile>RawFileWizard.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup>
<TargetZone>Internet</TargetZone>
@@ -80,7 +84,7 @@
</PropertyGroup>
<PropertyGroup />
<PropertyGroup>
- <ManifestCertificateThumbprint>492D0783DC6BAA875B4D611EC107A16124A302A7</ManifestCertificateThumbprint>
+ <ManifestCertificateThumbprint>3870D3EB3B30C463E560D7949365B4D392EB4615</ManifestCertificateThumbprint>
</PropertyGroup>
<PropertyGroup>
<ManifestKeyFile>SilkypixFileMover_TemporaryKey.pfx</ManifestKeyFile>
@@ -178,6 +182,7 @@
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
+ <None Include="SilkypixFileMover_TemporaryKey.pfx" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
@@ -196,6 +201,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="Resources\backup_wizard.ico" />
+ <None Include="RawFileWizard.snk" />
<None Include="Resources\backups.ico" />
</ItemGroup>
<ItemGroup>
diff --git a/SilkypixFileMover/SilkypixFileMover.csproj.user b/SilkypixFileMover/SilkypixFileMover.csproj.user
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <PublishUrlHistory>C:\Users\winuser\Music\|ftp://rw-net.de/</PublishUrlHistory>
+ <InstallUrlHistory>https://www.rw-net.de/RawFileWizard/</InstallUrlHistory>
+ <SupportUrlHistory>https://www.rw-foto.net</SupportUrlHistory>
+ <UpdateUrlHistory />
+ <BootstrapperUrlHistory />
+ <ErrorReportUrlHistory />
+ <FallbackCulture>en-US</FallbackCulture>
+ <VerifyUploadedFiles>false</VerifyUploadedFiles>
+ </PropertyGroup>
+ <PropertyGroup>
+ <EnableSecurityDebugging>false</EnableSecurityDebugging>
+ </PropertyGroup>
+</Project>
+\ No newline at end of file
diff --git a/SilkypixFileMover/SilkypixFileMover_TemporaryKey.pfx b/SilkypixFileMover/SilkypixFileMover_TemporaryKey.pfx
Binary files differ.
