Merge pull request #6 from vibe-d/filecache_fix

Make destruction of CachedFileStream.CTX deterministic

run-ci.sh

@@ -21,7 +21,7 @@ fi
 
 dub test $DUB_FLAGS
 
-if [ "$OS" == "macOS-latest" ]; then
+if [ "$OS" == "macOS-13" ]; then
     dub test :tls -c openssl-1.1 $DUB_FLAGS
     DUB_FLAGS="$DUB_FLAGS --override-config vibe-stream:tls/openssl-1.1"
 else

source/vibe/stream/cached.d

@@ -57,6 +57,7 @@ struct CachedFileStream(InputStream)
 	enum outputStreamVersion = 2;
 
 	private static struct CTX {
+		int refCount;
 		InputStream source;
 		FileStream cachedFile;
 		ulong readPtr;
@@ -72,6 +73,7 @@ struct CachedFileStream(InputStream)
 	private this(InputStream source, bool writable, NativePath cached_file_path)
 	{
 		m_ctx = new CTX;
+		m_ctx.refCount = 1;
 		m_ctx.source = source;
 		m_ctx.canWrite = writable;
 		m_ctx.size = source.leastSize;
@@ -82,6 +84,19 @@ struct CachedFileStream(InputStream)
 		} else m_ctx.cachedFile = openFile(cached_file_path, FileMode.createTrunc);
 	}
 
+	this(this)
+	{
+		if (m_ctx) m_ctx.refCount++;
+	}
+
+	~this()
+	{
+		if (m_ctx) {
+			if (--m_ctx.refCount == 0)
+				close();
+		}
+	}
+
 	@property int fd() const nothrow { return m_ctx.cachedFile.fd; }
 	@property NativePath path() const nothrow { return m_ctx.cachedFile.path; }
 	@property bool isOpen() const nothrow { return m_ctx && m_ctx.cachedFile.isOpen; }