tools: handle paths in vcreate more gracefully (#19870)

vlang · Nov 14, 2023 · bf120cc · bf120cc
1 parent e4bae91
commit bf120cc
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 25 deletions.
diff --git a/cmd/tools/vcreate/project_model_bin.v b/cmd/tools/vcreate/project_model_bin.v
@@ -1,8 +1,11 @@
 module main
 
+import os
+
 fn (mut c Create) set_bin_project_files() {
+	main_path := os.join_path('src', 'main.v')
 	c.files << ProjectFiles{
-		path: if c.new_dir { '${c.name}/src/main.v' } else { 'src/main.v' }
+		path: if c.new_dir { os.join_path(c.name, main_path) } else { main_path }
 		content: "module main
 
 fn main() {

diff --git a/cmd/tools/vcreate/project_model_lib.v b/cmd/tools/vcreate/project_model_lib.v
@@ -1,8 +1,10 @@
 module main
 
+import os
+
 fn (mut c Create) set_lib_project_files() {
 	c.files << ProjectFiles{
-		path: '${c.name}/src/${c.name}.v'
+		path: os.join_path(c.name, 'src', c.name + '.v')
 		content: 'module ${c.name}
 
 // square calculates the second power of `x`
@@ -12,7 +14,7 @@ pub fn square(x int) int {
 '
 	}
 	c.files << ProjectFiles{
-		path: '${c.name}/tests/square_test.v'
+		path: os.join_path(c.name, 'tests', 'square_test.v')
 		content: 'import ${c.name}
 
 fn test_square() {

diff --git a/cmd/tools/vcreate/project_model_web.v b/cmd/tools/vcreate/project_model_web.v
@@ -1,8 +1,10 @@
 module main
 
+import os { join_path }
+
 fn (mut c Create) set_web_project_files() {
 	c.files << ProjectFiles{
-		path: '${c.name}/src/databases/config_databases_sqlite.v'
+		path: join_path(c.name, 'src', 'databases', 'config_databases_sqlite.v')
 		content: "module databases
 
 import db.sqlite // can change to 'db.mysql', 'db.pg'
@@ -14,7 +16,7 @@ pub fn create_db_connection() !sqlite.DB {
 "
 	}
 	c.files << ProjectFiles{
-		path: '${c.name}/src/templates/header_component.html'
+		path: join_path(c.name, 'src', 'templates', 'header_component.html')
 		content: "<nav>
 	<div class='nav-wrapper'>
 		<a href='javascript:window.history.back();' class='left'>
@@ -33,7 +35,7 @@ pub fn create_db_connection() !sqlite.DB {
 "
 	}
 	c.files << ProjectFiles{
-		path: '${c.name}/src/templates/products.css'
+		path: join_path(c.name, 'src', 'templates', 'products.css')
 		content: 'h1.title {
 	font-family: Arial, Helvetica, sans-serif;
 	color: #3b7bbf;
@@ -47,7 +49,7 @@ div.products-table {
 }'
 	}
 	c.files << ProjectFiles{
-		path: '${c.name}/src/templates/products.html'
+		path: join_path(c.name, 'src', 'templates', 'products.html')
 		content: "<!DOCTYPE html>
 <html>
 <head>
@@ -144,7 +146,7 @@ div.products-table {
 </html>"
 	}
 	c.files << ProjectFiles{
-		path: '${c.name}/src/auth_controllers.v'
+		path: join_path(c.name, 'src', 'auth_controllers.v')
 		content: "module main
 
 import vweb
@@ -161,7 +163,7 @@ pub fn (mut app App) controller_auth(username string, password string) vweb.Resu
 "
 	}
 	c.files << ProjectFiles{
-		path: '${c.name}/src/auth_dto.v'
+		path: join_path(c.name, 'src', 'auth_dto.v')
 		content: 'module main
 
 struct AuthRequestDto {
@@ -171,7 +173,7 @@ struct AuthRequestDto {
 '
 	}
 	c.files << ProjectFiles{
-		path: '${c.name}/src/auth_services.v'
+		path: join_path(c.name, 'src', 'auth_services.v')
 		content: "module main
 
 import crypto.hmac
@@ -266,7 +268,7 @@ fn auth_verify(token string) bool {
 "
 	}
 	c.files << ProjectFiles{
-		path: '${c.name}/src/index.html'
+		path: join_path(c.name, 'src', 'index.html')
 		content: "<!DOCTYPE html>
 <html>
 <head>
@@ -345,7 +347,7 @@ fn auth_verify(token string) bool {
 "
 	}
 	c.files << ProjectFiles{
-		path: '${c.name}/src/main.v'
+		path: join_path(c.name, 'src', 'main.v')
 		content: "module main
 
 import vweb
@@ -390,7 +392,7 @@ pub fn (mut app App) index() vweb.Result {
 "
 	}
 	c.files << ProjectFiles{
-		path: '${c.name}/src/product_controller.v'
+		path: join_path(c.name, 'src', 'product_controller.v')
 		content: "module main
 
 import vweb
@@ -456,7 +458,7 @@ pub fn (mut app App) controller_create_product(product_name string) vweb.Result
 "
 	}
 	c.files << ProjectFiles{
-		path: '${c.name}/src/product_entities.v'
+		path: join_path(c.name, 'src', 'product_entities.v')
 		content: "module main
 
 [table: 'products']
@@ -469,7 +471,7 @@ struct Product {
 "
 	}
 	c.files << ProjectFiles{
-		path: '${c.name}/src/product_service.v'
+		path: join_path(c.name, 'src', 'product_service.v')
 		content: "module main
 
 import databases
@@ -516,7 +518,7 @@ fn (mut app App) service_get_all_products_from(user_id int) ![]Product {
 "
 	}
 	c.files << ProjectFiles{
-		path: '${c.name}/src/product_view_api.v'
+		path: join_path(c.name, 'src', 'product_view_api.v')
 		content: "module main
 
 import json
@@ -555,7 +557,7 @@ pub fn get_product(token string) ![]User {
 "
 	}
 	c.files << ProjectFiles{
-		path: '${c.name}/src/product_view.v'
+		path: join_path(c.name, 'src', 'product_view.v')
 		content: "module main
 
 import vweb
@@ -577,7 +579,7 @@ pub fn (mut app App) products() !vweb.Result {
 "
 	}
 	c.files << ProjectFiles{
-		path: '${c.name}/src/user_controllers.v'
+		path: join_path(c.name, 'src', 'user_controllers.v')
 		content: "module main
 
 import vweb
@@ -647,7 +649,7 @@ pub fn (mut app App) controller_create_user(username string, password string) vw
 "
 	}
 	c.files << ProjectFiles{
-		path: '${c.name}/src/user_entities.v'
+		path: join_path(c.name, 'src', 'user_entities.v')
 		content: "module main
 
 [table: 'users']
@@ -662,7 +664,7 @@ mut:
 "
 	}
 	c.files << ProjectFiles{
-		path: '${c.name}/src/user_services.v'
+		path: join_path(c.name, 'src', 'user_services.v')
 		content: "module main
 
 import crypto.bcrypt
@@ -731,7 +733,7 @@ fn (mut app App) service_get_user(id int) !User {
 "
 	}
 	c.files << ProjectFiles{
-		path: '${c.name}/src/user_view_api.v'
+		path: join_path(c.name, 'src', 'user_view_api.v')
 		content: "module main
 
 import json

diff --git a/cmd/tools/vcreate/vcreate.v b/cmd/tools/vcreate/vcreate.v
@@ -263,10 +263,7 @@ bin/
 
 fn (mut c Create) create_files_and_directories() {
 	for file in c.files {
-		// get dir and convert path separator
-		dir := file.path.split('/')#[..-1].join(os.path_separator)
-		// create all directories, if not exist
-		os.mkdir_all(dir) or { panic(err) }
+		os.mkdir_all(os.dir(file.path)) or { panic(err) }
 		os.write_file(file.path, file.content) or { panic(err) }
 	}
 }