refactor file operations

dlanguilib.visualdproj

@@ -294,6 +294,7 @@
     <Folder name="core">
      <File path="src\dlangui\core\collections.d" />
      <File path="src\dlangui\core\events.d" />
+     <File path="src\dlangui\core\files.d" />
      <File path="src\dlangui\core\i18n.d" />
      <File path="src\dlangui\core\linestream.d" />
      <File path="src\dlangui\core\logger.d" />

src/dlangui/all.d

@@ -63,3 +63,4 @@ public import dlangui.widgets.tree;
 public import dlangui.widgets.combobox;
 public import dlangui.graphics.fonts;
 public import dlangui.core.i18n;
+public import dlangui.core.files;

src/dlangui/core/i18n.d

@@ -58,6 +58,7 @@ module dlangui.core.i18n;
 
 import dlangui.core.types;
 import dlangui.core.logger;
+import dlangui.core.files;
 private import dlangui.core.linestream;
 private import std.utf;
 private import std.algorithm;

src/dlangui/core/types.d

@@ -390,82 +390,3 @@ dchar dcharToUpper(dchar ch) {
 	return ch;
 }
 
-version (Windows) {
-    /// path delimiter (\ for windows, / for others)
-    immutable char PATH_DELIMITER = '\\';
-} else {
-    /// path delimiter (\ for windows, / for others)
-    immutable char PATH_DELIMITER = '/';
-}
-
-/** returns true if char ch is / or \ slash */
-bool isPathDelimiter(char ch) {
-    return ch == '/' || ch == '\\';
-}
-
-/** returns current executable path only, including last path delimiter */
-@property string exePath() {
-    import std.file;
-    string path = thisExePath();
-    int lastSlash = 0;
-    for (int i = 0; i < path.length; i++)
-        if (path[i] == PATH_DELIMITER)
-            lastSlash = i;
-    return path[0 .. lastSlash + 1];
-}
-
-/// converts path delimiters to standard for platform inplace in buffer(e.g. / to \ on windows, \ to / on posix), returns buf
-char[] convertPathDelimiters(char[] buf) {
-    foreach(ref ch; buf) {
-        version (Windows) {
-            if (ch == '/')
-                ch = '\\';
-        } else {
-            if (ch == '\\')
-                ch = '/';
-        }
-    }
-    return buf;
-}
-
-/** converts path delimiters to standard for platform (e.g. / to \ on windows, \ to / on posix) */
-string convertPathDelimiters(string src) {
-    char[] buf = src.dup;
-    return cast(string)convertPathDelimiters(buf);
-}
-
-/** appends file path parts with proper delimiters e.g. appendPath("/home/user", ".myapp", "config") => "/home/user/.myapp/config" */
-string appendPath(string[] pathItems ...) {
-    char[] buf;
-    foreach (s; pathItems) {
-        if (buf.length && !isPathDelimiter(buf[$-1]))
-            buf ~= PATH_DELIMITER;
-        buf ~= s;
-    }
-    return convertPathDelimiters(buf).dup;
-}
-
-/**  appends file path parts with proper delimiters (as well converts delimiters inside path to system) to buffer e.g. appendPath("/home/user", ".myapp", "config") => "/home/user/.myapp/config" */
-char[] appendPath(char[] buf, string[] pathItems ...) {
-    foreach (s; pathItems) {
-        if (buf.length && !isPathDelimiter(buf[$-1]))
-            buf ~= PATH_DELIMITER;
-        buf ~= s;
-    }
-    return convertPathDelimiters(buf);
-}
-
-/** split path into elements, e.g. /home/user/dir1 -> ["home", "user", "dir1"], "c:\dir1\dir2" -> ["c:", "dir1", "dir2"] */
-string[] splitPath(string path) {
-	string[] res;
-	int start = 0;
-	for (int i = 0; i <= path.length; i++) {
-		char ch = i < path.length ? path[i] : 0;
-		if (ch == '\\' || ch == '/' || ch == 0) {
-			if (start < i)
-				res ~= path[start .. i].dup;
-			start = i + 1;
-		}
-	}
-	return res;
-}

src/dlangui/dialogs/filedlg.d

@@ -26,6 +26,7 @@ module dlangui.dialogs.filedlg;
 import dlangui.core.events;
 import dlangui.core.i18n;
 import dlangui.core.stdaction;
+import dlangui.core.files;
 import dlangui.widgets.controls;
 import dlangui.widgets.lists;
 import dlangui.widgets.popup;

src/dlangui/platforms/sdl/sdlapp.d

@@ -28,6 +28,7 @@ import std.file;
 
 import dlangui.core.logger;
 import dlangui.core.events;
+import dlangui.core.files;
 import dlangui.graphics.drawbuf;
 import dlangui.graphics.fonts;
 import dlangui.graphics.ftfonts;

src/dlangui/platforms/windows/winapp.d

@@ -39,6 +39,7 @@ import dlangui.graphics.drawbuf;
 import dlangui.graphics.images;
 import dlangui.graphics.fonts;
 import dlangui.core.logger;
+import dlangui.core.files;
 
 version (USE_OPENGL) {
     import dlangui.graphics.glsupport;

src/dlangui/platforms/x11/x11app.d

@@ -1,6 +1,28 @@
+// Written in the D programming language.
+
+/**
+
+This module contains implementation of Win32 platform support
+
+Provides XCB platform and window classes.
+
+Usually you don't need to use this module directly.
+
+NOTE: Current implementation of XCB backend does not work well. Consider using of SDL2 backend instead.
+
+Synopsis:
+
+----
+import dlangui.platforms.x11.x11app;
+----
+
+Copyright: Vadim Lopatin, 2014
+License:   Boost License 1.0
+Authors:   Vadim Lopatin, coolreader.org@gmail.com
+*/
 module src.dlangui.platforms.x11.x11app;
 
-version(USE_XCB) {
+version(USE_XCB):
 
 import std.string;
 import std.c.linux.X11.xcb.xcb;
@@ -14,6 +36,7 @@ version(USE_XCB) {
 
 import dlangui.core.logger;
 import dlangui.core.events;
+import dlangui.core.files;
 import dlangui.graphics.drawbuf;
 import dlangui.graphics.fonts;
 import dlangui.graphics.ftfonts;
@@ -1169,5 +1192,3 @@ version(USE_XCB) {
 
 	return res;
 }
-
-}