Skip to content
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

Jump to bottom

Add ability to import all documents under the selected folder #40

Merged
merged 1 commit into from
Aug 28, 2022
Merged

Add ability to import all documents under the selected folder #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
88 changes: 72 additions & 16 deletions OnenoteAddin/RmDownloadForm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,12 @@ private async void btnOk_Click(object sender, EventArgs e)

try
{
bool success = await ImportDocument(rmTreeNode, mode, zoom, language);
bool success = await ImportSelection(rmTreeNode, mode, zoom, language);
Logger.LogMessage("Import " + (success ? "successful" : "failed"));
if (success)
{
Close();
}
}
catch (Exception err)
{
Expand All @@ -273,7 +277,7 @@ private async void btnOk_Click(object sender, EventArgs e)
}


private async Task<bool> ImportDocument(RmTreeNode rmTreeNode, ImportMode mode, double zoom = 50.0, string language = "en_US")
private async Task<bool> ImportSelection(RmTreeNode rmTreeNode, ImportMode mode, double zoom = 50.0, string language = "en_US")
{
Logger.LogMessage($"Saving settings: zoom: {zoom}, language: {language}");
Dictionary<string, string> configs = new Dictionary<string, string>();
Expand All @@ -285,21 +289,74 @@ private async Task<bool> ImportDocument(RmTreeNode rmTreeNode, ImportMode mode,

if (rmTreeNode.IsCollection)
{
MessageBox.Show(this, "Only document can be imported");
return false;
// build up list of all documents under this folder
List<RmItem> items = new List<RmItem>();
GetDocumentRecursive(rmTreeNode, ref items);

DialogResult dialogResult = MessageBox.Show($"Import all {items.Count} documents under this folder?", "Import folder", MessageBoxButtons.YesNo);
if (dialogResult == DialogResult.No)
{
return true;
}

// proceed with downloading all documents under folder
foreach (var item in items)
{
if (_cancellationSource.Token.IsCancellationRequested)
{
Logger.LogMessage($"Aborting import of multiple documents as cancellation is requested");
break;
}
if (!await ImportDocument(item, mode, zoom, language))
{
lblInfo.Text = $"Downloading \"{item.VissibleName}\"... Failed.\n Import stopped";
}
}

return true;
}
else
{
RmItem item = new RmItem()
{
Type = RmItem.DocumentType,
ID = rmTreeNode.ID,
VissibleName = rmTreeNode.VisibleName
};

return await ImportDocument(item, mode, zoom, language);
}
}

RmItem item = new RmItem();
item.Type = RmItem.DocumentType;
item.ID = rmTreeNode.ID;
item.VissibleName = rmTreeNode.VisibleName;
private void GetDocumentRecursive(RmTreeNode currNode, ref List<RmItem> items)
{
foreach (RmTreeNode childNode in currNode.Nodes)
{
if (childNode.IsCollection)
{
GetDocumentRecursive(childNode, ref items);
}
else
{
items.Add(new RmItem()
{
Type = RmItem.DocumentType,
ID = childNode.ID,
VissibleName = childNode.VisibleName
});
}
}
}

private async Task<bool> ImportDocument(RmItem item, ImportMode mode, double zoom, string language)
{
Logger.LogMessage($"importing {item.VissibleName}, id: {item.ID}");
List<RmPage> pages = new List<RmPage>();

lblInfo.Text = $"Downloading {rmTreeNode.VisibleName}...";
lblInfo.Text = $"Downloading \"{item.VissibleName}\"...";

Progress<string> progress = new Progress<string>((string updateText) => {
lblInfo.Invoke((Action)(() => lblInfo.Text = $"Getting document list:\n{updateText}"));
lblInfo.Invoke((Action)(() => lblInfo.Text = $"Downloading \"{item.VissibleName}\"...\n{updateText}"));
});

using (RmDownloadedDoc doc = await _rmDataSource.DownloadDocument(item, _cancellationSource.Token, progress))
Expand All @@ -314,11 +371,11 @@ private async Task<bool> ImportDocument(RmTreeNode rmTreeNode, ImportMode mode,
switch (mode)
{
case ImportMode.Text:
return await ImportContentAsText(pages, rmTreeNode.VisibleName, language);
return await ImportContentAsText(pages, item.VissibleName, language);
case ImportMode.Graphics:
return ImportContentAsGraphics(pages, rmTreeNode.VisibleName, zoom);
return ImportContentAsGraphics(pages, item.VissibleName, zoom);
case ImportMode.Both:
return await ImportContentAsBoth(pages, rmTreeNode.VisibleName, zoom, language);
return await ImportContentAsBoth(pages, item.VissibleName, zoom, language);
default:
Logger.LogMessage($"ImportDocument() - unknown import mode: {mode}");
break;
Expand All @@ -339,11 +396,11 @@ private async Task<bool> ImportContentAsText(List<RmPage> pages, string visibleN
{
Thread.Sleep(500);
}).Wait();
Close();
}
else
{
lblInfo.Text = "Digitising failed";
return false;
}
return true;
}
Expand Down Expand Up @@ -382,7 +439,6 @@ private bool ImportContentAsGraphics(List<RmPage> pages, string visibleName, dou
{
Thread.Sleep(500);
}).Wait();
Close();
return true;
}

Expand All @@ -396,7 +452,7 @@ private async Task<bool> ImportContentAsBoth(List<RmPage> pages, string visibleN
{
Logger.LogMessage($"ImportContentAsBoth() - got {textResults.Count} text results and {graphicsResults.Count} graphics results");
lblInfo.Text = $"Imported {visibleName} as both text and graphics encountered error.";
return true;
return false;
}

List<Tuple<string, Bitmap>> result = new List<Tuple<string, Bitmap>>(textResults.Count);
Expand Down