refactor: assume a single repo

Commit `8710d5e`

Eric Bower · 2023-08-13 12:30:49 -0400 EDT

parent 87e3e38

refactor: assume a single repo

2 files changed, +18, -25

M .github/workflows/static.yml

M main.go

M .github/workflows/static.yml

+2, -2

......@@ -31,5 +31,5 @@ jobs:
          user: erock
          key: ${{ secrets.PRIVATE_KEY }}
          src: './public/*'
          project: "git-${{ steps.vars.outputs.sha_short }}"
          promote: "git"
          project: "git-pgit-${{ steps.vars.outputs.sha_short }}"
          promote: "git-pgit"

M main.go

+16, -23

......@@ -317,7 +317,7 @@ func (c *Config) writeHtml(writeData *WriteData) {
	)
	bail(err)

	dir := filepath.Join(c.Outdir, c.RepoName, writeData.Subdir)
	dir := filepath.Join(c.Outdir, writeData.Subdir)
	err = os.MkdirAll(dir, os.ModePerm)
	bail(err)

......@@ -351,7 +351,7 @@ func (c *Config) writeRootSummary(data *PageData, readme template.HTML) {
func (c *Config) writeTree(data *PageData, tree []*TreeItem) {
	c.writeHtml(&WriteData{
		Filename: "index.html",
		Subdir:   filepath.Join("tree", data.RevData.RevName),
		Subdir:   filepath.Join("tree", getShortID(data.RevData.ID)),
		Template: "html/tree.page.tmpl",
		Data: &TreePageData{
			PageData: data,

......@@ -363,7 +363,7 @@ func (c *Config) writeTree(data *PageData, tree []*TreeItem) {
func (c *Config) writeLog(data *PageData, logs []*CommitData) {
	c.writeHtml(&WriteData{
		Filename: "index.html",
		Subdir:   filepath.Join("logs", data.RevData.RevName),
		Subdir:   filepath.Join("logs", getShortID(data.RevData.ID)),
		Template: "html/log.page.tmpl",
		Data: &LogPageData{
			PageData: data,

......@@ -505,27 +505,27 @@ func (c *Config) writeLogDiffs(repo *git.Repository, pageData *PageData, logs []
}

func (c *Config) getSummaryURL() template.URL {
	url := fmt.Sprintf("/%s/index.html", c.RepoName)
	url := "/index.html"
	return template.URL(url)
}

func (c *Config) getRefsURL() template.URL {
	url := fmt.Sprintf("/%s/refs.html", c.RepoName)
	url := "/refs.html"
	return template.URL(url)
}

func (c *Config) getTreeURL(revn string) template.URL {
	url := fmt.Sprintf("/%s/tree/%s/index.html", c.RepoName, revn)
	url := fmt.Sprintf("/tree/%s/index.html", revn)
	return template.URL(url)
}

func (c *Config) getLogsURL(revn string) template.URL {
	url := fmt.Sprintf("/%s/logs/%s/index.html", c.RepoName, revn)
	url := fmt.Sprintf("/logs/%s/index.html", revn)
	return template.URL(url)
}

func (c *Config) getCommitURL(commitID string) template.URL {
	url := fmt.Sprintf("/%s/commits/%s.html", c.RepoName, commitID)
	url := fmt.Sprintf("/commits/%s.html", commitID)
	return template.URL(url)
}

......@@ -555,7 +555,8 @@ func (c *Config) writeRepo() *BranchOutput {
		fullRevID, err := repo.RevParse(revStr)
		bail(err)

		revName := getShortID(fullRevID)
		revID := getShortID(fullRevID)
		revName := revID
		// if it's a reference then label it as such
		for _, ref := range refs {
			if revStr == git.RefShortName(ref.Refspec) || revStr == ref.Refspec {

......@@ -567,8 +568,8 @@ func (c *Config) writeRepo() *BranchOutput {
		data := &RevData{
			ID:      fullRevID,
			RevName: revName,
			TreeURL: c.getTreeURL(revName),
			LogURL:  c.getLogsURL(revName),
			TreeURL: c.getTreeURL(revID),
			LogURL:  c.getLogsURL(revID),
		}
		if first == nil {
			first = data

......@@ -721,9 +722,7 @@ func (c *Config) writeRevision(repo *git.Repository, pageData *PageData, refs []
			entry.When = lc.Author.When.Format(time.RFC822)
		}
		fpath := filepath.Join(
			"/",
			c.RepoName,
			"tree",
			"/tree",
			getShortID(pageData.RevData.ID),
			"item",
			fmt.Sprintf("%s.html", entry.Path),

......@@ -752,7 +751,6 @@ func main() {
	var revsFlag = flag.String("revs", "HEAD", "list of revs to generate logs and tree (e.g. main,v1,c69f86f,HEAD")
	var themeFlag = flag.String("theme", "dracula", "theme to use for site")
	var labelFlag = flag.String("label", "", "pretty name for the subdir where we create the repo, default is last folder in --repo")
	var assetFlag = flag.Bool("assets", false, "copy static assets to --out")
	var cloneFlag = flag.String("clone-url", "", "git clone URL")
	var descFlag = flag.String("desc", "", "description for repo")
	var maxCommitsFlag = flag.Int("max-commits", 0, "maximum number of commits to generate")

......@@ -799,12 +797,8 @@ func main() {
	}
	config.Logger.Infof("%+v", config)

	writeAssets := *assetFlag
	if writeAssets {
		config.copyStatic(filepath.Join(config.Outdir, "main.css"), mainCss)
		config.copyStatic(filepath.Join(config.Outdir, "syntax.css"), syntaxCss)
		return
	}
	config.copyStatic(filepath.Join(config.Outdir, "main.css"), mainCss)
	config.copyStatic(filepath.Join(config.Outdir, "syntax.css"), syntaxCss)

	if len(revs) == 0 {
		bail(fmt.Errorf("you must provide --revs"))

......@@ -812,7 +806,6 @@ func main() {

	config.writeRepo()

	prefixPath := filepath.Join("/", config.RepoName)
	url := filepath.Join(prefixPath, "index.html")
	url := filepath.Join("/", "index.html")
	config.Logger.Info(url)
}

...	...		@@ -317,7 +317,7 @@ func (c Config) writeHtml(writeData WriteData) {
317	317		)
318	318		bail(err)
319	319
320		-	dir := filepath.Join(c.Outdir, c.RepoName, writeData.Subdir)
	320	+	dir := filepath.Join(c.Outdir, writeData.Subdir)
321	321		err = os.MkdirAll(dir, os.ModePerm)
322	322		bail(err)
323	323

...	...		@@ -505,27 +505,27 @@ func (c Config) writeLogDiffs(repo git.Repository, pageData *PageData, logs []
505	505		}
506	506
507	507		func (c *Config) getSummaryURL() template.URL {
508		-	url := fmt.Sprintf("/%s/index.html", c.RepoName)
	508	+	url := "/index.html"
509	509		return template.URL(url)
510	510		}
511	511
512	512		func (c *Config) getRefsURL() template.URL {
513		-	url := fmt.Sprintf("/%s/refs.html", c.RepoName)
	513	+	url := "/refs.html"
514	514		return template.URL(url)
515	515		}
516	516
517	517		func (c *Config) getTreeURL(revn string) template.URL {
518		-	url := fmt.Sprintf("/%s/tree/%s/index.html", c.RepoName, revn)
	518	+	url := fmt.Sprintf("/tree/%s/index.html", revn)
519	519		return template.URL(url)
520	520		}
521	521
522	522		func (c *Config) getLogsURL(revn string) template.URL {
523		-	url := fmt.Sprintf("/%s/logs/%s/index.html", c.RepoName, revn)
	523	+	url := fmt.Sprintf("/logs/%s/index.html", revn)
524	524		return template.URL(url)
525	525		}
526	526
527	527		func (c *Config) getCommitURL(commitID string) template.URL {
528		-	url := fmt.Sprintf("/%s/commits/%s.html", c.RepoName, commitID)
	528	+	url := fmt.Sprintf("/commits/%s.html", commitID)
529	529		return template.URL(url)
530	530		}
531	531

...	...		@@ -812,7 +806,6 @@ func main() {
812	806
813	807		config.writeRepo()
814	808
815		-	prefixPath := filepath.Join("/", config.RepoName)
816		-	url := filepath.Join(prefixPath, "index.html")
	809	+	url := filepath.Join("/", "index.html")
817	810		config.Logger.Info(url)
818	811		}

...	...		@@ -31,5 +31,5 @@ jobs:
31	31		user: erock
32	32		key: ${{ secrets.PRIVATE_KEY }}
33	33		src: './public/*'
34		-	project: "git-${{ steps.vars.outputs.sha_short }}"
35		-	promote: "git"
	34	+	project: "git-pgit-${{ steps.vars.outputs.sha_short }}"
	35	+	promote: "git-pgit"

...	...		@@ -351,7 +351,7 @@ func (c Config) writeRootSummary(data PageData, readme template.HTML) {
351	351		func (c Config) writeTree(data PageData, tree []*TreeItem) {
352	352		c.writeHtml(&WriteData{
353	353		Filename: "index.html",
354		-	Subdir: filepath.Join("tree", data.RevData.RevName),
	354	+	Subdir: filepath.Join("tree", getShortID(data.RevData.ID)),
355	355		Template: "html/tree.page.tmpl",
356	356		Data: &TreePageData{
357	357		PageData: data,

...	...		@@ -363,7 +363,7 @@ func (c Config) writeTree(data PageData, tree []*TreeItem) {
363	363		func (c Config) writeLog(data PageData, logs []*CommitData) {
364	364		c.writeHtml(&WriteData{
365	365		Filename: "index.html",
366		-	Subdir: filepath.Join("logs", data.RevData.RevName),
	366	+	Subdir: filepath.Join("logs", getShortID(data.RevData.ID)),
367	367		Template: "html/log.page.tmpl",
368	368		Data: &LogPageData{
369	369		PageData: data,

...	...		@@ -555,7 +555,8 @@ func (c Config) writeRepo() BranchOutput {
555	555		fullRevID, err := repo.RevParse(revStr)
556	556		bail(err)
557	557
558		-	revName := getShortID(fullRevID)
	558	+	revID := getShortID(fullRevID)
	559	+	revName := revID
559	560		// if it's a reference then label it as such
560	561		for _, ref := range refs {
561	562		if revStr == git.RefShortName(ref.Refspec) \|\| revStr == ref.Refspec {

...	...		@@ -567,8 +568,8 @@ func (c Config) writeRepo() BranchOutput {
567	568		data := &RevData{
568	569		ID: fullRevID,
569	570		RevName: revName,
570		-	TreeURL: c.getTreeURL(revName),
571		-	LogURL: c.getLogsURL(revName),
	571	+	TreeURL: c.getTreeURL(revID),
	572	+	LogURL: c.getLogsURL(revID),
572	573		}
573	574		if first == nil {
574	575		first = data

...	...		@@ -721,9 +722,7 @@ func (c Config) writeRevision(repo git.Repository, pageData *PageData, refs []
721	722		entry.When = lc.Author.When.Format(time.RFC822)
722	723		}
723	724		fpath := filepath.Join(
724		-	"/",
725		-	c.RepoName,
726		-	"tree",
	725	+	"/tree",
727	726		getShortID(pageData.RevData.ID),
728	727		"item",
729	728		fmt.Sprintf("%s.html", entry.Path),

...	...		@@ -752,7 +751,6 @@ func main() {
752	751		var revsFlag = flag.String("revs", "HEAD", "list of revs to generate logs and tree (e.g. main,v1,c69f86f,HEAD")
753	752		var themeFlag = flag.String("theme", "dracula", "theme to use for site")
754	753		var labelFlag = flag.String("label", "", "pretty name for the subdir where we create the repo, default is last folder in --repo")
755		-	var assetFlag = flag.Bool("assets", false, "copy static assets to --out")
756	754		var cloneFlag = flag.String("clone-url", "", "git clone URL")
757	755		var descFlag = flag.String("desc", "", "description for repo")
758	756		var maxCommitsFlag = flag.Int("max-commits", 0, "maximum number of commits to generate")

...	...		@@ -799,12 +797,8 @@ func main() {
799	797		}
800	798		config.Logger.Infof("%+v", config)
801	799
802		-	writeAssets := *assetFlag
803		-	if writeAssets {
804		-	config.copyStatic(filepath.Join(config.Outdir, "main.css"), mainCss)
805		-	config.copyStatic(filepath.Join(config.Outdir, "syntax.css"), syntaxCss)
806		-	return
807		-	}
	800	+	config.copyStatic(filepath.Join(config.Outdir, "main.css"), mainCss)
	801	+	config.copyStatic(filepath.Join(config.Outdir, "syntax.css"), syntaxCss)
808	802
809	803		if len(revs) == 0 {
810	804		bail(fmt.Errorf("you must provide --revs"))

Commit 8710d5e

Commit `8710d5e`