Skip to content

Auto refresh files and folders #79

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

Merged
merged 4 commits into from
Mar 8, 2019
Merged

Auto refresh files and folders #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3191f66
refactor folder and files addition
ashikns Mar 5, 2019
d6e1eec
further refactor to reduce publicly exposed stuff; hookup content cha…
ashikns Mar 5, 2019
771aaa5
auto refresh on filesystem change
ashikns Mar 6, 2019
83ebed5
simplify friendly date string
ashikns Mar 6, 2019
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
13 changes: 6 additions & 7 deletions Files UWP/AddItem.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
var userInput = GenericFileBrowser.inputForRename;
if (userInput != null)
{
await folderToCreateItem.CreateFolderAsync(userInput, CreationCollisionOption.FailIfExists);
App.ViewModel.FilesAndFolders.Add(new ListedItem(){ FileName = userInput, FileDate = "Now", EmptyImgVis = Visibility.Collapsed, FolderImg = Visibility.Visible, FileIconVis = Visibility.Collapsed, FileType = "Folder", FileImg = null, FilePath = (App.ViewModel.Universal.path + "\\" + userInput) });
var folder = await folderToCreateItem.CreateFolderAsync(userInput, CreationCollisionOption.FailIfExists);
App.ViewModel.AddFileOrFolder(new ListedItem(folder.FolderRelativeId){ FileName = userInput, FileDateReal = DateTimeOffset.Now, EmptyImgVis = Visibility.Collapsed, FolderImg = Visibility.Visible, FileIconVis = Visibility.Collapsed, FileType = "Folder", FileImg = null, FilePath = (App.ViewModel.Universal.path + "\\" + userInput) });
}
}
else if ((e.ClickedItem as AddListItem).Header == "Text Document")
Expand All @@ -52,8 +52,8 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
var userInput = GenericFileBrowser.inputForRename;
if (userInput != null)
{
await folderToCreateItem.CreateFileAsync(userInput + ".txt", CreationCollisionOption.FailIfExists);
App.ViewModel.FilesAndFolders.Add(new ListedItem() { FileName = userInput, FileDate = "Now", EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileType = "Text Document", FileImg = null, FilePath = (App.ViewModel.Universal.path + "\\" + userInput + ".txt"), DotFileExtension = ".txt" });
var folder = await folderToCreateItem.CreateFileAsync(userInput + ".txt", CreationCollisionOption.FailIfExists);
App.ViewModel.AddFileOrFolder(new ListedItem(folder.FolderRelativeId) { FileName = userInput, FileDateReal = DateTimeOffset.Now, EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileType = "Text Document", FileImg = null, FilePath = (App.ViewModel.Universal.path + "\\" + userInput + ".txt"), DotFileExtension = ".txt" });
}
}
else if ((e.ClickedItem as AddListItem).Header == "Bitmap Image")
Expand All @@ -62,9 +62,8 @@ private async void ListView_ItemClick(object sender, ItemClickEventArgs e)
var userInput = GenericFileBrowser.inputForRename;
if (userInput != null)
{
await folderToCreateItem.CreateFileAsync(userInput + ".bmp", CreationCollisionOption.FailIfExists);
App.ViewModel.FilesAndFolders.Add(new ListedItem() { FileName = userInput, FileDate = "Now", EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileType = "BMP File", FileImg = null, FilePath = (App.ViewModel.Universal.path + "\\" + userInput + ".bmp"), DotFileExtension = ".bmp" });

var folder = await folderToCreateItem.CreateFileAsync(userInput + ".bmp", CreationCollisionOption.FailIfExists);
App.ViewModel.AddFileOrFolder(new ListedItem(folder.FolderRelativeId) { FileName = userInput, FileDateReal = DateTimeOffset.Now, EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileType = "BMP File", FileImg = null, FilePath = (App.ViewModel.Universal.path + "\\" + userInput + ".bmp"), DotFileExtension = ".bmp" });
}
}
}
Expand Down
702 changes: 318 additions & 384 deletions Files UWP/Filesystem/ItemViewModel.cs
View file
Open in desktop

Large diffs are not rendered by default.

48 changes: 45 additions & 3 deletions Files UWP/Filesystem/ListedItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,65 @@
using Windows.UI.Xaml;
using System;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media.Imaging;

namespace Files.Filesystem
{
public class ListedItem
{
public string FolderRelativeId { get; }

public Visibility FolderImg { get; set; }
public Visibility FileIconVis { get; set; }
public Visibility EmptyImgVis { get; set; }
public BitmapImage FileImg { get; set; }
public string FileName { get; set; }
public string FileDate { get; set; }
public string FileDate { get; private set; }
public string FileType { get; set; }
public string DotFileExtension { get; set; }
public string FilePath { get; set; }
public string FileSize { get; set; }
public ListedItem()

public DateTimeOffset FileDateReal
{
get { return _fileDataReal; }
set
{
FileDate = GetFriendlyDate(value);
_fileDataReal = value;
}
}

private DateTimeOffset _fileDataReal;

public ListedItem(string folderRelativeId)
{
FolderRelativeId = folderRelativeId;
}

public static string GetFriendlyDate(DateTimeOffset d)
{
var elapsed = DateTimeOffset.Now - d;

if (elapsed.TotalDays > 7)
{
return d.ToString("D");
}
else if (elapsed.TotalDays > 1)
{
return $"{elapsed.Days} days ago";
}
else if (elapsed.TotalHours > 1)
{
return $"{elapsed.Hours} hours ago";
}
else if (elapsed.TotalMinutes > 1)
{
return $"{elapsed.Minutes} minutes ago";
}
else
{
return $"{elapsed.Seconds} seconds ago";
}
}
}
}
8 changes: 2 additions & 6 deletions Files UWP/GenericFileBrowser.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
{
base.OnNavigatedTo(eventArgs);
var parameters = (string)eventArgs.Parameter;
App.ViewModel.FilesAndFolders.Clear();
App.ViewModel.CancelLoadAndClearFiles();
App.ViewModel.Universal.path = parameters;
App.ViewModel.AddItemsToCollectionAsync(App.ViewModel.Universal.path, GenericItemView);
if (parameters.Equals(Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory)))
Expand Down Expand Up @@ -332,11 +332,7 @@ private async void VisiblePath_TextChanged(object sender, KeyRoutedEventArgs e)
var CurrentInput = PathBox.Text;
if (CurrentInput != App.ViewModel.Universal.path)
{
if (App.ViewModel.tokenSource != null)
{
App.ViewModel.tokenSource.Cancel();
App.ViewModel.FilesAndFolders.Clear();
}
App.ViewModel.CancelLoadAndClearFiles();

if (CurrentInput == "Home" || CurrentInput == "home")
{
Expand Down
73 changes: 57 additions & 16 deletions Files UWP/Interacts/Interaction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
using System.Collections;
using Windows.Foundation;
using Windows.UI.Xaml.Controls.Primitives;
using System.IO;

namespace Files.Interacts
{
Expand Down Expand Up @@ -60,7 +61,7 @@ public static async void List_ItemClick(object sender, DoubleTappedRoutedEventAr
App.ViewModel.TextState.isVisible = Visibility.Collapsed;
History.ForwardList.Clear();
App.ViewModel.FS.isEnabled = false;
App.ViewModel.FilesAndFolders.Clear();
App.ViewModel.CancelLoadAndClearFiles();
if (clickedOnItem.FilePath == Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory))
{
App.PathText.Text = "Desktop";
Expand Down Expand Up @@ -221,7 +222,7 @@ public static async void List_ItemClick(object sender, DoubleTappedRoutedEventAr
App.ViewModel.TextState.isVisible = Visibility.Collapsed;
History.ForwardList.Clear();
App.ViewModel.FS.isEnabled = false;
App.ViewModel.FilesAndFolders.Clear();
App.ViewModel.CancelLoadAndClearFiles();
if (clickedOnItem.FilePath == Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory))
{
App.PathText.Text = "Desktop";
Expand Down Expand Up @@ -454,7 +455,7 @@ public static async void OpenItem_Click(object sender, RoutedEventArgs e)
App.ViewModel.TextState.isVisible = Visibility.Collapsed;
History.ForwardList.Clear();
App.ViewModel.FS.isEnabled = false;
App.ViewModel.FilesAndFolders.Clear();
App.ViewModel.CancelLoadAndClearFiles();
App.ViewModel.Universal.path = RowData.FilePath;
App.ViewModel.AddItemsToCollectionAsync(App.ViewModel.Universal.path, GenericFileBrowser.GFBPageName);
}
Expand All @@ -476,7 +477,7 @@ public static async void OpenItem_Click(object sender, RoutedEventArgs e)
App.ViewModel.TextState.isVisible = Visibility.Collapsed;
History.ForwardList.Clear();
App.ViewModel.FS.isEnabled = false;
App.ViewModel.FilesAndFolders.Clear();
App.ViewModel.CancelLoadAndClearFiles();
App.ViewModel.Universal.path = RowData.FilePath;
App.ViewModel.AddItemsToCollectionAsync(RowData.FilePath, PhotoAlbum.PAPageName);
}
Expand Down Expand Up @@ -567,7 +568,7 @@ public static async void DeleteItem_Click(object sender, RoutedEventArgs e)
await item.DeleteAsync(StorageDeleteOption.Default);

}
App.ViewModel.FilesAndFolders.Remove(storItem);
App.ViewModel.RemoveFileOrFolder(storItem);
}
Debug.WriteLine("Ended for loop");
History.ForwardList.Clear();
Expand All @@ -594,7 +595,7 @@ public static async void DeleteItem_Click(object sender, RoutedEventArgs e)
await item.DeleteAsync(StorageDeleteOption.Default);

}
App.ViewModel.FilesAndFolders.Remove(storItem);
App.ViewModel.RemoveFileOrFolder(storItem);
}
Debug.WriteLine("Ended for loop");
History.ForwardList.Clear();
Expand Down Expand Up @@ -625,16 +626,36 @@ public static async void RenameItem_Click(object sender, RoutedEventArgs e)
{
var item = await StorageFolder.GetFolderFromPathAsync(RowData.FilePath);
await item.RenameAsync(input, NameCollisionOption.FailIfExists);
App.ViewModel.FilesAndFolders.Remove(RowData);
App.ViewModel.FilesAndFolders.Add(new ListedItem() { FileName = input, FileDate = "Now", EmptyImgVis = Visibility.Collapsed, FolderImg = Visibility.Visible, FileIconVis = Visibility.Collapsed, FileType = "Folder", FileImg = null, FilePath = (App.ViewModel.Universal.path + "\\" + input) });
App.ViewModel.RemoveFileOrFolder(RowData);
App.ViewModel.AddFileOrFolder(new ListedItem(item.FolderRelativeId)
{
FileName = input,
FileDateReal = DateTimeOffset.Now,
EmptyImgVis = Visibility.Collapsed,
FolderImg = Visibility.Visible,
FileIconVis = Visibility.Collapsed,
FileType = "Folder",
FileImg = null,
FilePath = Path.Combine(App.ViewModel.Universal.path, input)
});
}
else
{
var item = await StorageFile.GetFileFromPathAsync(RowData.FilePath);
await item.RenameAsync(input + RowData.DotFileExtension, NameCollisionOption.FailIfExists);
App.ViewModel.FilesAndFolders.Remove(RowData);
App.ViewModel.FilesAndFolders.Add(new ListedItem() { FileName = input, FileDate = "Now", EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileType = RowData.FileType, FileImg = null, FilePath = (App.ViewModel.Universal.path + "\\" + input + RowData.DotFileExtension), DotFileExtension = RowData.DotFileExtension });

App.ViewModel.RemoveFileOrFolder(RowData);
App.ViewModel.AddFileOrFolder(new ListedItem(item.FolderRelativeId)
{
FileName = input,
FileDateReal = DateTimeOffset.Now,
EmptyImgVis = Visibility.Visible,
FolderImg = Visibility.Collapsed,
FileIconVis = Visibility.Collapsed,
FileType = RowData.FileType,
FileImg = null,
FilePath = Path.Combine(App.ViewModel.Universal.path, input + RowData.DotFileExtension),
DotFileExtension = RowData.DotFileExtension
});
}
}

Expand All @@ -659,16 +680,36 @@ public static async void RenameItem_Click(object sender, RoutedEventArgs e)
{
var item = await StorageFolder.GetFolderFromPathAsync(BoxData.FilePath);
await item.RenameAsync(input, NameCollisionOption.FailIfExists);
App.ViewModel.FilesAndFolders.Remove(BoxData);
App.ViewModel.FilesAndFolders.Add(new ListedItem() { FileName = input, FileDate = "Now", EmptyImgVis = Visibility.Collapsed, FolderImg = Visibility.Visible, FileIconVis = Visibility.Collapsed, FileType = "Folder", FileImg = null, FilePath = (App.ViewModel.Universal.path + "\\" + input) });
App.ViewModel.RemoveFileOrFolder(BoxData);
App.ViewModel.AddFileOrFolder(new ListedItem(item.FolderRelativeId)
{
FileName = input,
FileDateReal = DateTimeOffset.Now,
EmptyImgVis = Visibility.Collapsed,
FolderImg = Visibility.Visible,
FileIconVis = Visibility.Collapsed,
FileType = "Folder",
FileImg = null,
FilePath = Path.Combine(App.ViewModel.Universal.path, input)
});
}
else
{
var item = await StorageFile.GetFileFromPathAsync(BoxData.FilePath);
await item.RenameAsync(input + BoxData.DotFileExtension, NameCollisionOption.FailIfExists);
App.ViewModel.FilesAndFolders.Remove(BoxData);
App.ViewModel.FilesAndFolders.Add(new ListedItem() { FileName = input, FileDate = "Now", EmptyImgVis = Visibility.Visible, FolderImg = Visibility.Collapsed, FileIconVis = Visibility.Collapsed, FileType = BoxData.FileType, FileImg = null, FilePath = (App.ViewModel.Universal.path + "\\" + input + BoxData.DotFileExtension), DotFileExtension = BoxData.DotFileExtension });

App.ViewModel.RemoveFileOrFolder(BoxData);
App.ViewModel.AddFileOrFolder(new ListedItem(item.FolderRelativeId)
{
FileName = input,
FileDateReal = DateTimeOffset.Now,
EmptyImgVis = Visibility.Visible,
FolderImg = Visibility.Collapsed,
FileIconVis = Visibility.Collapsed,
FileType = BoxData.FileType,
FileImg = null,
FilePath = Path.Combine(App.ViewModel.Universal.path, input + BoxData.DotFileExtension),
DotFileExtension = BoxData.DotFileExtension
});
}
}

Expand Down
7 changes: 2 additions & 5 deletions Files UWP/MainPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,8 @@ private void NavView_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationView sende
}
else
{
if(App.ViewModel.tokenSource != null)
{
App.ViewModel.tokenSource.Cancel();
App.ViewModel.FilesAndFolders.Clear();
}
App.ViewModel.CancelLoadAndClearFiles();

App.ViewModel.TextState.isVisible = Visibility.Collapsed;
if (item.ToString() == "Home")
{
Expand Down
26 changes: 6 additions & 20 deletions Files UWP/Navigation/NavigationActions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@ public class NavigationActions
{
public static void Back_Click(object sender, RoutedEventArgs e)
{
if(App.ViewModel.tokenSource != null)
{
App.ViewModel.tokenSource.Cancel();
}
App.ViewModel.FilesAndFolders.Clear();
App.ViewModel.CancelLoadAndClearFiles();

if (History.HistoryList.Count > 1)
{
Expand All @@ -24,7 +20,7 @@ public static void Back_Click(object sender, RoutedEventArgs e)
History.AddToForwardList(History.HistoryList[History.HistoryList.Count - 1]);
History.HistoryList.RemoveAt(History.HistoryList.Count - 1);

App.ViewModel.FilesAndFolders.Clear();
App.ViewModel.CancelLoadAndClearFiles();

// If the item we are navigating back to is a specific library, accomodate this.
if ((History.HistoryList[History.HistoryList.Count - 1]) == Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory))
Expand Down Expand Up @@ -160,19 +156,12 @@ public static void Back_Click(object sender, RoutedEventArgs e)

public static void Forward_Click(object sender, RoutedEventArgs e)
{

if(App.ViewModel.tokenSource != null)
{
App.ViewModel.tokenSource.Cancel();
}
App.ViewModel.FilesAndFolders.Clear();

App.ViewModel.CancelLoadAndClearFiles();

if (History.ForwardList.Count() > 0)
{
App.ViewModel.TextState.isVisible = Visibility.Collapsed;
App.ViewModel.FilesAndFolders.Clear();

App.ViewModel.CancelLoadAndClearFiles();

if ((History.ForwardList[History.ForwardList.Count() - 1]) == Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory))
{
Expand Down Expand Up @@ -313,12 +302,9 @@ public async static void Refresh_Click(object sender, RoutedEventArgs e)
{
await Windows.ApplicationModel.Core.CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
{
if(App.ViewModel.tokenSource != null)
{
App.ViewModel.tokenSource.Cancel();
}
App.ViewModel.CancelLoadAndClearFiles();

App.ViewModel.TextState.isVisible = Visibility.Collapsed;
App.ViewModel.FilesAndFolders.Clear();
App.ViewModel.AddItemsToCollectionAsync(App.ViewModel.Universal.path, GenericFileBrowser.GFBPageName);
if ((History.HistoryList[History.HistoryList.Count - 1]) == Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory))
{
Expand Down
Loading