...

lib/web/site/factory.v

@@ -3,7 +3,7 @@ module site
 import incubaid.herolib.core.texttools
 
 __global (
-	websites map[string]&Site
+	mywebsites map[string]&Site
 )
 
 @[params]
@@ -15,7 +15,13 @@ pub mut:
 pub fn new(args FactoryArgs) !&Site {
 	name := texttools.name_fix(args.name)
 
-	websites[name] = &Site{
+	// Check if a site with this name already exists
+	if name in mywebsites {
+		// Return the existing site instead of creating a new one
+		return get(name: name)!
+	}
+
+	mywebsites[name] = &Site{
 		siteconfig: SiteConfig{
 			name: name
 		}
@@ -25,18 +31,17 @@ pub fn new(args FactoryArgs) !&Site {
 
 pub fn get(args FactoryArgs) !&Site {
 	name := texttools.name_fix(args.name)
-	mut sc := websites[name] or { return error('siteconfig with name "${name}" does not exist') }
+	mut sc := mywebsites[name] or { return error('siteconfig with name "${name}" does not exist') }
 	return sc
 }
 
 pub fn exists(args FactoryArgs) bool {
 	name := texttools.name_fix(args.name)
-	mut sc := websites[name] or { return false }
-	return true
+	return name in mywebsites
 }
 
 pub fn default() !&Site {
-	if websites.len == 0 {
+	if mywebsites.len == 0 {
 		return new(name: 'default')!
 	}
 	return get()!
@@ -44,5 +49,5 @@ pub fn default() !&Site {
 
 // list returns all site names that have been created
 pub fn list() []string {
-	return websites.keys()
+	return mywebsites.keys()
 }