Skip to content

Commit 29f149b

Browse files
lunnylunny
authored
Move context from modules to services (#29440)
Since `modules/context` has to depend on `models` and many other packages, it should be moved from `modules/context` to `services/context` according to design principles. There is no logic code change on this PR, only move packages. - Move `code.gitea.io/gitea/modules/context` to `code.gitea.io/gitea/services/context` - Move `code.gitea.io/gitea/modules/contexttest` to `code.gitea.io/gitea/services/contexttest` because of depending on context - Move `code.gitea.io/gitea/modules/upload` to `code.gitea.io/gitea/services/context/upload` because of depending on context
1 parent e55926e commit 29f149b

File tree

360 files changed

+369
-375
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

360 files changed

+369
-375
lines changed

‎routers/api/actions/artifacts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ import (
7171

7272
"code.gitea.io/gitea/models/actions"
7373
"code.gitea.io/gitea/models/db"
74-
"code.gitea.io/gitea/modules/context"
7574
"code.gitea.io/gitea/modules/json"
7675
"code.gitea.io/gitea/modules/log"
7776
"code.gitea.io/gitea/modules/setting"
@@ -80,6 +79,7 @@ import (
8079
"code.gitea.io/gitea/modules/web"
8180
web_types "code.gitea.io/gitea/modules/web/types"
8281
actions_service "code.gitea.io/gitea/services/actions"
82+
"code.gitea.io/gitea/services/context"
8383
)
8484

8585
const artifactRouteBase = "/_apis/pipelines/workflows/{run_id}/artifacts"

‎routers/api/packages/alpine/alpine.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ import (
1414
"strings"
1515

1616
packages_model "code.gitea.io/gitea/models/packages"
17-
"code.gitea.io/gitea/modules/context"
1817
"code.gitea.io/gitea/modules/json"
1918
packages_module "code.gitea.io/gitea/modules/packages"
2019
alpine_module "code.gitea.io/gitea/modules/packages/alpine"
2120
"code.gitea.io/gitea/modules/util"
2221
"code.gitea.io/gitea/routers/api/packages/helper"
22+
"code.gitea.io/gitea/services/context"
2323
packages_service "code.gitea.io/gitea/services/packages"
2424
alpine_service "code.gitea.io/gitea/services/packages/alpine"
2525
)

‎routers/api/packages/api.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010

1111
auth_model "code.gitea.io/gitea/models/auth"
1212
"code.gitea.io/gitea/models/perm"
13-
"code.gitea.io/gitea/modules/context"
1413
"code.gitea.io/gitea/modules/log"
1514
"code.gitea.io/gitea/modules/setting"
1615
"code.gitea.io/gitea/modules/web"
@@ -36,7 +35,7 @@ import (
3635
"code.gitea.io/gitea/routers/api/packages/swift"
3736
"code.gitea.io/gitea/routers/api/packages/vagrant"
3837
"code.gitea.io/gitea/services/auth"
39-
context_service "code.gitea.io/gitea/services/context"
38+
"code.gitea.io/gitea/services/context"
4039
)
4140

4241
func reqPackageAccess(accessMode perm.AccessMode) func(ctx *context.Context) {
@@ -642,7 +641,7 @@ func CommonRoutes() *web.Route {
642641
})
643642
})
644643
}, reqPackageAccess(perm.AccessModeRead))
645-
}, context_service.UserAssignmentWeb(), context.PackageAssignment())
644+
}, context.UserAssignmentWeb(), context.PackageAssignment())
646645

647646
return r
648647
}
@@ -812,7 +811,7 @@ func ContainerRoutes() *web.Route {
812811

813812
ctx.Status(http.StatusNotFound)
814813
})
815-
}, container.ReqContainerAccess, context_service.UserAssignmentWeb(), context.PackageAssignment(), reqPackageAccess(perm.AccessModeRead))
814+
}, container.ReqContainerAccess, context.UserAssignmentWeb(), context.PackageAssignment(), reqPackageAccess(perm.AccessModeRead))
816815

817816
return r
818817
}

‎routers/api/packages/cargo/cargo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import (
1212

1313
"code.gitea.io/gitea/models/db"
1414
packages_model "code.gitea.io/gitea/models/packages"
15-
"code.gitea.io/gitea/modules/context"
1615
"code.gitea.io/gitea/modules/log"
1716
packages_module "code.gitea.io/gitea/modules/packages"
1817
cargo_module "code.gitea.io/gitea/modules/packages/cargo"
1918
"code.gitea.io/gitea/modules/setting"
2019
"code.gitea.io/gitea/modules/structs"
2120
"code.gitea.io/gitea/modules/util"
2221
"code.gitea.io/gitea/routers/api/packages/helper"
22+
"code.gitea.io/gitea/services/context"
2323
"code.gitea.io/gitea/services/convert"
2424
packages_service "code.gitea.io/gitea/services/packages"
2525
cargo_service "code.gitea.io/gitea/services/packages/cargo"

‎routers/api/packages/chef/chef.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ import (
1515

1616
"code.gitea.io/gitea/models/db"
1717
packages_model "code.gitea.io/gitea/models/packages"
18-
"code.gitea.io/gitea/modules/context"
1918
packages_module "code.gitea.io/gitea/modules/packages"
2019
chef_module "code.gitea.io/gitea/modules/packages/chef"
2120
"code.gitea.io/gitea/modules/setting"
2221
"code.gitea.io/gitea/modules/util"
2322
"code.gitea.io/gitea/routers/api/packages/helper"
23+
"code.gitea.io/gitea/services/context"
2424
packages_service "code.gitea.io/gitea/services/packages"
2525
)
2626

‎routers/api/packages/composer/composer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ import (
1414

1515
"code.gitea.io/gitea/models/db"
1616
packages_model "code.gitea.io/gitea/models/packages"
17-
"code.gitea.io/gitea/modules/context"
1817
packages_module "code.gitea.io/gitea/modules/packages"
1918
composer_module "code.gitea.io/gitea/modules/packages/composer"
2019
"code.gitea.io/gitea/modules/setting"
2120
"code.gitea.io/gitea/modules/util"
2221
"code.gitea.io/gitea/routers/api/packages/helper"
22+
"code.gitea.io/gitea/services/context"
2323
"code.gitea.io/gitea/services/convert"
2424
packages_service "code.gitea.io/gitea/services/packages"
2525

‎routers/api/packages/conan/conan.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ import (
1515
packages_model "code.gitea.io/gitea/models/packages"
1616
conan_model "code.gitea.io/gitea/models/packages/conan"
1717
"code.gitea.io/gitea/modules/container"
18-
"code.gitea.io/gitea/modules/context"
1918
"code.gitea.io/gitea/modules/json"
2019
"code.gitea.io/gitea/modules/log"
2120
packages_module "code.gitea.io/gitea/modules/packages"
2221
conan_module "code.gitea.io/gitea/modules/packages/conan"
2322
"code.gitea.io/gitea/modules/setting"
2423
"code.gitea.io/gitea/routers/api/packages/helper"
24+
"code.gitea.io/gitea/services/context"
2525
notify_service "code.gitea.io/gitea/services/notify"
2626
packages_service "code.gitea.io/gitea/services/packages"
2727
)

‎routers/api/packages/conan/search.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99

1010
conan_model "code.gitea.io/gitea/models/packages/conan"
1111
user_model "code.gitea.io/gitea/models/user"
12-
"code.gitea.io/gitea/modules/context"
1312
"code.gitea.io/gitea/modules/json"
1413
conan_module "code.gitea.io/gitea/modules/packages/conan"
14+
"code.gitea.io/gitea/services/context"
1515
)
1616

1717
// SearchResult contains the found recipe names

‎routers/api/packages/conda/conda.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import (
1212

1313
packages_model "code.gitea.io/gitea/models/packages"
1414
conda_model "code.gitea.io/gitea/models/packages/conda"
15-
"code.gitea.io/gitea/modules/context"
1615
"code.gitea.io/gitea/modules/json"
1716
"code.gitea.io/gitea/modules/log"
1817
packages_module "code.gitea.io/gitea/modules/packages"
1918
conda_module "code.gitea.io/gitea/modules/packages/conda"
2019
"code.gitea.io/gitea/modules/util"
2120
"code.gitea.io/gitea/routers/api/packages/helper"
21+
"code.gitea.io/gitea/services/context"
2222
packages_service "code.gitea.io/gitea/services/packages"
2323

2424
"github.com/dsnet/compress/bzip2"

‎routers/api/packages/container/container.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ import (
1717
packages_model "code.gitea.io/gitea/models/packages"
1818
container_model "code.gitea.io/gitea/models/packages/container"
1919
user_model "code.gitea.io/gitea/models/user"
20-
"code.gitea.io/gitea/modules/context"
2120
"code.gitea.io/gitea/modules/json"
2221
"code.gitea.io/gitea/modules/log"
2322
packages_module "code.gitea.io/gitea/modules/packages"
2423
container_module "code.gitea.io/gitea/modules/packages/container"
2524
"code.gitea.io/gitea/modules/setting"
2625
"code.gitea.io/gitea/modules/util"
2726
"code.gitea.io/gitea/routers/api/packages/helper"
27+
"code.gitea.io/gitea/services/context"
2828
packages_service "code.gitea.io/gitea/services/packages"
2929
container_service "code.gitea.io/gitea/services/packages/container"
3030

‎routers/api/packages/cran/cran.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import (
1313

1414
packages_model "code.gitea.io/gitea/models/packages"
1515
cran_model "code.gitea.io/gitea/models/packages/cran"
16-
"code.gitea.io/gitea/modules/context"
1716
packages_module "code.gitea.io/gitea/modules/packages"
1817
cran_module "code.gitea.io/gitea/modules/packages/cran"
1918
"code.gitea.io/gitea/modules/util"
2019
"code.gitea.io/gitea/routers/api/packages/helper"
20+
"code.gitea.io/gitea/services/context"
2121
packages_service "code.gitea.io/gitea/services/packages"
2222
)
2323

‎routers/api/packages/debian/debian.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import (
1313

1414
"code.gitea.io/gitea/models/db"
1515
packages_model "code.gitea.io/gitea/models/packages"
16-
"code.gitea.io/gitea/modules/context"
1716
packages_module "code.gitea.io/gitea/modules/packages"
1817
debian_module "code.gitea.io/gitea/modules/packages/debian"
1918
"code.gitea.io/gitea/modules/util"
2019
"code.gitea.io/gitea/routers/api/packages/helper"
20+
"code.gitea.io/gitea/services/context"
2121
notify_service "code.gitea.io/gitea/services/notify"
2222
packages_service "code.gitea.io/gitea/services/packages"
2323
debian_service "code.gitea.io/gitea/services/packages/debian"

‎routers/api/packages/generic/generic.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"strings"
1111

1212
packages_model "code.gitea.io/gitea/models/packages"
13-
"code.gitea.io/gitea/modules/context"
1413
"code.gitea.io/gitea/modules/log"
1514
packages_module "code.gitea.io/gitea/modules/packages"
1615
"code.gitea.io/gitea/routers/api/packages/helper"
16+
"code.gitea.io/gitea/services/context"
1717
packages_service "code.gitea.io/gitea/services/packages"
1818
)
1919

‎routers/api/packages/goproxy/goproxy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
"time"
1313

1414
packages_model "code.gitea.io/gitea/models/packages"
15-
"code.gitea.io/gitea/modules/context"
1615
packages_module "code.gitea.io/gitea/modules/packages"
1716
goproxy_module "code.gitea.io/gitea/modules/packages/goproxy"
1817
"code.gitea.io/gitea/modules/util"
1918
"code.gitea.io/gitea/routers/api/packages/helper"
19+
"code.gitea.io/gitea/services/context"
2020
packages_service "code.gitea.io/gitea/services/packages"
2121
)
2222

‎routers/api/packages/helm/helm.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ import (
1313
"time"
1414

1515
packages_model "code.gitea.io/gitea/models/packages"
16-
"code.gitea.io/gitea/modules/context"
1716
"code.gitea.io/gitea/modules/json"
1817
"code.gitea.io/gitea/modules/log"
1918
packages_module "code.gitea.io/gitea/modules/packages"
2019
helm_module "code.gitea.io/gitea/modules/packages/helm"
2120
"code.gitea.io/gitea/modules/setting"
2221
"code.gitea.io/gitea/modules/util"
2322
"code.gitea.io/gitea/routers/api/packages/helper"
23+
"code.gitea.io/gitea/services/context"
2424
packages_service "code.gitea.io/gitea/services/packages"
2525

2626
"gopkg.in/yaml.v3"

‎routers/api/packages/helper/helper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"net/url"
1111

1212
packages_model "code.gitea.io/gitea/models/packages"
13-
"code.gitea.io/gitea/modules/context"
1413
"code.gitea.io/gitea/modules/log"
1514
"code.gitea.io/gitea/modules/setting"
15+
"code.gitea.io/gitea/services/context"
1616
)
1717

1818
// LogAndProcessError logs an error and calls a custom callback with the processed error message.

‎routers/api/packages/maven/maven.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ import (
2020
"strings"
2121

2222
packages_model "code.gitea.io/gitea/models/packages"
23-
"code.gitea.io/gitea/modules/context"
2423
"code.gitea.io/gitea/modules/json"
2524
"code.gitea.io/gitea/modules/log"
2625
packages_module "code.gitea.io/gitea/modules/packages"
2726
maven_module "code.gitea.io/gitea/modules/packages/maven"
2827
"code.gitea.io/gitea/routers/api/packages/helper"
28+
"code.gitea.io/gitea/services/context"
2929
packages_service "code.gitea.io/gitea/services/packages"
3030
)
3131

‎routers/api/packages/npm/npm.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ import (
1717
access_model "code.gitea.io/gitea/models/perm/access"
1818
repo_model "code.gitea.io/gitea/models/repo"
1919
"code.gitea.io/gitea/models/unit"
20-
"code.gitea.io/gitea/modules/context"
2120
packages_module "code.gitea.io/gitea/modules/packages"
2221
npm_module "code.gitea.io/gitea/modules/packages/npm"
2322
"code.gitea.io/gitea/modules/setting"
2423
"code.gitea.io/gitea/modules/util"
2524
"code.gitea.io/gitea/routers/api/packages/helper"
25+
"code.gitea.io/gitea/services/context"
2626
packages_service "code.gitea.io/gitea/services/packages"
2727

2828
"github.com/hashicorp/go-version"

‎routers/api/packages/nuget/nuget.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ import (
1717
"code.gitea.io/gitea/models/db"
1818
packages_model "code.gitea.io/gitea/models/packages"
1919
nuget_model "code.gitea.io/gitea/models/packages/nuget"
20-
"code.gitea.io/gitea/modules/context"
2120
"code.gitea.io/gitea/modules/log"
2221
packages_module "code.gitea.io/gitea/modules/packages"
2322
nuget_module "code.gitea.io/gitea/modules/packages/nuget"
2423
"code.gitea.io/gitea/modules/setting"
2524
"code.gitea.io/gitea/modules/util"
2625
"code.gitea.io/gitea/routers/api/packages/helper"
26+
"code.gitea.io/gitea/services/context"
2727
packages_service "code.gitea.io/gitea/services/packages"
2828
)
2929

‎routers/api/packages/pub/pub.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ import (
1414
"time"
1515

1616
packages_model "code.gitea.io/gitea/models/packages"
17-
"code.gitea.io/gitea/modules/context"
1817
"code.gitea.io/gitea/modules/json"
1918
"code.gitea.io/gitea/modules/log"
2019
packages_module "code.gitea.io/gitea/modules/packages"
2120
pub_module "code.gitea.io/gitea/modules/packages/pub"
2221
"code.gitea.io/gitea/modules/setting"
2322
"code.gitea.io/gitea/modules/util"
2423
"code.gitea.io/gitea/routers/api/packages/helper"
24+
"code.gitea.io/gitea/services/context"
2525
packages_service "code.gitea.io/gitea/services/packages"
2626
)
2727

‎routers/api/packages/pypi/pypi.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import (
1212
"strings"
1313

1414
packages_model "code.gitea.io/gitea/models/packages"
15-
"code.gitea.io/gitea/modules/context"
1615
packages_module "code.gitea.io/gitea/modules/packages"
1716
pypi_module "code.gitea.io/gitea/modules/packages/pypi"
1817
"code.gitea.io/gitea/modules/setting"
1918
"code.gitea.io/gitea/modules/validation"
2019
"code.gitea.io/gitea/routers/api/packages/helper"
20+
"code.gitea.io/gitea/services/context"
2121
packages_service "code.gitea.io/gitea/services/packages"
2222
)
2323

‎routers/api/packages/rpm/rpm.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ import (
1313

1414
"code.gitea.io/gitea/models/db"
1515
packages_model "code.gitea.io/gitea/models/packages"
16-
"code.gitea.io/gitea/modules/context"
1716
"code.gitea.io/gitea/modules/json"
1817
packages_module "code.gitea.io/gitea/modules/packages"
1918
rpm_module "code.gitea.io/gitea/modules/packages/rpm"
2019
"code.gitea.io/gitea/modules/setting"
2120
"code.gitea.io/gitea/modules/util"
2221
"code.gitea.io/gitea/routers/api/packages/helper"
22+
"code.gitea.io/gitea/services/context"
2323
notify_service "code.gitea.io/gitea/services/notify"
2424
packages_service "code.gitea.io/gitea/services/packages"
2525
rpm_service "code.gitea.io/gitea/services/packages/rpm"

‎routers/api/packages/rubygems/rubygems.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import (
1313
"strings"
1414

1515
packages_model "code.gitea.io/gitea/models/packages"
16-
"code.gitea.io/gitea/modules/context"
1716
packages_module "code.gitea.io/gitea/modules/packages"
1817
rubygems_module "code.gitea.io/gitea/modules/packages/rubygems"
1918
"code.gitea.io/gitea/modules/util"
2019
"code.gitea.io/gitea/routers/api/packages/helper"
20+
"code.gitea.io/gitea/services/context"
2121
packages_service "code.gitea.io/gitea/services/packages"
2222
)
2323

‎routers/api/packages/swift/swift.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ import (
1313
"strings"
1414

1515
packages_model "code.gitea.io/gitea/models/packages"
16-
"code.gitea.io/gitea/modules/context"
1716
"code.gitea.io/gitea/modules/json"
1817
"code.gitea.io/gitea/modules/log"
1918
packages_module "code.gitea.io/gitea/modules/packages"
2019
swift_module "code.gitea.io/gitea/modules/packages/swift"
2120
"code.gitea.io/gitea/modules/setting"
2221
"code.gitea.io/gitea/modules/util"
2322
"code.gitea.io/gitea/routers/api/packages/helper"
23+
"code.gitea.io/gitea/services/context"
2424
packages_service "code.gitea.io/gitea/services/packages"
2525

2626
"github.com/hashicorp/go-version"

‎routers/api/packages/vagrant/vagrant.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
"strings"
1313

1414
packages_model "code.gitea.io/gitea/models/packages"
15-
"code.gitea.io/gitea/modules/context"
1615
packages_module "code.gitea.io/gitea/modules/packages"
1716
vagrant_module "code.gitea.io/gitea/modules/packages/vagrant"
1817
"code.gitea.io/gitea/modules/setting"
1918
"code.gitea.io/gitea/routers/api/packages/helper"
19+
"code.gitea.io/gitea/services/context"
2020
packages_service "code.gitea.io/gitea/services/packages"
2121

2222
"github.com/hashicorp/go-version"

‎routers/api/v1/activitypub/person.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"strings"
1010

1111
"code.gitea.io/gitea/modules/activitypub"
12-
"code.gitea.io/gitea/modules/context"
1312
"code.gitea.io/gitea/modules/log"
1413
"code.gitea.io/gitea/modules/setting"
14+
"code.gitea.io/gitea/services/context"
1515

1616
ap "github.com/go-ap/activitypub"
1717
"github.com/go-ap/jsonld"

‎routers/api/v1/activitypub/reqsignature.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313
"net/url"
1414

1515
"code.gitea.io/gitea/modules/activitypub"
16-
gitea_context "code.gitea.io/gitea/modules/context"
1716
"code.gitea.io/gitea/modules/httplib"
1817
"code.gitea.io/gitea/modules/setting"
18+
gitea_context "code.gitea.io/gitea/services/context"
1919

2020
ap "github.com/go-ap/activitypub"
2121
"github.com/go-fed/httpsig"

0 commit comments

Comments
 (0)