Skip to content

Commit

Permalink
Upgrade to Ver.7.5.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhuxb711
zhuxb711 committed Mar 10, 2022
1 parent 30c22f0 commit 09163cc
Show file tree
Hide file tree
Showing 19 changed files with 192 additions and 86 deletions.
2 changes: 1 addition & 1 deletion FullTrustProcess/LogTracer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ private static void LogProcessThread()
}
catch (Exception ex)
{
Debug.WriteLine($"Error in writing log file: {ex.Message}");
Debug.WriteLine($"An exception was threw in writing log file: {ex.Message}");
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Package/Package.appxmanifest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<Identity
Name="36186RuoFan.USB"
Publisher="CN=4FF1CB23-04BD-4F9C-A86A-B4A43196FE02"
Version="7.5.4.0" />
Version="7.5.5.0" />

<Properties>
<DisplayName>ms-resource:App_Display_Name</DisplayName>
Expand Down
4 changes: 2 additions & 2 deletions RX_Explorer/App.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ private async Task LaunchWithStartupMode(IActivatedEventArgs LaunchArgs)
}
case StartupMode.LastOpenedTab:
{
List<string[]> LastOpenedPathArray = await StartupModeController.GetAllPathAsync().ToListAsync();
List<string[]> LastOpenedPathArray = await StartupModeController.GetAllPathAsync(StartupMode.LastOpenedTab).ToListAsync();

if (LastOpenedPathArray.Count > 0)
{
Expand All @@ -345,7 +345,7 @@ private async Task LaunchWithStartupMode(IActivatedEventArgs LaunchArgs)
}
case StartupMode.SpecificTab:
{
string[] SpecificPathArray = await StartupModeController.GetAllPathAsync()
string[] SpecificPathArray = await StartupModeController.GetAllPathAsync(StartupMode.SpecificTab)
.Select((Item) => Item.SingleOrDefault())
.ToArrayAsync();

Expand Down
2 changes: 1 addition & 1 deletion RX_Explorer/Assets/UpdateLog-Chinese_S.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
###版本7.5.4.0更新
###版本7.5.5.0更新

#####功能更新

Expand Down
2 changes: 1 addition & 1 deletion RX_Explorer/Assets/UpdateLog-Chinese_T.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
###版本7.5.4.0更新
###版本7.5.5.0更新

#####功能更新

Expand Down
2 changes: 1 addition & 1 deletion RX_Explorer/Assets/UpdateLog-English.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
###What's new in Ver.7.5.4.0
###What's new in Ver.7.5.5.0

#####Feature updated

Expand Down
2 changes: 1 addition & 1 deletion RX_Explorer/Assets/UpdateLog-French.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
###Quoi de neuf dans la version 7.5.4.0
###Quoi de neuf dans la version 7.5.5.0

#####Fonctionnalité mise à jour

Expand Down
2 changes: 1 addition & 1 deletion RX_Explorer/Assets/UpdateLog-German.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
###Was ist neu in Ver.7.5.4.0
###Was ist neu in Ver.7.5.5.0

#####Funktion aktualisiert

Expand Down
2 changes: 1 addition & 1 deletion RX_Explorer/Assets/UpdateLog-Spanish.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
###Novedades de la versión 7.5.4.0
###Novedades de la versión 7.5.5.0

#####Característica actualizada

Expand Down
4 changes: 2 additions & 2 deletions RX_Explorer/Class/LogTracer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,12 +287,12 @@ private static void LogProcessThread()
}
else
{
Debug.WriteLine($"Error in writing log file: Could not create the log file");
throw new IOException("Could not create log file");
}
}
catch (Exception ex)
{
Debug.WriteLine($"Error in writing log file: {ex.Message}");
Debug.WriteLine($"An exception was threw in writing log file: {ex.Message}");
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions RX_Explorer/Class/StartupModeController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public static StartupMode Mode
}
}

public static async IAsyncEnumerable<string[]> GetAllPathAsync()
public static async IAsyncEnumerable<string[]> GetAllPathAsync(StartupMode Mode)
{
switch (Mode)
{
Expand Down Expand Up @@ -88,7 +88,7 @@ public static async IAsyncEnumerable<string[]> GetAllPathAsync()

foreach (string ValidPath in PathList.Where((Path) => !string.IsNullOrWhiteSpace(Path)))
{
if (await FileSystemStorageItemBase.CheckExistsAsync(ValidPath))
if (RootStorageFolder.Instance.Path.Equals(ValidPath, StringComparison.OrdinalIgnoreCase) || await FileSystemStorageItemBase.CheckExistsAsync(ValidPath))
{
ValidPathList.Add(ValidPath);
}
Expand Down
2 changes: 1 addition & 1 deletion RX_Explorer/Package.appxmanifest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<Identity
Name="36186RuoFan.USB"
Publisher="CN=4FF1CB23-04BD-4F9C-A86A-B4A43196FE02"
Version="7.5.4.0" />
Version="7.5.5.0" />

<mp:PhoneIdentity PhoneProductId="cb13434c-d58e-4756-a099-364235a676db" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>

Expand Down
8 changes: 6 additions & 2 deletions RX_Explorer/View/FileControl.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)

this.Renderer = Renderer;

await Initialize(Renderer.InitializePathArray);
await Initialize(Renderer.InitializePaths);
}
}
catch (Exception ex)
Expand Down Expand Up @@ -1156,7 +1156,11 @@ await Dispatcher.RunAsync(CoreDispatcherPriority.Low, async () =>
{
try
{
foreach (FilePresenter Presenter in TabViewContainer.Current.TabCollection.Select((Tab) => Tab.Content).OfType<Frame>().Select((Frame) => Frame.Content).OfType<TabItemContentRenderer>().SelectMany((Renderer) => Renderer.Presenters))
foreach (FilePresenter Presenter in TabViewContainer.Current.TabCollection.Select((Tab) => Tab.Content)
.Cast<Frame>()
.Select((Frame) => Frame.Content)
.Cast<TabItemContentRenderer>()
.SelectMany((Renderer) => Renderer.Presenters))
{
if (Presenter.CurrentFolder is MTPStorageFolder Folder && Path.GetDirectoryName(TargetContent.Path).Equals(Folder.Path, StringComparison.OrdinalIgnoreCase))
{
Expand Down
54 changes: 45 additions & 9 deletions RX_Explorer/View/FilePresenter.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3347,7 +3347,11 @@ await Dispatcher.RunAsync(CoreDispatcherPriority.Low, async () =>
{
if (e.Status == OperationStatus.Completed)
{
foreach (FilePresenter Presenter in TabViewContainer.Current.TabCollection.Select((Tab) => Tab.Content).OfType<Frame>().Select((Frame) => Frame.Content).OfType<TabItemContentRenderer>().SelectMany((Renderer) => Renderer.Presenters))
foreach (FilePresenter Presenter in TabViewContainer.Current.TabCollection.Select((Tab) => Tab.Content)
.Cast<Frame>()
.Select((Frame) => Frame.Content)
.Cast<TabItemContentRenderer>()
.SelectMany((Renderer) => Renderer.Presenters))
{
if (Presenter.CurrentFolder is MTPStorageFolder MTPFolder)
{
Expand Down Expand Up @@ -3393,7 +3397,11 @@ await Dispatcher.RunAsync(CoreDispatcherPriority.Low, async () =>
{
if (e.Status == OperationStatus.Completed)
{
foreach (FilePresenter Presenter in TabViewContainer.Current.TabCollection.Select((Tab) => Tab.Content).OfType<Frame>().Select((Frame) => Frame.Content).OfType<TabItemContentRenderer>().SelectMany((Renderer) => Renderer.Presenters))
foreach (FilePresenter Presenter in TabViewContainer.Current.TabCollection.Select((Tab) => Tab.Content)
.Cast<Frame>()
.Select((Frame) => Frame.Content)
.Cast<TabItemContentRenderer>()
.SelectMany((Renderer) => Renderer.Presenters))
{
if (Presenter.CurrentFolder is MTPStorageFolder MTPFolder && MTPFolder == CurrentFolder)
{
Expand Down Expand Up @@ -3566,7 +3574,11 @@ await Dispatcher.RunAsync(CoreDispatcherPriority.Low, async () =>
{
try
{
foreach (FilePresenter Presenter in TabViewContainer.Current.TabCollection.Select((Tab) => Tab.Content).OfType<Frame>().Select((Frame) => Frame.Content).OfType<TabItemContentRenderer>().SelectMany((Renderer) => Renderer.Presenters))
foreach (FilePresenter Presenter in TabViewContainer.Current.TabCollection.Select((Tab) => Tab.Content)
.Cast<Frame>()
.Select((Frame) => Frame.Content)
.Cast<TabItemContentRenderer>()
.SelectMany((Renderer) => Renderer.Presenters))
{
if (Presenter.CurrentFolder is MTPStorageFolder MTPFolder && MTPFolder == CurrentFolder)
{
Expand Down Expand Up @@ -3635,7 +3647,11 @@ await Dispatcher.RunAsync(CoreDispatcherPriority.Low, async () =>
{
if (e.Status == OperationStatus.Completed && e.Parameter is string NewName)
{
foreach (FilePresenter Presenter in TabViewContainer.Current.TabCollection.Select((Tab) => Tab.Content).OfType<Frame>().Select((Frame) => Frame.Content).OfType<TabItemContentRenderer>().SelectMany((Renderer) => Renderer.Presenters))
foreach (FilePresenter Presenter in TabViewContainer.Current.TabCollection.Select((Tab) => Tab.Content)
.Cast<Frame>()
.Select((Frame) => Frame.Content)
.Cast<TabItemContentRenderer>()
.SelectMany((Renderer) => Renderer.Presenters))
{
if (Presenter.CurrentFolder is MTPStorageFolder MTPFolder && MTPFolder == CurrentFolder)
{
Expand Down Expand Up @@ -3681,7 +3697,11 @@ await Dispatcher.RunAsync(CoreDispatcherPriority.Low, async () =>
{
if (e.Status == OperationStatus.Completed && e.Parameter is string NewName)
{
foreach (FilePresenter Presenter in TabViewContainer.Current.TabCollection.Select((Tab) => Tab.Content).OfType<Frame>().Select((Frame) => Frame.Content).OfType<TabItemContentRenderer>().SelectMany((Renderer) => Renderer.Presenters))
foreach (FilePresenter Presenter in TabViewContainer.Current.TabCollection.Select((Tab) => Tab.Content)
.Cast<Frame>()
.Select((Frame) => Frame.Content)
.Cast<TabItemContentRenderer>()
.SelectMany((Renderer) => Renderer.Presenters))
{
if (Presenter.CurrentFolder is MTPStorageFolder MTPFolder && MTPFolder == CurrentFolder)
{
Expand Down Expand Up @@ -5296,7 +5316,11 @@ private async void CreateFile_Click(object sender, RoutedEventArgs e)
{
if (CurrentFolder is MTPStorageFolder)
{
foreach (FilePresenter Presenter in TabViewContainer.Current.TabCollection.Select((Tab) => Tab.Content).OfType<Frame>().Select((Frame) => Frame.Content).OfType<TabItemContentRenderer>().SelectMany((Renderer) => Renderer.Presenters))
foreach (FilePresenter Presenter in TabViewContainer.Current.TabCollection.Select((Tab) => Tab.Content)
.Cast<Frame>()
.Select((Frame) => Frame.Content)
.Cast<TabItemContentRenderer>()
.SelectMany((Renderer) => Renderer.Presenters))
{
IEnumerable<FileSystemStorageItemBase> NewItems = await Presenter.CurrentFolder.GetChildItemsAsync(SettingPage.IsShowHiddenFilesEnabled, SettingPage.IsDisplayProtectedSystemItems);

Expand Down Expand Up @@ -5823,7 +5847,11 @@ await Dispatcher.RunAsync(CoreDispatcherPriority.Low, async () =>
{
if (e.Status == OperationStatus.Completed)
{
foreach (FilePresenter Presenter in TabViewContainer.Current.TabCollection.Select((Tab) => Tab.Content).OfType<Frame>().Select((Frame) => Frame.Content).OfType<TabItemContentRenderer>().SelectMany((Renderer) => Renderer.Presenters))
foreach (FilePresenter Presenter in TabViewContainer.Current.TabCollection.Select((Tab) => Tab.Content)
.Cast<Frame>()
.Select((Frame) => Frame.Content)
.Cast<TabItemContentRenderer>()
.SelectMany((Renderer) => Renderer.Presenters))
{
if (Presenter.CurrentFolder is MTPStorageFolder MTPFolder)
{
Expand Down Expand Up @@ -5869,7 +5897,11 @@ await Dispatcher.RunAsync(CoreDispatcherPriority.Low, async () =>
{
if (e.Status == OperationStatus.Completed)
{
foreach (FilePresenter Presenter in TabViewContainer.Current.TabCollection.Select((Tab) => Tab.Content).OfType<Frame>().Select((Frame) => Frame.Content).OfType<TabItemContentRenderer>().SelectMany((Renderer) => Renderer.Presenters))
foreach (FilePresenter Presenter in TabViewContainer.Current.TabCollection.Select((Tab) => Tab.Content)
.Cast<Frame>()
.Select((Frame) => Frame.Content)
.Cast<TabItemContentRenderer>()
.SelectMany((Renderer) => Renderer.Presenters))
{
if (Presenter.CurrentFolder is MTPStorageFolder MTPFolder && MTPFolder == CurrentFolder)
{
Expand Down Expand Up @@ -6147,7 +6179,11 @@ await Dispatcher.RunAsync(CoreDispatcherPriority.Low, async () =>
{
if (e.Status == OperationStatus.Completed && e.Parameter is string NewName)
{
foreach (FilePresenter Presenter in TabViewContainer.Current.TabCollection.Select((Tab) => Tab.Content).OfType<Frame>().Select((Frame) => Frame.Content).OfType<TabItemContentRenderer>().SelectMany((Renderer) => Renderer.Presenters))
foreach (FilePresenter Presenter in TabViewContainer.Current.TabCollection.Select((Tab) => Tab.Content)
.Cast<Frame>()
.Select((Frame) => Frame.Content)
.Cast<TabItemContentRenderer>()
.SelectMany((Renderer) => Renderer.Presenters))
{
if (Presenter.CurrentFolder is MTPStorageFolder MTPFolder && MTPFolder == CurrentFolder)
{
Expand Down
Loading

0 comments on commit 09163cc

Please sign in to comment.