Fix handling of unofficial parts when there is no LDraw directory

tcobbs · tcobbs · commit 08664968d48b · 2025-05-10T22:18:20.000-07:00
diff --git a/Help.html b/Help.html
@@ -1754,17 +1754,17 @@ <h3><a name="3dsExport">3D-Studio file:</a></h3>
 scanned for unofficial parts.<br/>
 You can type in a path, or hit the <i>Browse...</i> button. If you type in a
 path that doesn't resolve to a zip file, you will get an error when you apply
-your preferences changes.
+your preferences changes.<br/>
+If you do not also specify an LDraw Folder, LDView will create an Unofficial
+directory alongside the zip file if Unofficial parts are automatically
+downloaded.
 </p>
 <p>
 <i>LDraw Folder</i><br/>
 This allows you to manually select the LDraw folder.<br/>
 You can type in a path, or hit the <i>Browse...</i> button. If you type in a
 path that isn't an LDraw folder, you will get an error when you apply your
-preferences changes.<br/>
-Note that if you specify an LDraw Zip, the LDraw Folder is no longer required to
-have parts and p subdirectories. It still must be valid, though, since that is
-where automatically downloaded unofficial parts will be placed.
+preferences changes.
 </p>
 <p>
 <i><a name="ExtraDirs">Extra Search Folders/Directories</a></i><br/>
diff --git a/LDLib/LDrawModelViewer.cpp b/LDLib/LDrawModelViewer.cpp
@@ -4046,8 +4046,8 @@ void LDrawModelViewer::findFileAlertCallback(LDLFindFileAlert *alert)
 	// below).
 	std::string lfilename = alert->getFilename();
 	std::string url;
-	std::string partOutputFilename = LDLModel::lDrawDir();
-	std::string primOutputFilename = LDLModel::lDrawDir();
+	std::string partOutputFilename = LDLModel::unofficialDir();
+	std::string primOutputFilename = LDLModel::unofficialDir();
 	bool primitive = false;
 	bool part = false;
 	std::string partUrlBase = libraryUrl("library/unofficial/parts/");
@@ -4057,8 +4057,8 @@ void LDrawModelViewer::findFileAlertCallback(LDLFindFileAlert *alert)
 
 	replaceStringCharacter(partOutputFilename, '\\', '/');
 	replaceStringCharacter(primOutputFilename, '\\', '/');
-	partOutputFilename += "/Unofficial/parts/";
-	primOutputFilename += "/Unofficial/p/";
+	partOutputFilename += "/parts/";
+	primOutputFilename += "/p/";
 	convertStringToLower(lfilename);
 	replaceStringCharacter(lfilename, '\\', '/');
 	if (stringHasPrefix(lfilename, "48/"))
diff --git a/LDLoader/LDLModel.cpp b/LDLoader/LDLModel.cpp
@@ -495,8 +495,11 @@ time_t LDLModel::getLocalTimestamp(const std::string& lfilename)
 	}
 	if (localTimestamp == 0)
 	{
-		std::string base;
-		combinePath(lDrawDir(), "Unofficial", base);
+		std::string base = unofficialDir();
+		if (base.empty())
+		{
+			return localTimestamp;
+		}
 		std::string path;
 		combinePath(base, lfilename, path);
 		localTimestamp = getFileTimestamp(path);
@@ -1199,6 +1202,23 @@ const char* LDLModel::lDrawDir(bool defaultValue /*= false*/)
 	}
 }
 
+// NOTE: static function.
+std::string LDLModel::unofficialDir(void)
+{
+	std::string dir(lDrawDir());
+	if (dir.empty() && !sm_ldrawZipPath.empty())
+	{
+		dir = directoryFromPath(sm_ldrawZipPath.c_str());
+	}
+	if (dir.empty())
+	{
+		return dir;
+	}
+	std::string result;
+	combinePath(dir.c_str(), "Unofficial", result);
+	return result;
+}
+
 void LDLModel::readComment(LDLCommentLine *commentLine)
 {
 	std::string filename;
diff --git a/LDLoader/LDLModel.h b/LDLoader/LDLModel.h
@@ -125,6 +125,7 @@ class LDLModel : public TCAlertSender
 	virtual int loadMpdTexmaps(void);
 	
 	static const char *lDrawDir(bool defaultValue = false);
+	static std::string unofficialDir(void);
 	static void setLDrawDir(const char *value);
 	static const std::string& ldrawZipPath(void);
 	static bool setLDrawZipPath(const std::string& value);
