diff --git a/models/fixtures/branch.yml b/models/fixtures/branch.yml index 93003049c6..d765823204 100644 --- a/models/fixtures/branch.yml +++ b/models/fixtures/branch.yml @@ -45,3 +45,15 @@ is_deleted: false deleted_by_id: 0 deleted_unix: 0 + +- + id: 5 + repo_id: 62 + name: 'master' + commit_id: '883ede87f3768c0b2679d5d95af3cc7a9ac2457b' + commit_message: 'add favicon.png' + commit_time: 1710055656 + pusher_id: 1 + is_deleted: false + deleted_by_id: 0 + deleted_unix: 0 diff --git a/models/fixtures/repository.yml b/models/fixtures/repository.yml index e5c6224c96..0abce42f20 100644 --- a/models/fixtures/repository.yml +++ b/models/fixtures/repository.yml @@ -1768,3 +1768,34 @@ size: 0 is_fsck_enabled: true close_issues_via_commit_in_any_branch: false + +- + id: 62 + owner_id: 41 + owner_name: org41 + lower_name: repo62 + name: repo62 + default_branch: master + num_watches: 0 + num_stars: 0 + num_forks: 0 + num_issues: 0 + num_closed_issues: 0 + num_pulls: 1 + num_closed_pulls: 0 + num_milestones: 0 + num_closed_milestones: 0 + num_projects: 0 + num_closed_projects: 0 + is_private: false + is_empty: false + is_archived: false + is_mirror: false + status: 0 + is_fork: true + fork_id: 1 + is_template: false + template_id: 0 + size: 0 + is_fsck_enabled: true + close_issues_via_commit_in_any_branch: false diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go index a2c6ac33e8..c8f09e07c4 100644 --- a/routers/web/repo/commit.go +++ b/routers/web/repo/commit.go @@ -344,7 +344,7 @@ func Diff(ctx *context.Context) { return } } - setCompareContext(ctx, parentCommit, commit, userName, repoName) + setCompareContext(ctx, parentCommit, commit, userName, repoName, userName, repoName) ctx.Data["Title"] = commit.Summary() + " · " + base.ShortSha(commitID) ctx.Data["Commit"] = commit ctx.Data["Diff"] = diff diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go index 8c0fee71a0..b8c4167c6c 100644 --- a/routers/web/repo/compare.go +++ b/routers/web/repo/compare.go @@ -48,7 +48,7 @@ const ( ) // setCompareContext sets context data. -func setCompareContext(ctx *context.Context, before, head *git.Commit, headOwner, headName string) { +func setCompareContext(ctx *context.Context, before, head *git.Commit, beforeOwner, beforeName, headOwner, headName string) { ctx.Data["BeforeCommit"] = before ctx.Data["HeadCommit"] = head @@ -79,7 +79,7 @@ func setCompareContext(ctx *context.Context, before, head *git.Commit, headOwner return st } - setPathsCompareContext(ctx, before, head, headOwner, headName) + setPathsCompareContext(ctx, before, head, beforeOwner, beforeName, headOwner, headName) setImageCompareContext(ctx) setCsvCompareContext(ctx) } @@ -95,12 +95,12 @@ func RawCommitURL(owner, name string, commit *git.Commit) string { } // setPathsCompareContext sets context data for source and raw paths -func setPathsCompareContext(ctx *context.Context, base, head *git.Commit, headOwner, headName string) { +func setPathsCompareContext(ctx *context.Context, before, head *git.Commit, beforeOwner, beforeName, headOwner, headName string) { ctx.Data["SourcePath"] = SourceCommitURL(headOwner, headName, head) ctx.Data["RawPath"] = RawCommitURL(headOwner, headName, head) - if base != nil { - ctx.Data["BeforeSourcePath"] = SourceCommitURL(headOwner, headName, base) - ctx.Data["BeforeRawPath"] = RawCommitURL(headOwner, headName, base) + if before != nil { + ctx.Data["BeforeSourcePath"] = SourceCommitURL(beforeOwner, beforeName, before) + ctx.Data["BeforeRawPath"] = RawCommitURL(beforeOwner, beforeName, before) } } @@ -674,7 +674,7 @@ func PrepareCompareDiff( ctx.Data["Username"] = ci.HeadUser.Name ctx.Data["Reponame"] = ci.HeadRepo.Name - setCompareContext(ctx, beforeCommit, headCommit, ci.HeadUser.Name, repo.Name) + setCompareContext(ctx, beforeCommit, headCommit, repo.OwnerName, repo.Name, ci.HeadUser.Name, ci.HeadRepo.Name) return false } diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index 7f131f2e98..52adc79673 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -806,7 +806,12 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi } } - setCompareContext(ctx, baseCommit, commit, ctx.Repo.Owner.Name, ctx.Repo.Repository.Name) + if err := pull.LoadHeadRepo(ctx); err != nil { + ctx.ServerError("LoadHeadRepo", err) + return + } + + setCompareContext(ctx, baseCommit, commit, ctx.Repo.Repository.OwnerName, ctx.Repo.Repository.Name, pull.HeadRepo.OwnerName, pull.HeadRepo.Name) assigneeUsers, err := repo_model.GetRepoAssignees(ctx, ctx.Repo.Repository) if err != nil { diff --git a/tests/gitea-repositories-meta/org41/repo62.git/HEAD b/tests/gitea-repositories-meta/org41/repo62.git/HEAD new file mode 100644 index 0000000000..cb089cd89a --- /dev/null +++ b/tests/gitea-repositories-meta/org41/repo62.git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/tests/gitea-repositories-meta/org41/repo62.git/config b/tests/gitea-repositories-meta/org41/repo62.git/config new file mode 100644 index 0000000000..89b0e3fe42 --- /dev/null +++ b/tests/gitea-repositories-meta/org41/repo62.git/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = /Users/lunny/data/Projects/gitea/gitea/tests/gitea-repositories-meta/org41/../user2/repo1.git + fetch = +refs/*:refs/* + mirror = true diff --git a/tests/gitea-repositories-meta/org41/repo62.git/description b/tests/gitea-repositories-meta/org41/repo62.git/description new file mode 100644 index 0000000000..498b267a8c --- /dev/null +++ b/tests/gitea-repositories-meta/org41/repo62.git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/tests/gitea-repositories-meta/org41/repo62.git/info/exclude b/tests/gitea-repositories-meta/org41/repo62.git/info/exclude new file mode 100644 index 0000000000..a5196d1be8 --- /dev/null +++ b/tests/gitea-repositories-meta/org41/repo62.git/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba b/tests/gitea-repositories-meta/org41/repo62.git/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba new file mode 100644 index 0000000000..d3c45d51ea Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/16/633238d370a441f98dca532e4296a619c4c85f b/tests/gitea-repositories-meta/org41/repo62.git/objects/16/633238d370a441f98dca532e4296a619c4c85f new file mode 100644 index 0000000000..310f0ca77a Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/16/633238d370a441f98dca532e4296a619c4c85f differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/2a/2f1d4670728a2e10049e345bd7a276468beab6 b/tests/gitea-repositories-meta/org41/repo62.git/objects/2a/2f1d4670728a2e10049e345bd7a276468beab6 new file mode 100644 index 0000000000..0994add2c8 Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/2a/2f1d4670728a2e10049e345bd7a276468beab6 differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/3f/a2f829675543ecfc16b2891aebe8bf0608a8f4 b/tests/gitea-repositories-meta/org41/repo62.git/objects/3f/a2f829675543ecfc16b2891aebe8bf0608a8f4 new file mode 100644 index 0000000000..892c6bffe9 Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/3f/a2f829675543ecfc16b2891aebe8bf0608a8f4 differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/40/3d76c604cb569323864e06a07b85d466924802 b/tests/gitea-repositories-meta/org41/repo62.git/objects/40/3d76c604cb569323864e06a07b85d466924802 new file mode 100644 index 0000000000..ea0bf76d0c Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/40/3d76c604cb569323864e06a07b85d466924802 differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/46/49299398e4d39a5c09eb4f534df6f1e1eb87cc b/tests/gitea-repositories-meta/org41/repo62.git/objects/46/49299398e4d39a5c09eb4f534df6f1e1eb87cc new file mode 100644 index 0000000000..b32e1d2f5c --- /dev/null +++ b/tests/gitea-repositories-meta/org41/repo62.git/objects/46/49299398e4d39a5c09eb4f534df6f1e1eb87cc @@ -0,0 +1,4 @@ +xQJ0E*f>I@D_!n`L^mhS ^ e] +3wunzr,].6ԋC$uMr +1zaI\ 㘺(>T6x:Oײ|u9~l"i$c kZ[S +SC;EvM!#G30ǘy] \ No newline at end of file diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/4a/357436d925b5c974181ff12a994538ddc5a269 b/tests/gitea-repositories-meta/org41/repo62.git/objects/4a/357436d925b5c974181ff12a994538ddc5a269 new file mode 100644 index 0000000000..bf97d00fd8 Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/4a/357436d925b5c974181ff12a994538ddc5a269 differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/4b/4851ad51df6a7d9f25c979345979eaeb5b349f b/tests/gitea-repositories-meta/org41/repo62.git/objects/4b/4851ad51df6a7d9f25c979345979eaeb5b349f new file mode 100644 index 0000000000..700a13828e Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/4b/4851ad51df6a7d9f25c979345979eaeb5b349f differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/5c/050d3b6d2db231ab1f64e324f1b6b9a0b181c2 b/tests/gitea-repositories-meta/org41/repo62.git/objects/5c/050d3b6d2db231ab1f64e324f1b6b9a0b181c2 new file mode 100644 index 0000000000..c0cb626359 Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/5c/050d3b6d2db231ab1f64e324f1b6b9a0b181c2 differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/5f/22f7d0d95d614d25a5b68592adb345a4b5c7fd b/tests/gitea-repositories-meta/org41/repo62.git/objects/5f/22f7d0d95d614d25a5b68592adb345a4b5c7fd new file mode 100644 index 0000000000..17fdf18edb Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/5f/22f7d0d95d614d25a5b68592adb345a4b5c7fd differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/62/fb502a7172d4453f0322a2cc85bddffa57f07a b/tests/gitea-repositories-meta/org41/repo62.git/objects/62/fb502a7172d4453f0322a2cc85bddffa57f07a new file mode 100644 index 0000000000..ee494a8ca8 Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/62/fb502a7172d4453f0322a2cc85bddffa57f07a differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/65/f1bf27bc3bf70f64657658635e66094edbcb4d b/tests/gitea-repositories-meta/org41/repo62.git/objects/65/f1bf27bc3bf70f64657658635e66094edbcb4d new file mode 100644 index 0000000000..de48ba79f5 Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/65/f1bf27bc3bf70f64657658635e66094edbcb4d differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/6a/a3a5385611c5eb8986c9961a9c34a93cbaadfb b/tests/gitea-repositories-meta/org41/repo62.git/objects/6a/a3a5385611c5eb8986c9961a9c34a93cbaadfb new file mode 100644 index 0000000000..09aed946f2 Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/6a/a3a5385611c5eb8986c9961a9c34a93cbaadfb differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/78/fb907e3a3309eae4fe8fef030874cebbf1cd5e b/tests/gitea-repositories-meta/org41/repo62.git/objects/78/fb907e3a3309eae4fe8fef030874cebbf1cd5e new file mode 100644 index 0000000000..6a25f7409b Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/78/fb907e3a3309eae4fe8fef030874cebbf1cd5e differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/7c/4df115542e05c700f297519e906fd63c9c9804 b/tests/gitea-repositories-meta/org41/repo62.git/objects/7c/4df115542e05c700f297519e906fd63c9c9804 new file mode 100644 index 0000000000..3bf67a206a Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/7c/4df115542e05c700f297519e906fd63c9c9804 differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/88/3ede87f3768c0b2679d5d95af3cc7a9ac2457b b/tests/gitea-repositories-meta/org41/repo62.git/objects/88/3ede87f3768c0b2679d5d95af3cc7a9ac2457b new file mode 100644 index 0000000000..ca5a0edcba Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/88/3ede87f3768c0b2679d5d95af3cc7a9ac2457b differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/90/dcd07da077d1e7cd6032b52d1f79ae2b5f19b2 b/tests/gitea-repositories-meta/org41/repo62.git/objects/90/dcd07da077d1e7cd6032b52d1f79ae2b5f19b2 new file mode 100644 index 0000000000..1404abdaa2 --- /dev/null +++ b/tests/gitea-repositories-meta/org41/repo62.git/objects/90/dcd07da077d1e7cd6032b52d1f79ae2b5f19b2 @@ -0,0 +1,2 @@ +xeN0D#4 +JA5,xzsV5Dػ7,=o.E卢q5J= r=>4 O!Š6ms8&\EatTIzԅ! dso@a&K5B)r4Q`YLb o`a3@(eԭ5 H\sH99R3)@S_"4sE0R.U|/mۿ]Uz \ No newline at end of file diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/94/922e1295c678267de1193b7b84ad8a086c27f9 b/tests/gitea-repositories-meta/org41/repo62.git/objects/94/922e1295c678267de1193b7b84ad8a086c27f9 new file mode 100644 index 0000000000..60692df6ec Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/94/922e1295c678267de1193b7b84ad8a086c27f9 differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/98/5f0301dba5e7b34be866819cd15ad3d8f508ee b/tests/gitea-repositories-meta/org41/repo62.git/objects/98/5f0301dba5e7b34be866819cd15ad3d8f508ee new file mode 100644 index 0000000000..81fd6a50fd Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/98/5f0301dba5e7b34be866819cd15ad3d8f508ee differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/a6/9277c81e90b98a7c0ab25b042a6e296da8eb9a b/tests/gitea-repositories-meta/org41/repo62.git/objects/a6/9277c81e90b98a7c0ab25b042a6e296da8eb9a new file mode 100644 index 0000000000..887669883b Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/a6/9277c81e90b98a7c0ab25b042a6e296da8eb9a differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/a7/57c0ea621e63d0fd6fc353a175fdc7199e5d1d b/tests/gitea-repositories-meta/org41/repo62.git/objects/a7/57c0ea621e63d0fd6fc353a175fdc7199e5d1d new file mode 100644 index 0000000000..c3111a08b8 Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/a7/57c0ea621e63d0fd6fc353a175fdc7199e5d1d differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/b2/60587271671842af0b036e4fe643c9d45b7ddd b/tests/gitea-repositories-meta/org41/repo62.git/objects/b2/60587271671842af0b036e4fe643c9d45b7ddd new file mode 100644 index 0000000000..9182ac0381 Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/b2/60587271671842af0b036e4fe643c9d45b7ddd differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/b3/3ba6ad022257d864ee83c44948f8f1702595ee b/tests/gitea-repositories-meta/org41/repo62.git/objects/b3/3ba6ad022257d864ee83c44948f8f1702595ee new file mode 100644 index 0000000000..8370a96e8d Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/b3/3ba6ad022257d864ee83c44948f8f1702595ee differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/d4/a1a6dcf7bd42891f264d484e80dac7e66b5410 b/tests/gitea-repositories-meta/org41/repo62.git/objects/d4/a1a6dcf7bd42891f264d484e80dac7e66b5410 new file mode 100644 index 0000000000..d7ef93c616 Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/d4/a1a6dcf7bd42891f264d484e80dac7e66b5410 differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/d7/bd5b8cfb680f460e37b6fd7cf74c284e059118 b/tests/gitea-repositories-meta/org41/repo62.git/objects/d7/bd5b8cfb680f460e37b6fd7cf74c284e059118 new file mode 100644 index 0000000000..6039ff6619 Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/d7/bd5b8cfb680f460e37b6fd7cf74c284e059118 differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/dc/7a8ba127fee870dd683310ce660dfe59333a1b b/tests/gitea-repositories-meta/org41/repo62.git/objects/dc/7a8ba127fee870dd683310ce660dfe59333a1b new file mode 100644 index 0000000000..7678d6754d Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/dc/7a8ba127fee870dd683310ce660dfe59333a1b differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/dc/d4edb1a30bf93049fd24c31317e3344e08d95b b/tests/gitea-repositories-meta/org41/repo62.git/objects/dc/d4edb1a30bf93049fd24c31317e3344e08d95b new file mode 100644 index 0000000000..174dec695c Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/dc/d4edb1a30bf93049fd24c31317e3344e08d95b differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/dd/59742c0f6672911f2b64cba5711ac00593ed32 b/tests/gitea-repositories-meta/org41/repo62.git/objects/dd/59742c0f6672911f2b64cba5711ac00593ed32 new file mode 100644 index 0000000000..f9137c5f77 Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/dd/59742c0f6672911f2b64cba5711ac00593ed32 differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/f3/fa0f5cc797fc4c02a1b8bec9de4b2072fcdbdf b/tests/gitea-repositories-meta/org41/repo62.git/objects/f3/fa0f5cc797fc4c02a1b8bec9de4b2072fcdbdf new file mode 100644 index 0000000000..9b20f8af3f Binary files /dev/null and b/tests/gitea-repositories-meta/org41/repo62.git/objects/f3/fa0f5cc797fc4c02a1b8bec9de4b2072fcdbdf differ diff --git a/tests/gitea-repositories-meta/org41/repo62.git/objects/info/packs b/tests/gitea-repositories-meta/org41/repo62.git/objects/info/packs new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/tests/gitea-repositories-meta/org41/repo62.git/objects/info/packs @@ -0,0 +1 @@ + diff --git a/tests/gitea-repositories-meta/org41/repo62.git/packed-refs b/tests/gitea-repositories-meta/org41/repo62.git/packed-refs new file mode 100644 index 0000000000..821031d96e --- /dev/null +++ b/tests/gitea-repositories-meta/org41/repo62.git/packed-refs @@ -0,0 +1,7 @@ +# pack-refs with: peeled fully-peeled sorted +65f1bf27bc3bf70f64657658635e66094edbcb4d refs/heads/master +3fa2f829675543ecfc16b2891aebe8bf0608a8f4 refs/notes/commits +4a357436d925b5c974181ff12a994538ddc5a269 refs/pull/2/head +5f22f7d0d95d614d25a5b68592adb345a4b5c7fd refs/pull/3/head +62fb502a7172d4453f0322a2cc85bddffa57f07a refs/pull/5/head +65f1bf27bc3bf70f64657658635e66094edbcb4d refs/tags/v1.1 diff --git a/tests/gitea-repositories-meta/org41/repo62.git/refs/heads/master b/tests/gitea-repositories-meta/org41/repo62.git/refs/heads/master new file mode 100644 index 0000000000..d45d0f2803 --- /dev/null +++ b/tests/gitea-repositories-meta/org41/repo62.git/refs/heads/master @@ -0,0 +1 @@ +883ede87f3768c0b2679d5d95af3cc7a9ac2457b diff --git a/tests/integration/compare_test.go b/tests/integration/compare_test.go index 27b2920cc1..c083f701cf 100644 --- a/tests/integration/compare_test.go +++ b/tests/integration/compare_test.go @@ -117,4 +117,10 @@ func TestCompareBranches(t *testing.T) { diffChanges = []string{"test.txt"} inspectCompare(t, htmlDoc, diffCount, diffChanges) + + req = NewRequest(t, "GET", "/user2/repo1/compare/master...org41/repo62:master") + resp = session.MakeRequest(t, req, http.StatusOK) + htmlDoc = NewHTMLParser(t, resp.Body) + h, _ := htmlDoc.doc.Html() + fmt.Println(h) }