mirror of https://github.com/adamdruppe/arsd.git
huge improvements to ListWidget and FilePicker on custom widgets. ScrollableWidget now set for deprecation pending removal
This commit is contained in:
Adam D. Ruppe
parent
be8453fc92
commit
2fe1b06e4f
278
core.d
278
core.d
|
|
@ -271,6 +271,61 @@ auto ref T castTo(T, S)(auto ref S v) {
|
|||
///
|
||||
alias typeCast = castTo;
|
||||
|
||||
/++
|
||||
Does math as a 64 bit number, but saturates at int.min and int.max when converting back to a 32 bit int.
|
||||
|
||||
History:
|
||||
Added January 1, 2025
|
||||
+/
|
||||
alias NonOverflowingInt = NonOverflowingIntBase!(int.min, int.max);
|
||||
|
||||
/// ditto
|
||||
alias NonOverflowingUint = NonOverflowingIntBase!(0, int.max);
|
||||
|
||||
/// ditto
|
||||
struct NonOverflowingIntBase(int min, int max) {
|
||||
this(long v) {
|
||||
this.value = v;
|
||||
}
|
||||
|
||||
private long value;
|
||||
|
||||
NonOverflowingInt opBinary(string op)(long rhs) {
|
||||
return NonOverflowingInt(mixin("this.value", op, "rhs"));
|
||||
}
|
||||
NonOverflowingInt opBinary(string op)(NonOverflowingInt rhs) {
|
||||
return this.opBinary!op(rhs.value);
|
||||
}
|
||||
NonOverflowingInt opUnary(string op)() {
|
||||
return NonOverflowingInt(mixin(op, "this.value"));
|
||||
}
|
||||
NonOverflowingInt opOpAssign(string op)(long rhs) {
|
||||
return this = this.opBinary!(op)(rhs);
|
||||
}
|
||||
NonOverflowingInt opOpAssign(string op)(NonOverflowingInt rhs) {
|
||||
return this = this.opBinary!(op)(rhs.value);
|
||||
}
|
||||
|
||||
int getValue() const {
|
||||
if(value < min)
|
||||
return min;
|
||||
else if(value > max)
|
||||
return max;
|
||||
return cast(int) value;
|
||||
}
|
||||
|
||||
alias getValue this;
|
||||
}
|
||||
|
||||
unittest {
|
||||
assert(-5.NonOverflowingInt - int.max == int.min);
|
||||
assert(-5.NonOverflowingInt + 5 == 0);
|
||||
|
||||
assert(NonOverflowingInt(5) + int.max - 5 == int.max);
|
||||
assert(NonOverflowingInt(5) + int.max - int.max - 5 == 0); // it truncates at the end of the op chain, not at intermediates
|
||||
assert(NonOverflowingInt(0) + int.max * 2L == int.max); // note the L there is required to pass since the order of operations means mul done before it gets to the NonOverflowingInt controls
|
||||
}
|
||||
|
||||
// enum stringz : const(char)* { init = null }
|
||||
|
||||
/++
|
||||
|
|
@ -1758,7 +1813,7 @@ private auto toDelegate(T)(T t) {
|
|||
else static assert(0, "could not get return value");
|
||||
}
|
||||
|
||||
unittest {
|
||||
@system unittest {
|
||||
int function(int) fn;
|
||||
fn = (a) { return a; };
|
||||
|
||||
|
|
@ -3002,6 +3057,23 @@ package(arsd) class CallbackHelper {
|
|||
}
|
||||
}
|
||||
|
||||
inout(char)[] trimSlashesRight(inout(char)[] txt) {
|
||||
//if(txt.length && (txt[0] == '/' || txt[0] == '\\'))
|
||||
//txt = txt[1 .. $];
|
||||
|
||||
if(txt.length && (txt[$-1] == '/' || txt[$-1] == '\\'))
|
||||
txt = txt[0 .. $-1];
|
||||
|
||||
return txt;
|
||||
}
|
||||
|
||||
enum TreatAsWindowsPath {
|
||||
guess,
|
||||
ifVersionWindows,
|
||||
yes,
|
||||
no,
|
||||
}
|
||||
|
||||
// FIXME add uri from cgi/http2 and make sure the relative methods are reasonable compatible
|
||||
|
||||
/++
|
||||
|
|
@ -3016,15 +3088,15 @@ struct FilePath {
|
|||
this.path = path;
|
||||
}
|
||||
|
||||
bool isNull() {
|
||||
bool isNull() const {
|
||||
return path is null;
|
||||
}
|
||||
|
||||
bool opCast(T:bool)() {
|
||||
bool opCast(T:bool)() const {
|
||||
return !isNull;
|
||||
}
|
||||
|
||||
string toString() {
|
||||
string toString() const {
|
||||
return path;
|
||||
}
|
||||
|
||||
|
|
@ -3034,12 +3106,138 @@ struct FilePath {
|
|||
/+ String analysis +/
|
||||
/+ +++++++++++++++++ +/
|
||||
|
||||
/+
|
||||
bool isAbsolute() {
|
||||
FilePath makeAbsolute(FilePath base, TreatAsWindowsPath treatAsWindowsPath = TreatAsWindowsPath.guess) const {
|
||||
if(base.path.length == 0)
|
||||
return this.removeExtraParts();
|
||||
if(base.path[$-1] != '/' && base.path[$-1] != '\\')
|
||||
base.path ~= '/';
|
||||
|
||||
bool isWindowsPath;
|
||||
final switch(treatAsWindowsPath) {
|
||||
case TreatAsWindowsPath.guess:
|
||||
case TreatAsWindowsPath.yes:
|
||||
isWindowsPath = true;
|
||||
break;
|
||||
case TreatAsWindowsPath.no:
|
||||
isWindowsPath = false;
|
||||
break;
|
||||
case TreatAsWindowsPath.ifVersionWindows:
|
||||
version(Windows)
|
||||
isWindowsPath = true;
|
||||
else
|
||||
isWindowsPath = false;
|
||||
break;
|
||||
}
|
||||
if(isWindowsPath) {
|
||||
if(this.isUNC)
|
||||
return this.removeExtraParts();
|
||||
if(this.driveName)
|
||||
return this.removeExtraParts();
|
||||
if(this.path.length >= 1 && (this.path[0] == '/' || this.path[0] == '\\')) {
|
||||
// drive-relative path, take the drive from the base
|
||||
return FilePath(base.driveName ~ this.path).removeExtraParts();
|
||||
}
|
||||
// otherwise, take the dir name from the base and add us onto it
|
||||
return FilePath(base.directoryName ~ this.path).removeExtraParts();
|
||||
} else {
|
||||
if(this.path.length >= 1 && this.path[0] == '/')
|
||||
return this.removeExtraParts();
|
||||
else
|
||||
return FilePath(base.directoryName ~ this.path).removeExtraParts();
|
||||
}
|
||||
}
|
||||
|
||||
string driveName() {
|
||||
// dg returns true to continue, false to break
|
||||
void foreachPathComponent(scope bool delegate(size_t index, in char[] component) dg) const {
|
||||
size_t start;
|
||||
size_t skip;
|
||||
if(isUNC()) {
|
||||
dg(start, this.path[start .. 2]);
|
||||
start = 2;
|
||||
skip = 2;
|
||||
}
|
||||
foreach(idx, ch; this.path) {
|
||||
if(skip) { skip--; continue; }
|
||||
if(ch == '/' || ch == '\\') {
|
||||
if(!dg(start, this.path[start .. idx + 1]))
|
||||
return;
|
||||
start = idx + 1;
|
||||
}
|
||||
}
|
||||
if(start != path.length)
|
||||
dg(start, this.path[start .. $]);
|
||||
}
|
||||
|
||||
// remove cases of // or /. or /.. Only valid to call this on an absolute path.
|
||||
private FilePath removeExtraParts() const {
|
||||
bool changeNeeded;
|
||||
foreachPathComponent((idx, component) {
|
||||
auto name = component.trimSlashesRight;
|
||||
if(name.length == 0 && idx != 0)
|
||||
changeNeeded = true;
|
||||
if(name == "." || name == "..")
|
||||
changeNeeded = true;
|
||||
return !changeNeeded;
|
||||
});
|
||||
|
||||
if(!changeNeeded)
|
||||
return this;
|
||||
|
||||
string newPath;
|
||||
foreachPathComponent((idx, component) {
|
||||
auto name = component.trimSlashesRight;
|
||||
if(component == `\\`) // must preserve unc paths
|
||||
newPath ~= component;
|
||||
else if(name.length == 0 && idx != 0)
|
||||
{}
|
||||
else if(name == ".")
|
||||
{}
|
||||
else if(name == "..") {
|
||||
// remove the previous component, unless it is the first component
|
||||
auto sofar = FilePath(newPath);
|
||||
size_t previousComponentIndex;
|
||||
sofar.foreachPathComponent((idx2, component2) {
|
||||
if(idx2 != newPath.length)
|
||||
previousComponentIndex = idx2;
|
||||
return true;
|
||||
});
|
||||
|
||||
if(previousComponentIndex && previousComponentIndex != newPath.length) {
|
||||
newPath = newPath[0 .. previousComponentIndex];
|
||||
//newPath.assumeSafeAppend();
|
||||
}
|
||||
} else {
|
||||
newPath ~= component;
|
||||
}
|
||||
|
||||
return true;
|
||||
});
|
||||
|
||||
return FilePath(newPath);
|
||||
}
|
||||
|
||||
// assuming we're looking at a Windows path...
|
||||
bool isUNC() const {
|
||||
return (path.length > 2 && path[0 .. 2] == `\\`);
|
||||
}
|
||||
|
||||
// assuming we're looking at a Windows path...
|
||||
string driveName() const {
|
||||
if(path.length < 2)
|
||||
return null;
|
||||
if((path[0] >= 'A' && path[0] <= 'Z') || (path[0] >= 'a' && path[0] <= 'z')) {
|
||||
if(path[1] == ':') {
|
||||
if(path.length == 2 || path[2] == '\\' || path[2] == '/')
|
||||
return path[0 .. 2];
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/+
|
||||
bool isAbsolute() {
|
||||
if(path.length && path[0] == '/')
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -3047,10 +3245,6 @@ struct FilePath {
|
|||
|
||||
}
|
||||
|
||||
FilePath makeAbsolute(FilePath base) {
|
||||
|
||||
}
|
||||
|
||||
bool matchesGlobPattern(string globPattern) {
|
||||
|
||||
}
|
||||
|
|
@ -3161,6 +3355,60 @@ unittest {
|
|||
assert(fn.directoryName == "dir/");
|
||||
assert(fn.filename == "");
|
||||
assert(fn.extension is null);
|
||||
|
||||
assert(fn.makeAbsolute(FilePath("/")).path == "/dir/");
|
||||
assert(fn.makeAbsolute(FilePath("file.txt")).path == "file.txt/dir/"); // FilePaths as a base are ALWAYS treated as a directory
|
||||
assert(FilePath("file.txt").makeAbsolute(fn).path == "dir/file.txt");
|
||||
|
||||
assert(FilePath("c:/file.txt").makeAbsolute(FilePath("d:/")).path == "c:/file.txt");
|
||||
assert(FilePath("../file.txt").makeAbsolute(FilePath("d:/")).path == "d:/file.txt");
|
||||
|
||||
assert(FilePath("../file.txt").makeAbsolute(FilePath("d:/foo")).path == "d:/file.txt");
|
||||
assert(FilePath("../file.txt").makeAbsolute(FilePath("d:/")).path == "d:/file.txt");
|
||||
assert(FilePath("../file.txt").makeAbsolute(FilePath("/home/me")).path == "/home/file.txt");
|
||||
assert(FilePath("../file.txt").makeAbsolute(FilePath(`\\arsd\me`)).path == `\\arsd\file.txt`);
|
||||
assert(FilePath("../../file.txt").makeAbsolute(FilePath("/home/me")).path == "/file.txt");
|
||||
assert(FilePath("../../../file.txt").makeAbsolute(FilePath("/home/me")).path == "/file.txt");
|
||||
|
||||
assert(FilePath("test/").makeAbsolute(FilePath("/home/me/")).path == "/home/me/test/");
|
||||
assert(FilePath("/home/me/test/").makeAbsolute(FilePath("/home/me/test/")).path == "/home/me/test/");
|
||||
}
|
||||
|
||||
version(HasFile)
|
||||
/++
|
||||
History:
|
||||
Added January 2, 2024
|
||||
+/
|
||||
FilePath getCurrentWorkingDirectory() {
|
||||
version(Windows) {
|
||||
wchar[256] staticBuffer;
|
||||
wchar[] buffer = staticBuffer[];
|
||||
|
||||
try_again:
|
||||
auto ret = GetCurrentDirectoryW(cast(DWORD) buffer.length, buffer.ptr);
|
||||
if(ret == 0)
|
||||
throw new WindowsApiException("GetCurrentDirectoryW", GetLastError());
|
||||
if(ret < buffer.length) {
|
||||
return FilePath(makeUtf8StringFromWindowsString(buffer[0 .. ret]));
|
||||
} else {
|
||||
buffer.length = ret;
|
||||
goto try_again;
|
||||
}
|
||||
} else version(Posix) {
|
||||
char[128] staticBuffer;
|
||||
char[] buffer = staticBuffer[];
|
||||
|
||||
try_again:
|
||||
auto ret = getcwd(buffer.ptr, buffer.length);
|
||||
if(ret is null && errno == ERANGE && buffer.length < 4096 / 2) {
|
||||
buffer.length = buffer.length * 2;
|
||||
goto try_again;
|
||||
} else if(ret is null) {
|
||||
throw new ErrnoApiException("getcwd", errno);
|
||||
}
|
||||
return FilePath(stringz(ret).borrow.idup);
|
||||
} else
|
||||
assert(0, "Not implemented");
|
||||
}
|
||||
|
||||
/+
|
||||
|
|
@ -5045,6 +5293,14 @@ version(HasFile) GetFilesResult getFiles(string directory, scope void delegate(s
|
|||
|
||||
string name = makeUtf8StringFromWindowsString(data.cFileName[0 .. findIndexOfZero(data.cFileName[])]);
|
||||
|
||||
/+
|
||||
FILETIME ftLastWriteTime;
|
||||
DWORD nFileSizeHigh;
|
||||
DWORD nFileSizeLow;
|
||||
|
||||
but these not available on linux w/o statting each file!
|
||||
+/
|
||||
|
||||
dg(name, (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? true : false);
|
||||
|
||||
auto ret = FindNextFileW(handle, &data);
|
||||
|
|
|
|||
Loading…
Reference in New Issue