Skip to content

Better approach to finding Ace by Daisy (BL-15709) #7585

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

Draft
andrew-polk wants to merge 1 commit into
base: Version6.3
Choose a base branch
from
+68 −3
Draft

Better approach to finding Ace by Daisy (BL-15709) #7585

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
71 changes: 68 additions & 3 deletions src/BloomExe/web/controllers/AccessibilityCheckApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,17 @@ private void MakeAceByDaisyReport(ApiRequest request)
var randomName = Guid.NewGuid().ToString();
var reportDirectory = Path.Combine(reportRootDirectory, randomName);

var arguments = $"ace.js --verbose -o \"{reportDirectory}\" \"{epubPath}\"";
string command = "node";
string arguments = $"ace.js --verbose -o \"{reportDirectory}\" \"{epubPath}\"";
string workingDirectory = daisyDirectory;

if (RobustFile.Exists(daisyDirectory))
{
command = daisyDirectory;
arguments = $"--verbose -o \"{reportDirectory}\" \"{epubPath}\"";
workingDirectory = Path.GetDirectoryName(reportDirectory);
}

const int kSecondsBeforeTimeout = 60;
var progress = new NullProgress();
_webSocketProgress.MessageWithoutLocalizing("Running Ace by DAISY");
Expand All @@ -294,10 +304,10 @@ private void MakeAceByDaisyReport(ApiRequest request)
ldpath = Environment.GetEnvironmentVariable("LD_LIBRARY_PATH");
Environment.SetEnvironmentVariable("LD_LIBRARY_PATH", null);
res = CommandLineRunnerExtra.RunWithInvariantCulture(
"node",
command,
arguments,
Encoding.UTF8,
daisyDirectory,
workingDirectory,
kSecondsBeforeTimeout,
progress,
(dummy) => { }
Expand Down Expand Up @@ -357,6 +367,32 @@ private void MakeAceByDaisyReport(ApiRequest request)

private (string version, bool old) GetAceByDaisyVersion(string daisyDirectory)
{
if (RobustFile.Exists(daisyDirectory))
{
var result = CommandLineRunnerExtra.RunWithInvariantCulture(
daisyDirectory,
"--version",
Encoding.ASCII,
"",
5,
new NullProgress()
);
if (result.ExitCode == 0 && !string.IsNullOrWhiteSpace(result.StandardOutput))
{
var versionString = result.StandardOutput.Trim();
var match = new Regex(@"(\d+)\.(\d+)").Match(versionString);
if (match.Success)
{
var old =
int.Parse(match.Groups[1].Value) * 100
+ int.Parse(match.Groups[2].Value)
< 102;
return (versionString, old);
}
return (versionString, false);
}
}

try
{
// The path typically ends in something like \ace\bin\, at least on Windows.
Expand Down Expand Up @@ -403,6 +439,35 @@ private string FindAceByDaisyOrTellUser(ApiRequest request)
{
_webSocketProgress.Message("FindingAce", "Finding Ace by DAISY on this computer...");
var whereProgram = Platform.IsWindows ? "where" : "which";

var whereAceResult = CommandLineRunnerExtra.RunWithInvariantCulture(
whereProgram,
"ace",
Encoding.ASCII,
"",
2,
new NullProgress()
);
if (
string.IsNullOrEmpty(whereAceResult.StandardError)
&& !string.IsNullOrEmpty(whereAceResult.StandardOutput)
)
{
var lines = whereAceResult.StandardOutput.Split(
new[] { '\n', '\r' },
StringSplitOptions.RemoveEmptyEntries
);
if (lines.Length > 0)
{
var path = lines[0].Trim();
if (RobustFile.Exists(path))
{
_webSocketProgress.Message("FoundAce", "Found.");
return path;
}
}
}

var npmFileName = Platform.IsWindows ? "npm.cmd" : "npm";
var whereResult = CommandLineRunnerExtra.RunWithInvariantCulture(
whereProgram,
Expand Down