[update] refactor

imthaghost · Feb 25, 2021 · 8fa193f · 8fa193f
1 parent 0264b72
commit 8fa193f
Show file tree

Hide file tree

Showing 32 changed files with 40 additions and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 .DS_Store
 .vscode
 .env
-parser/domains.csv
+pkg/parser/domains.csv
 dist
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 <p align="center">
   <a href="https://goclone.herokuapp.com/">
-    <img alt="jedi" src="docs/media/logo.png"> 
+    <img alt="jedi" src="pkg/docs/media/logo.png"> 
   </a>
 </p>
 <p align="center">
@@ -16,7 +16,7 @@ Copy websites to your computer! Goclone is a utility that allows you to download
 </p>
 <br>
 
-![Example](/docs/media/colab.gif)
+![Example](/pkg/docs/media/colab.gif)
 
 ## Table of Contents
 - [Installation](#installation)
@@ -59,7 +59,7 @@ go install
 
 Visit the <b>Notion</b> link [here](https://www.notion.so/0f3cb918168b48ffa5072c6ee39281ee?v=5330c26bd2d747dfac07882347b4a1df) to view Goclone's feature/bug progress.
 
-![Notion](/docs/media/progress.png)
+![Notion](/pkg/docs/media/progress.png)
 
 <a name="examples"></a>
 
@@ -70,7 +70,7 @@ Visit the <b>Notion</b> link [here](https://www.notion.so/0f3cb918168b48ffa5072c
 goclone https://dribbble.com
 ```
 
-![Dribbble](/docs/media/dribbble.gif)
+![Dribbble](/pkg/docs/media/dribbble.gif)
 
 <a name="license"></a>
 

diff --git a/cmd/clone.go → cmd/goclone/clone.go b/cmd/clone.go → cmd/goclone/clone.go
@@ -1,14 +1,15 @@
-package cmd
+package goclone
 
 import (
 	"fmt"
+
 	"os/exec"
 
-	"github.com/imthaghost/goclone/crawler"
-	"github.com/imthaghost/goclone/file"
-	"github.com/imthaghost/goclone/html"
-	"github.com/imthaghost/goclone/parser"
-	"github.com/imthaghost/goclone/server"
+	"github.com/imthaghost/goclone/pkg/crawler"
+	"github.com/imthaghost/goclone/pkg/file"
+	"github.com/imthaghost/goclone/pkg/html"
+	"github.com/imthaghost/goclone/pkg/parser"
+	"github.com/imthaghost/goclone/pkg/server"
 )
 
 // Clone the given site :)
@@ -23,33 +24,33 @@ func cloneSite(args []string) {
 			// use the domain as the project name
 			name := url
 			// CreateProject
-			projectpath := file.CreateProject(name)
+			projectPath := file.CreateProject(name)
 			// create the url
 			validURL := parser.CreateURL(name)
 			// Crawler
-			crawler.Crawl(validURL, projectpath)
+			crawler.Crawl(validURL, projectPath)
 			// Restructure html
-			html.LinkRestructure(projectpath)
+			html.LinkRestructure(projectPath)
 			err := exec.Command("open", "http://localhost:5000").Start()
 			if err != nil {
 				panic(err)
 			}
-			server.Serve(projectpath)
+			server.Serve(projectPath)
 
 		} else if parser.ValidateURL(url) {
 			// get the hostname
 			name := parser.GetDomain(url)
 			// create project
-			projectpath := file.CreateProject(name)
+			projectPath := file.CreateProject(name)
 			// Crawler
-			crawler.Crawl(url, projectpath)
+			crawler.Crawl(url, projectPath)
 			// Restructure html
-			html.LinkRestructure(projectpath)
+			html.LinkRestructure(projectPath)
 			err := exec.Command("open", "http://localhost:5000").Start()
 			if err != nil {
 				panic(err)
 			}
-			server.Serve(projectpath)
+			server.Serve(projectPath)
 		} else {
 			fmt.Print(url)
 		}
@@ -61,16 +62,16 @@ func cloneSite(args []string) {
 			// use the domain as the project name
 			name := url
 			// CreateProject
-			projectpath := file.CreateProject(name)
+			projectPath := file.CreateProject(name)
 			// create the url
 			validURL := parser.CreateURL(name)
 			// Crawler
-			crawler.Crawl(validURL, projectpath)
+			crawler.Crawl(validURL, projectPath)
 			// Restructure html
-			html.LinkRestructure(projectpath)
+			html.LinkRestructure(projectPath)
 			if Open {
 				// automatically open project
-				err := exec.Command("open", projectpath+"/index.html").Start()
+				err := exec.Command("open", projectPath+"/index.html").Start()
 				if err != nil {
 					panic(err)
 				}
@@ -80,13 +81,13 @@ func cloneSite(args []string) {
 			// get the hostname
 			name := parser.GetDomain(url)
 			// create project
-			projectpath := file.CreateProject(name)
+			projectPath := file.CreateProject(name)
 			// Crawler
-			crawler.Crawl(url, projectpath)
+			crawler.Crawl(url, projectPath)
 			// Restructure html
-			html.LinkRestructure(projectpath)
+			html.LinkRestructure(projectPath)
 			if Open {
-				err := exec.Command("open", projectpath+"/index.html").Start()
+				err := exec.Command("open", projectPath+"/index.html").Start()
 				if err != nil {
 					panic(err)
 				}

diff --git a/cmd/root.go → cmd/goclone/root.go b/cmd/root.go → cmd/goclone/root.go
@@ -1,10 +1,8 @@
-package cmd
+package goclone
 
 import (
-	"log"
-	"os"
-
 	"github.com/spf13/cobra"
+	"log"
 )
 
 var (
@@ -45,6 +43,5 @@ func Execute() {
 	// Execute the command :)
 	if err := rootCmd.Execute(); err != nil {
 		log.Fatal(err)
-		os.Exit(1)
 	}
 }
diff --git a/cmd/main.go b/cmd/main.go
@@ -0,0 +1,9 @@
+package main
+
+import (
+	"github.com/imthaghost/goclone/cmd/goclone"
+)
+
+func main() {
+	goclone.Execute()
+}
diff --git a/main.go b/main.go
diff --git a/crawler/collector.go → pkg/crawler/collector.go b/crawler/collector.go → pkg/crawler/collector.go
diff --git a/crawler/crawler.go → pkg/crawler/crawler.go b/crawler/crawler.go → pkg/crawler/crawler.go
diff --git a/crawler/extractor.go → pkg/crawler/extractor.go b/crawler/extractor.go → pkg/crawler/extractor.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/imthaghost/goclone/parser"
+	"github.com/imthaghost/goclone/pkg/parser"
 )
 
 // file extension map for directing files to their proper directory in O(1) time

diff --git a/crawler/html.go → pkg/crawler/html.go b/crawler/html.go → pkg/crawler/html.go
diff --git a/docs/CONTRIBUTING.md → pkg/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md → pkg/docs/CONTRIBUTING.md
diff --git a/docs/media/colab.gif → pkg/docs/media/colab.gif b/docs/media/colab.gif → pkg/docs/media/colab.gif
diff --git a/docs/media/dribbble.gif → pkg/docs/media/dribbble.gif b/docs/media/dribbble.gif → pkg/docs/media/dribbble.gif
diff --git a/docs/media/fast.gif → pkg/docs/media/fast.gif b/docs/media/fast.gif → pkg/docs/media/fast.gif
diff --git a/docs/media/logo.png → pkg/docs/media/logo.png b/docs/media/logo.png → pkg/docs/media/logo.png
diff --git a/docs/media/progress.png → pkg/docs/media/progress.png b/docs/media/progress.png → pkg/docs/media/progress.png
diff --git a/file/write.go → pkg/file/write.go b/file/write.go → pkg/file/write.go
diff --git a/html/arrange.go → pkg/html/arrange.go b/html/arrange.go → pkg/html/arrange.go
diff --git a/html/formatter.go → pkg/html/formatter.go b/html/formatter.go → pkg/html/formatter.go
diff --git a/html/formatter_test.go → pkg/html/formatter_test.go b/html/formatter_test.go → pkg/html/formatter_test.go
diff --git a/html/sorter.go → pkg/html/sorter.go b/html/sorter.go → pkg/html/sorter.go
diff --git a/parser/create_url_test.go → pkg/parser/create_url_test.go b/parser/create_url_test.go → pkg/parser/create_url_test.go
diff --git a/parser/extension.go → pkg/parser/extension.go b/parser/extension.go → pkg/parser/extension.go
diff --git a/parser/filename.go → pkg/parser/filename.go b/parser/filename.go → pkg/parser/filename.go
diff --git a/parser/get_domain_test.go → pkg/parser/get_domain_test.go b/parser/get_domain_test.go → pkg/parser/get_domain_test.go
diff --git a/parser/path_filename_test.go → pkg/parser/path_filename_test.go b/parser/path_filename_test.go → pkg/parser/path_filename_test.go
diff --git a/parser/url.go → pkg/parser/url.go b/parser/url.go → pkg/parser/url.go
diff --git a/parser/url_extension_test.go → pkg/parser/url_extension_test.go b/parser/url_extension_test.go → pkg/parser/url_extension_test.go
diff --git a/parser/url_filename_test.go → pkg/parser/url_filename_test.go b/parser/url_filename_test.go → pkg/parser/url_filename_test.go
diff --git a/parser/valid_domain_test.go → pkg/parser/valid_domain_test.go b/parser/valid_domain_test.go → pkg/parser/valid_domain_test.go
diff --git a/parser/valid_url_test.go → pkg/parser/valid_url_test.go b/parser/valid_url_test.go → pkg/parser/valid_url_test.go
diff --git a/server/server.go → pkg/server/server.go b/server/server.go → pkg/server/server.go