"
+ }
+
+ return table, nil
+}
+
+// Render render yaml contents as html
+func Render(data []byte) ([]byte, error) {
+ mss := []yaml.MapSlice{}
+
+ if len(data) < 1 {
+ return data, nil
+ }
+
+ if err := yaml.Unmarshal(data, &mss); err != nil {
+ ms := yaml.MapSlice{}
+ if err := yaml.Unmarshal(data, &ms); err != nil {
+ return nil, err
+ }
+ table, err := renderHorizontalHTMLTable(ms)
+ return []byte(table), err
+ }
+ table, err := renderVerticalHTMLTable(mss)
+ return []byte(table), err
+}
+
+// RenderSanitized render yaml as sanitized html
+func RenderSanitized(rawBytes []byte) ([]byte, error) {
+ result, err := Render(rawBytes)
+ if err != nil {
+ return nil, err
+ }
+ return sanitizer.SanitizeBytes(result), nil
+}
diff --git a/modules/yaml/yaml_test.go b/modules/yaml/yaml_test.go
new file mode 100644
index 0000000000..6f4c59a165
--- /dev/null
+++ b/modules/yaml/yaml_test.go
@@ -0,0 +1,31 @@
+// Copyright 2019 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+/*** DCS Customizations - Tests for YAML rendering ***/
+
+package yaml
+
+import (
+ "strings"
+ "testing"
+
+ "github.com/stretchr/testify/assert"
+)
+
+func TestRenderYaml(t *testing.T) {
+ // LF line endings
+ contents := "a: 1\nb: 2\n"
+ rendered, err := Render([]byte(contents))
+ assert.NoError(t, err)
+ assert.True(t, strings.HasSuffix(string(rendered), ""))
+
+ // CRLF line endings
+ contents = "a: 1\r\nb: 2\r\n"
+ _, err = Render([]byte(contents))
+ assert.NoError(t, err)
+ assert.True(t, strings.HasSuffix(string(rendered), ""))
+
+ contents = "misformatted&"
+ _, err = Render([]byte(contents))
+ assert.Error(t, err)
+}
diff --git a/options/label/BibleBooks b/options/label/BibleBooks
new file mode 100644
index 0000000000..cdd9e4e6ba
--- /dev/null
+++ b/options/label/BibleBooks
@@ -0,0 +1,68 @@
+#0052cc FRT ; Front Matter
+#0052cc GEN ; Genesis
+#0052cc EXO ; Exodus
+#0052cc LEV ; Leviticus
+#0052cc NUM ; Numbers
+#0052cc DEU ; Deuteronomy
+#0052cc JOS ; Joshua
+#0052cc JDG ; Judges
+#0052cc RUT ; Ruth
+#0052cc 1SA ; 1 Samuel
+#0052cc 2SA ; 2 Samuel
+#0052cc 1KI ; 1 Kings
+#0052cc 2KI ; 2 Kings
+#0052cc 1CH ; 1 Chronicles
+#0052cc 2CH ; 2 Chronicles
+#0052cc EZR ; Ezra
+#0052cc NEH ; Nehemiah
+#0052cc EST ; Esther
+#0052cc JOB ; Job
+#0052cc PSA ; Psalms
+#0052cc PRO ; Proverbs
+#0052cc ECC ; Ecclesiastes
+#0052cc SNG ; Song of Solomon
+#0052cc ISA ; Isaiah
+#0052cc JER ; Jeremiah
+#0052cc LAM ; Lamentations
+#0052cc EZK ; Ezekiel
+#0052cc DAN ; Daniel
+#0052cc HOS ; Hosea
+#0052cc JOL ; Joel
+#0052cc AMO ; Amos
+#0052cc OBA ; Obadiah
+#0052cc JON ; Jonah
+#0052cc MIC ; Micah
+#0052cc NAM ; Nahum
+#0052cc HAB ; Habakkuk
+#0052cc ZEP ; Zephaniah
+#0052cc HAG ; Haggai
+#0052cc ZEC ; Zechariah
+#0052cc MAL ; Malachi
+#0052cc MAT ; Matthew
+#0052cc MRK ; Mark
+#0052cc LUK ; Luke
+#0052cc JHN ; John
+#0052cc ACT ; Acts
+#0052cc ROM ; Romans
+#0052cc 1CO ; 1 Corinthians
+#0052cc 2CO ; 2 Corinthians
+#0052cc GAL ; Galatians
+#0052cc EPH ; Ephesians
+#0052cc PHP ; Philippians
+#0052cc COL ; Colossians
+#0052cc 1TH ; 1 Thessalonians
+#0052cc 2TH ; 2 Thessalonians
+#0052cc 1TI ; 1 Timothy
+#0052cc 2TI ; 2 Timothy
+#0052cc TIT ; Titus
+#0052cc PHM ; Philemon
+#0052cc HEB ; Hebrews
+#0052cc JAS ; James
+#0052cc 1PE ; 1 Peter
+#0052cc 2PE ; 2 Peter
+#0052cc 1JN ; 1 John
+#0052cc 2JN ; 2 John
+#0052cc 3JN ; 3 John
+#0052cc JUD ; Jude
+#0052cc REV ; Revelation
+#0052cc BAK ; Back Matter
diff --git a/options/license/CC-BY-SA-4.0.md b/options/license/CC-BY-SA-4.0.md
new file mode 100644
index 0000000000..fdf0e78715
--- /dev/null
+++ b/options/license/CC-BY-SA-4.0.md
@@ -0,0 +1,25 @@
+# License
+
+## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
+
+This is a human-readable summary of (and not a substitute for) the full license found at http://creativecommons.org/licenses/by-sa/4.0/.
+
+### You are free to:
+
+ * **Share** — copy and redistribute the material in any medium or format
+ * **Adapt** — remix, transform, and build upon the material for any purpose, even commercially.
+
+The licensor cannot revoke these freedoms as long as you follow the license terms.
+
+### Under the following conditions:
+
+ * **Attribution** — You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.
+ * **ShareAlike** — If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.
+
+**No additional restrictions** — You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.
+
+### Notices:
+
+You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation.
+
+No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material.
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 8c40bbc01d..bcf298b79a 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -117,6 +117,11 @@ go_back = Go Back
never = Never
unknown = Unknown
+;;; DCS Customizations
+catalog = Catalog
+return_to_gitea = Return to DCS
+;;; END DCS Customizations
+
rss_feed = RSS Feed
pin = Pin
@@ -353,6 +358,14 @@ code_last_indexed_at = Last indexed %s
relevant_repositories_tooltip = Repositories that are forks or that have no topic, no icon, and no description are hidden.
relevant_repositories = Only relevant repositories are being shown, show unfiltered results.
+;;; DCS Customizations [explore]
+code = Files
+code_no_results = No files matching your search term found.
+released = Released
+language = Language
+subject = Subject
+;;; END DCS Customizations [explore]
+
[auth]
create_new_account = Register Account
register_helper_msg = Already have an account? Sign in now!
@@ -477,6 +490,11 @@ release.downloads = Downloads:
release.download.zip = Source Code (ZIP)
release.download.targz = Source Code (TAR.GZ)
+;;; DCS Customizations [release]
+release.download.zip = Source Files (ZIP)
+release.download.targz = Source Files (TAR.GZ)
+;;; END DCS Customizations [release]
+
repo.transfer.subject_to = %s would like to transfer "%s" to %s
repo.transfer.subject_to_you = %s would like to transfer "%s" to you
repo.transfer.to_you = you
@@ -1196,6 +1214,15 @@ line = line
lines = lines
from_comment = (comment)
+;;; DCS Customizations [repo]
+code = Files
+code.desc = Access to files, commits and branches
+auto_init = Initialize this repository with license and README file
+auto_init_helper = This will let you immediately clone the repository to your computer. Uncheck this box if you're importing an existing repository.
+expand_view = Expand View
+compact_view = Compact View
+;;; END DCS Customizations [repo]
+
editor.add_file = Add File
editor.new_file = New File
editor.upload_file = Upload File
@@ -2400,6 +2427,17 @@ settings.rename_branch_from=old branch name
settings.rename_branch_to=new branch name
settings.rename_branch=Rename branch
+;;; DCS Customizations [repo.settings]
+settings.scrub = Remove Sensitive Data
+settings.scrub_desc = Removes names, email addresses, and phone numbers from the manifest.json, project.json, package.json or status.json files in the repository
+settings.scrub_notices_1 = This will remove all names, email addresses, and phone numbers from the manifest.json, project.json, package.jon or status.json files in the repository
+settings.scrub_form_title = Please enter following information to confirm your operation:
+settings.scrub_success = Successfully removed sensitive data
+settings.scrub_commit_message = Removed sensitive data
+settings.scrub_error = There was as an error removing sensitive data. Please make sure all JSON files are formatted properly.
+settings.scrub_nothing_to_scurb = There is nothing that can be removed from the project's JSON files
+;;; END DCS Customizations [repo.settings]
+
diff.browse_source = Browse Source
diff.parent = parent
diff.commit = commit
@@ -2505,6 +2543,10 @@ release.add_tag = Create Tag Only
release.releases_for = Releases for %s
release.tags_for = Tags for %s
+;;; DCS Customizations [release]
+release.source_code = Source Files
+;;; END DCS Customizations [release]
+
branch.name = Branch Name
branch.already_exists = A branch named "%s" already exists.
branch.delete_head = Delete
@@ -2560,6 +2602,56 @@ error.csv.too_large = Can't render this file because it is too large.
error.csv.unexpected = Can't render this file because it contains an unexpected character in line %d and column %d.
error.csv.invalid_field_count = Can't render this file because it has a wrong number of fields in line %d.
+;;; DCS Customizations [repo.metadata]
+metadata.desc = Track tagged version and master branch metadata.
+metadata.metadatas = Metadatas
+metadata.new_metadata = New Metadata
+metadata.edit = edit
+metadata.tag_name = Tag name
+metadata.tag_helper = Choose an existing tag or leave blank for default branch.
+metadata.metadata = Metadata
+metadata.cancel = Cancel
+metadata.create = Create Metadata
+metadata.edit_metadata = Update Metadata
+metadata.delete_metadata = Delete Metadata
+metadata.deletion = Delete Metadata
+metadata.deletion_desc = Deleting a metadata removes its metadata content from the database
+metadata.deletion_success = The metadata has been deleted.
+metadata.metadata_already_exist = A metadata with this tag name already exists.
+metadata.tag_name_invalid = The tag name is not valid.
+metadata.metadata_not_proper_json = The metadata is not in proper JSON format: %s
+metadata.catalog = Catalog
+metadata.provider = Provider
+metadata.publisher = Publisher
+metadata.title = Title
+metadata.subject = Subject
+metadata.metadata_type = Metadata Type
+metadata.language = Language
+metadata.resource = Resource
+metadata.ingredients = Ingredients
+metadata.stage = Stage
+metadata.release_date = Release Date
+metadata.last_updated = Last Updated
+metadata.invalid = Invalid
+metadata.valid = Valid
+metadata.valid_metadata_tooltip = Valid %s file
+metadata.invalid_metadata_tooltip = Invalid $s file
+metadata.label.filter_sort.title = Title
+metadata.label.filter_sort.reverse_title = Reverse Title
+metadata.label.filter_sort.subject = Subject
+metadata.label.filter_sort.reverse_subject = Reverse Subject
+metadata.label.filter_sort.resource = Resource
+metadata.label.filter_sort.reverse_resource = Reverse Resource
+metadata.label.filter_sort.reponame = Repo Name
+metadata.label.filter_sort.reverse_reponame = Reverse Repo Name
+metadata.label.filter_sort.tag = Release Tag
+metadata.label.filter_sort.reverse_tag = Reverse Release Tag
+metadata.label.filter_sort.langcode = Language code
+metadata.label.filter_sort.reverse_langcode = Reverse Language code
+metadata.label.filter_sort.mostreleases = Most releases
+metadata.label.filter_sort.fewestreleases = Fewest releases
+;;; END DCS Customizations [repo.metadatas]
+
[org]
org_name_holder = Organization Name
org_full_name_holder = Organization Full Name
@@ -2787,6 +2879,11 @@ dashboard.start_schedule_tasks = Start schedule tasks
dashboard.sync_branch.started = Branches Sync started
dashboard.rebuild_issue_indexer = Rebuild issue indexer
+;;; DCS Customizations
+dashboard.update_metadata = Update Door43 Metadata
+dashboard.load_schemas = Load Metadata Schemas
+;;; END DCS Customizations
+
users.user_manage_panel = User Account Management
users.new_account = Create User Account
users.name = Username
@@ -2845,6 +2942,10 @@ users.list_status_filter.is_2fa_enabled = 2FA Enabled
users.list_status_filter.not_2fa_enabled = 2FA Disabled
users.details = User Details
+# DCS Customizations
+users.list_status_filter.is_spam_user = Spam User
+# END DCS Customizations
+
emails.email_manage_panel = User Email Management
emails.primary = Primary
emails.activated = Activated
@@ -3300,6 +3401,13 @@ unit = Unit
error.no_unit_allowed_repo = You are not allowed to access any section of this repository.
error.unit_not_allowed = You are not allowed to access this repository section.
+;;; DCS Customizations [signup]
+[signup]
+agreement = By creating an account on this website, you affirm that you have read and understood the Terms & Conditions and agree to:
Only add content to this website that does not infringe on someone else's copyright.
Only add content to this website that does not conflict with the Statement of Faith.
is present, but fully validating XML using RegEx is impossible, and this suffices for the common case of simple formatted text.",
+ "pattern": "^((<(p|h1|h2|h3)\\s*/>|([^<]|<[^p])*|([^<]|<[^h])*|([^<]|<[^h])*|([^<]|<[^h])*|\\s*((|.*)\\s*)+|\\s*((|.*)\\s*)+|(<(p|h1|h2|h3)\\s*/>|<(p|h[123])\\s*>([^<]|<[^ph])*|(|.*)+|(|.*)+|.+)+)\\s*)+$"
+ },
+ {
+ "$comment": "Ensure that no invalid tags are present, check inline markup in
and (noting that
may contain pretty much anything), and prevent improper nesting of
tags.",
+ "pattern": "^([^<]|<(p|h[123]|a|br|strong|b|em|i)\\s*/>||<(p|h[123])\\s*>([^<]||>\\s*)||)*|<[ou]l\\s*>(\\s|)*|(\\s|)*(|))+$"
+ }
+ ],
+ "description": "A rich text string specified in a limited subset of XHTML."
+ },
+ "localizedRichText": {
+ "type": "object",
+ "additionalProperties": {
+ "$ref": "#/definitions/simplifiedXHTML"
+ },
+ "propertyNames": {
+ "$ref": "#/definitions/languageTag"
+ },
+ "minProperties": 1,
+ "description": "A simplified XHTML string specified in one or multiple languages, indexed by IETF language tag."
+ },
+ "bookId": {
+ "type": "string",
+ "pattern": "^[A-Z0-9]{3}$",
+ "minLength": 3,
+ "maxLength": 3,
+ "enum": [
+ "GEN",
+ "EXO",
+ "LEV",
+ "NUM",
+ "DEU",
+ "JOS",
+ "JDG",
+ "RUT",
+ "1SA",
+ "2SA",
+ "1KI",
+ "2KI",
+ "1CH",
+ "2CH",
+ "EZR",
+ "NEH",
+ "EST",
+ "JOB",
+ "PSA",
+ "PRO",
+ "ECC",
+ "SNG",
+ "ISA",
+ "JER",
+ "LAM",
+ "EZK",
+ "DAN",
+ "HOS",
+ "JOL",
+ "AMO",
+ "OBA",
+ "JON",
+ "MIC",
+ "NAM",
+ "HAB",
+ "ZEP",
+ "HAG",
+ "ZEC",
+ "MAL",
+ "MAT",
+ "MRK",
+ "LUK",
+ "JHN",
+ "ACT",
+ "ROM",
+ "1CO",
+ "2CO",
+ "GAL",
+ "EPH",
+ "PHP",
+ "COL",
+ "1TH",
+ "2TH",
+ "1TI",
+ "2TI",
+ "TIT",
+ "PHM",
+ "HEB",
+ "JAS",
+ "1PE",
+ "2PE",
+ "1JN",
+ "2JN",
+ "3JN",
+ "JUD",
+ "REV",
+ "TOB",
+ "JDT",
+ "ESG",
+ "WIS",
+ "SIR",
+ "BAR",
+ "LJE",
+ "S3Y",
+ "SUS",
+ "BEL",
+ "1MA",
+ "2MA",
+ "3MA",
+ "4MA",
+ "1ES",
+ "2ES",
+ "MAN",
+ "PS2",
+ "ODA",
+ "PSS",
+ "JSA",
+ "JDB",
+ "TBS",
+ "SST",
+ "DNT",
+ "BLT",
+ "EZA",
+ "5EZ",
+ "6EZ",
+ "DAG",
+ "PS3",
+ "2BA",
+ "LBA",
+ "JUB",
+ "ENO",
+ "1MQ",
+ "2MQ",
+ "3MQ",
+ "REP",
+ "4BA",
+ "LAO"
+ ],
+ "description": "A USFM book code consisting of three uppercase alphanumerics."
+ },
+ "path": {
+ "type": "string",
+ "pattern": "^[^\\/:?*\"><|]+(/[^\\/:?*\"><|]+)*$",
+ "description": "A file path, delimited by forward slashes."
+ },
+ "mimeType": {
+ "type": "string",
+ "pattern": "^[\\-a-z0-9]+/[\\-a-z0-9+]+$",
+ "description": "An IANA media type (also known as MIME type)"
+ }
+ }
+}
diff --git a/options/schema/sb100/confidential.schema.json b/options/schema/sb100/confidential.schema.json
new file mode 100644
index 0000000000..624aa63436
--- /dev/null
+++ b/options/schema/sb100/confidential.schema.json
@@ -0,0 +1,8 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/confidential.schema.json",
+ "$$target": "confidential.schema.json",
+ "title": "Confidential",
+ "type": "boolean",
+ "description": "a true value indicates that the project should not be publicly known and that the identity of project members needs to be kept confidential."
+}
diff --git a/options/schema/sb100/copyright.schema.json b/options/schema/sb100/copyright.schema.json
new file mode 100644
index 0000000000..2af94e626c
--- /dev/null
+++ b/options/schema/sb100/copyright.schema.json
@@ -0,0 +1,81 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/copyright.schema.json",
+ "$$target": "copyright.schema.json",
+ "title": "Copyright and License Information",
+ "type": "object",
+ "description": "Describes the copyright holders and license terms of the burrito.",
+ "properties": {
+ "licenses": {
+ "type": "array",
+ "minItems": 1,
+ "items": {
+ "type": "object",
+ "properties": {
+ "url": {
+ "$ref": "common.schema.json#/definitions/url"
+ },
+ "ingredient": {
+ "$ref": "common.schema.json#/definitions/path"
+ }
+ },
+ "oneOf": [
+ {
+ "required": ["url"]
+ },
+ {
+ "required": ["ingredient"]
+ }
+ ],
+ "additionalProperties": false
+ },
+ "description": "The licenses, which state under which terms the burrito may be used, can be specified either as URL or as path to an ingredient."
+ },
+ "publicDomain": {
+ "type": "boolean",
+ "description": "If set to true, the contents of this burrito are in the public domain."
+ },
+ "shortStatements": {
+ "type": "array",
+ "minItems": 1,
+ "items": {
+ "type": "object",
+ "properties": {
+ "statement": {
+ "type": "string",
+ "maxLength": 500
+ },
+ "lang": {
+ "$ref": "common.schema.json#/definitions/languageTag"
+ },
+ "mimetype": {
+ "$ref": "common.schema.json#/definitions/mimeType"
+ }
+ },
+ "required": ["statement"],
+ "additionalProperties": false
+ },
+ "description": "A short statement to explain the copyright / license information to readers"
+ }
+ },
+ "additionalProperties": false,
+ "oneOf": [
+ {
+ "type": "object",
+ "properties": {
+ "publicDomain": {
+ "const": true
+ }
+ },
+ "required": ["publicDomain"]
+ },
+ {
+ "type": "object",
+ "required": ["shortStatements"]
+ },
+ {
+ "type": "object",
+ "required": ["licenses"]
+ }
+ ]
+}
diff --git a/options/schema/sb100/copyright_constraints.schema.json b/options/schema/sb100/copyright_constraints.schema.json
new file mode 100644
index 0000000000..670048036a
--- /dev/null
+++ b/options/schema/sb100/copyright_constraints.schema.json
@@ -0,0 +1,38 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/copyright_constraints.schema.json",
+ "$$target": "copyright_constraints.schema.json",
+ "title": "Copyright Constraints",
+ "description": "Constraints on properties relating to copyright.",
+ "if": {
+ "type": "object",
+ "properties": {
+ "copyright": {
+ "type": "object",
+ "properties": {
+ "publicDomain": false
+ }
+ }
+ }
+ },
+ "then": {
+ "type": "object",
+ "properties": {
+ "agencies": {
+ "type": "array",
+ "contains": {
+ "type": "object",
+ "properties": {
+ "roles": {
+ "type": "array",
+ "contains": {
+ "type": "string",
+ "pattern": "rightsHolder"
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/options/schema/sb100/derived_meta.schema.json b/options/schema/sb100/derived_meta.schema.json
new file mode 100644
index 0000000000..edf515e76a
--- /dev/null
+++ b/options/schema/sb100/derived_meta.schema.json
@@ -0,0 +1,34 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/derived_meta.schema.json",
+ "$$target": "derived_meta.schema.json",
+ "title": "Meta (Derived)",
+ "type": "object",
+ "description": "Information about the Scripture Burrito metadata file.",
+ "properties": {
+ "category": {
+ "const": "derived"
+ },
+ "dateCreated": {
+ "$ref": "meta_date_created.schema.json"
+ },
+ "version": {
+ "$ref": "meta_version.schema.json"
+ },
+ "generator": {
+ "$ref": "software_and_user_info.schema.json",
+ "description": "Information about the program and user who generated this burrito."
+ },
+ "defaultLocale": {
+ "$ref": "meta_default_language.schema.json"
+ },
+ "normalization": {
+ "$ref": "normalization.schema.json"
+ },
+ "comments": {
+ "$ref": "meta_comments.schema.json"
+ }
+ },
+ "required": ["version", "category", "dateCreated", "defaultLocale"],
+ "additionalProperties": false
+}
diff --git a/options/schema/sb100/derived_metadata.schema.json b/options/schema/sb100/derived_metadata.schema.json
new file mode 100644
index 0000000000..a66eb643fc
--- /dev/null
+++ b/options/schema/sb100/derived_metadata.schema.json
@@ -0,0 +1,73 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/derived_metadata.schema.json",
+ "$$target": "derived_metadata.schema.json",
+ "title": "Metadata (Derived)",
+ "type": "object",
+ "description": "Scripture Burrito derived variant root.",
+ "properties": {
+ "format": {
+ "type": "string",
+ "enum": ["scripture burrito"]
+ },
+ "meta": {
+ "$ref": "derived_meta.schema.json"
+ },
+ "idAuthorities": {
+ "$ref": "id_authorities.schema.json"
+ },
+ "identification": {
+ "$ref": "identification.schema.json"
+ },
+ "confidential": {
+ "$ref": "confidential.schema.json"
+ },
+ "type": {
+ "$ref": "type.schema.json"
+ },
+ "relationships": {
+ "$ref": "relationships.schema.json"
+ },
+ "languages": {
+ "$ref": "languages.schema.json"
+ },
+ "targetAreas": {
+ "$ref": "target_areas.schema.json"
+ },
+ "agencies": {
+ "$ref": "agencies.schema.json"
+ },
+ "copyright": {
+ "$ref": "copyright.schema.json"
+ },
+ "promotion": {
+ "$ref": "promotion.schema.json"
+ },
+ "ingredients": {
+ "$ref": "ingredients.schema.json"
+ },
+ "localizedNames": {
+ "$ref": "localized_names.schema.json"
+ },
+ "recipe": {
+ "$ref": "recipe.schema.json"
+ }
+ },
+ "required": ["format", "meta", "idAuthorities", "identification", "confidential", "copyright", "type", "recipe"],
+ "additionalProperties": false,
+ "if": {
+ "properties": {
+ "type": {
+ "type": "object",
+ "properties": {
+ "flavorType": {
+ "enum": ["scripture", "gloss"]
+ }
+ }
+ }
+ }
+ },
+ "then": {
+ "required": ["languages"]
+ }
+}
diff --git a/options/schema/sb100/gloss/text_stories.schema.json b/options/schema/sb100/gloss/text_stories.schema.json
new file mode 100644
index 0000000000..177df8423a
--- /dev/null
+++ b/options/schema/sb100/gloss/text_stories.schema.json
@@ -0,0 +1,14 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/gloss/text_stories.schema.json",
+ "$$target": "text_stories.schema.json",
+ "title": "Flavor Details: Glossed Text Stories",
+ "type": "object",
+ "description": "Schema of flavor field for textStories flavor",
+ "properties": {
+ "name": {
+ "const": "textStories"
+ }
+ },
+ "additionalProperties": false
+}
diff --git a/options/schema/sb100/id_authorities.schema.json b/options/schema/sb100/id_authorities.schema.json
new file mode 100644
index 0000000000..300d8ac422
--- /dev/null
+++ b/options/schema/sb100/id_authorities.schema.json
@@ -0,0 +1,24 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/id_authorities.schema.json",
+ "$$target": "id_authorities.schema.json",
+ "title": "idAuthorities",
+ "type": "object",
+ "description": "Declares one or more identity authorities which may later be referred to using identifier prefixes.",
+ "additionalProperties": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "$ref": "common.schema.json#/definitions/url"
+ },
+ "name": {
+ "$ref": "common.schema.json#/definitions/localizedText"
+ }
+ },
+ "propertyNames": {
+ "$ref": "common.schema.json#/definitions/idAuthorityLabel"
+ },
+ "minProperties": 1
+ },
+ "minProperties": 1
+}
diff --git a/options/schema/sb100/identification.schema.json b/options/schema/sb100/identification.schema.json
new file mode 100644
index 0000000000..38635741bf
--- /dev/null
+++ b/options/schema/sb100/identification.schema.json
@@ -0,0 +1,66 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/identification.schema.json",
+ "$$target": "identification.schema.json",
+ "title": "Identification",
+ "type": "object",
+ "description": "Identification section.",
+ "definitions": {
+ "revisionString": {
+ "type": "string",
+ "pattern": "^[0-9A-Za-z]([0-9A-Za-z_.:\\-]{0,62}[0-9A-Za-z])?$"
+ }
+ },
+ "properties": {
+ "name": {
+ "$ref": "common.schema.json#/definitions/localizedText"
+ },
+ "description": {
+ "$ref": "common.schema.json#/definitions/localizedText"
+ },
+ "abbreviation": {
+ "$ref": "common.schema.json#/definitions/localizedText"
+ },
+ "primary": {
+ "type": "object",
+ "additionalProperties": {
+ "type": "object",
+ "additionalProperties": {
+ "type": "object",
+ "revision": {
+ "$ref": "common.schema.json#/definitions/revisionString"
+ },
+ "timestamp": {
+ "$ref": "common.schema.json#/definitions/timestamp"
+ },
+ "required": ["revision", "timestamp"]
+ }
+ },
+ "minProperties": 1,
+ "maxProperties": 1,
+ "description": "Contains the primary authority and identification information."
+ },
+ "upstream": {
+ "type": "object",
+ "additionalProperties": {
+ "type": "array",
+ "items": {
+ "type": "object",
+ "additionalProperties": {
+ "type": "object",
+ "revision": {
+ "$ref": "common.schema.json#/definitions/revisionString"
+ },
+ "timestamp": {
+ "$ref": "common.schema.json#/definitions/timestamp"
+ },
+ "required": ["revision", "timestamp"]
+ }
+ }
+ },
+ "description": "Contains the upstream authority and identification information."
+ }
+ },
+ "required": ["name", "primary"],
+ "additionalProperties": false
+}
diff --git a/options/schema/sb100/index.js b/options/schema/sb100/index.js
new file mode 100644
index 0000000000..2d501c4a60
--- /dev/null
+++ b/options/schema/sb100/index.js
@@ -0,0 +1,57 @@
+module.exports = {
+ schemaIds: {
+ "metadata": "https://burrito.bible/schema/metadata.schema.json",
+ "referenceFormat": "https://burrito.bible/schema/reference_format.schema.json"
+ },
+ schemas: [
+ require("./agencies.schema.json"),
+ require("./agency.schema.json"),
+ require("./common.schema.json"),
+ require("./confidential.schema.json"),
+ require("./copyright.schema.json"),
+ require("./copyright_constraints.schema.json"),
+ require("./derived_meta.schema.json"),
+ require("./derived_metadata.schema.json"),
+ require("./gloss/text_stories.schema.json"),
+ require("./identification.schema.json"),
+ require("./id_authorities.schema.json"),
+ require("./ingredient.schema.json"),
+ require("./ingredients.schema.json"),
+ require("./language.schema.json"),
+ require("./languages.schema.json"),
+ require("./localized_name.schema.json"),
+ require("./localized_names.schema.json"),
+ require("./meta_comments.schema.json"),
+ require("./meta_date_created.schema.json"),
+ require("./meta_default_language.schema.json"),
+ require("./meta_version.schema.json"),
+ require("./metadata.schema.json"),
+ require("./normalization.schema.json"),
+ require("./numbering_system.schema.json"),
+ require("./progress.schema.json"),
+ require("./promotion.schema.json"),
+ require("./recipe.schema.json"),
+ require("./recipe_section.schema.json"),
+ require("./recipe_element.schema.json"),
+ require("./reference_format.schema.json"),
+ require("./relationships.schema.json"),
+ require("./relationship.schema.json"),
+ require("./scripture/audio_translation.schema.json"),
+ require("./scripture/embossed_braille_scripture.schema.json"),
+ require("./scripture/sign_language_video_translation.schema.json"),
+ require("./scripture/text_translation.schema.json"),
+ require("./scripture/typeset_scripture.schema.json"),
+ require("./role.schema.json"),
+ require("./scope.schema.json"),
+ require("./software_and_user_info.schema.json"),
+ require("./source_meta.schema.json"),
+ require("./source_metadata.schema.json"),
+ require("./target_areas.schema.json"),
+ require("./target_area.schema.json"),
+ require("./template_meta.schema.json"),
+ require("./template_metadata.schema.json"),
+ require("./type.schema.json"),
+ require("./unm49.schema.json"),
+ require("./x_flavor.schema.json")
+ ]
+};
diff --git a/options/schema/sb100/ingredient.schema.json b/options/schema/sb100/ingredient.schema.json
new file mode 100644
index 0000000000..77afabce52
--- /dev/null
+++ b/options/schema/sb100/ingredient.schema.json
@@ -0,0 +1,49 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/ingredient.schema.json",
+ "$$target": "ingredient.schema.json",
+ "title": "Ingredient",
+ "type": "object",
+ "description": "Describes an individual ingredient, which is a file contained within the burrito.",
+ "properties": {
+ "size": {
+ "type": "integer",
+ "minimum": 0,
+ "description": "The number of bytes that this ingredient takes up on disk."
+ },
+ "lang": {
+ "$ref": "common.schema.json#/definitions/languageTag"
+ },
+ "mimeType": {
+ "$ref": "common.schema.json#/definitions/mimeType"
+ },
+ "checksum": {
+ "type": "object",
+ "properties": {
+ "md5": {
+ "type": "string",
+ "pattern": "^[a-f0-9]{32}$"
+ },
+ "sha3-256": {
+ "type": "string",
+ "pattern": "^[a-f0-9]{64}$"
+ },
+ "sha3-512": {
+ "type": "string",
+ "pattern": "^[a-f0-9]{128}$"
+ }
+ },
+ "required": ["md5"],
+ "maxProperties": 2,
+ "additionalProperties": false
+ },
+ "scope": {
+ "$ref": "scope.schema.json"
+ },
+ "role": {
+ "$ref": "role.schema.json"
+ }
+ },
+ "required": ["size", "mimeType"],
+ "additionalProperties": false
+}
diff --git a/options/schema/sb100/ingredients.schema.json b/options/schema/sb100/ingredients.schema.json
new file mode 100644
index 0000000000..62615b6f30
--- /dev/null
+++ b/options/schema/sb100/ingredients.schema.json
@@ -0,0 +1,15 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/ingredients.schema.json",
+ "$$target": "ingredients.schema.json",
+ "title": "Ingredients",
+ "type": "object",
+ "additionalProperties": {
+ "$ref": "ingredient.schema.json"
+ },
+ "propertyNames": {
+ "$ref": "common.schema.json#/definitions/path"
+ },
+ "minProperties": 1,
+ "description": "Describes the various files contained by the burrito, keyed by the canonical forward-slashed pathname of the file."
+}
diff --git a/options/schema/sb100/language.schema.json b/options/schema/sb100/language.schema.json
new file mode 100644
index 0000000000..af853c5521
--- /dev/null
+++ b/options/schema/sb100/language.schema.json
@@ -0,0 +1,29 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/language.schema.json",
+ "$$target": "language.schema.json",
+ "title": "Language",
+ "type": "object",
+ "description": "Language section.",
+ "properties": {
+ "tag": {
+ "$ref": "common.schema.json#/definitions/languageTag",
+ "examples": ["hi", "es-419"]
+ },
+ "name": {
+ "$ref": "common.schema.json#/definitions/localizedText"
+ },
+ "numberingSystem": {
+ "$ref": "numbering_system.schema.json"
+ },
+ "rod": {
+ "$ref": "common.schema.json#/definitions/rodCode"
+ },
+ "scriptDirection": {
+ "type": "string",
+ "enum": ["ltr", "rtl"]
+ }
+ },
+ "required": ["tag", "name"],
+ "additionalProperties": false
+}
diff --git a/options/schema/sb100/languages.schema.json b/options/schema/sb100/languages.schema.json
new file mode 100644
index 0000000000..de67fd3321
--- /dev/null
+++ b/options/schema/sb100/languages.schema.json
@@ -0,0 +1,12 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/languages.schema.json",
+ "$$target": "languages.schema.json",
+ "title": "Languages",
+ "type": "array",
+ "items": {
+ "$ref": "language.schema.json"
+ },
+ "minItems": 1,
+ "description": "A list of all the languages of the contents of this burrito."
+}
diff --git a/options/schema/sb100/localized_name.schema.json b/options/schema/sb100/localized_name.schema.json
new file mode 100644
index 0000000000..5c098a0222
--- /dev/null
+++ b/options/schema/sb100/localized_name.schema.json
@@ -0,0 +1,21 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/localized_name.schema.json",
+ "$$target": "localized_name.schema.json",
+ "title": "Localized Name",
+ "type": "object",
+ "description": "Contains localized names for books, etc.",
+ "properties": {
+ "short": {
+ "$ref": "common.schema.json#/definitions/localizedText"
+ },
+ "long": {
+ "$ref": "common.schema.json#/definitions/localizedText"
+ },
+ "abbr": {
+ "$ref": "common.schema.json#/definitions/localizedText"
+ }
+ },
+ "required": ["short"],
+ "additionalProperties": false
+}
diff --git a/options/schema/sb100/localized_names.schema.json b/options/schema/sb100/localized_names.schema.json
new file mode 100644
index 0000000000..5f0c10c122
--- /dev/null
+++ b/options/schema/sb100/localized_names.schema.json
@@ -0,0 +1,11 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/localized_names.schema.json",
+ "$$target": "localized_names.schema.json",
+ "title": "Localized Names",
+ "type": "object",
+ "additionalProperties": {
+ "$ref": "localized_name.schema.json"
+ },
+ "description": "Contains localized names for books, etc."
+}
diff --git a/options/schema/sb100/meta_comments.schema.json b/options/schema/sb100/meta_comments.schema.json
new file mode 100644
index 0000000000..6aa028b480
--- /dev/null
+++ b/options/schema/sb100/meta_comments.schema.json
@@ -0,0 +1,11 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/meta_comments.schema.json",
+ "$$target": "meta_comments.schema.json",
+ "title": "Meta Comments",
+ "type": "array",
+ "items": {
+ "type": "string"
+ },
+ "description": "Arbitrary text strings attached by users with no effect on the interpretation of the Scripture Burrito."
+}
diff --git a/options/schema/sb100/meta_date_created.schema.json b/options/schema/sb100/meta_date_created.schema.json
new file mode 100644
index 0000000000..6b9d5ad5a6
--- /dev/null
+++ b/options/schema/sb100/meta_date_created.schema.json
@@ -0,0 +1,8 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/meta_date_created.schema.json",
+ "$$target": "meta_date_created.schema.json",
+ "title": "Meta Date created",
+ "type": "string",
+ "format": "date-time"
+}
diff --git a/options/schema/sb100/meta_default_language.schema.json b/options/schema/sb100/meta_default_language.schema.json
new file mode 100644
index 0000000000..1fabf70948
--- /dev/null
+++ b/options/schema/sb100/meta_default_language.schema.json
@@ -0,0 +1,8 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/meta_default_language.schema.json",
+ "$$target": "meta_default_language.schema.json",
+ "title": "Meta Default Language",
+ "$ref": "common.schema.json#/definitions/languageTag",
+ "description": "The BCP47 code of the language that should be displayed, if a default is required, and for which localization is required in all name fields specified for 'catalog' validation."
+}
diff --git a/options/schema/sb100/meta_version.schema.json b/options/schema/sb100/meta_version.schema.json
new file mode 100644
index 0000000000..813465470b
--- /dev/null
+++ b/options/schema/sb100/meta_version.schema.json
@@ -0,0 +1,9 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/meta_version.schema.json",
+ "$$target": "meta_version.schema.json",
+ "title": "Meta Version",
+ "type": "string",
+ "enum": ["1.0.0"],
+ "description": "Version of the Scripture Burrito specification this file follows."
+}
diff --git a/options/schema/sb100/metadata.schema.json b/options/schema/sb100/metadata.schema.json
new file mode 100644
index 0000000000..8add8f23a0
--- /dev/null
+++ b/options/schema/sb100/metadata.schema.json
@@ -0,0 +1,53 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/metadata.schema.json",
+ "$$target": "metadata.schema.json",
+ "title": "Metadata",
+ "type": "object",
+ "description": "Scripture Burrito root metadata object.",
+ "properties": {
+ "meta": {
+ "type": "object",
+ "properties": {
+ "category": {
+ "enum": ["source", "derived", "template"]
+ }
+ }
+ }
+ },
+ "if": {
+ "properties": {
+ "meta": {
+ "type": "object",
+ "properties": {
+ "category": {
+ "const": "source"
+ }
+ }
+ }
+ }
+ },
+ "then": {
+ "$ref": "source_metadata.schema.json"
+ },
+ "else": {
+ "if": {
+ "properties": {
+ "meta": {
+ "type": "object",
+ "properties": {
+ "category": {
+ "const": "derived"
+ }
+ }
+ }
+ }
+ },
+ "then": {
+ "$ref": "derived_metadata.schema.json"
+ },
+ "else": {
+ "$ref": "template_metadata.schema.json"
+ }
+ }
+}
diff --git a/options/schema/sb100/normalization.schema.json b/options/schema/sb100/normalization.schema.json
new file mode 100644
index 0000000000..e77ba988c8
--- /dev/null
+++ b/options/schema/sb100/normalization.schema.json
@@ -0,0 +1,14 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/normalization.schema.json",
+ "$$target": "normalization.schema.json",
+ "title": "Normalization",
+ "type": "string",
+ "description": "Unicode normalization options. This applies to both ingredients and metadata.",
+ "enum": [
+ "NFC",
+ "NFD",
+ "NFKC",
+ "NFKD"
+ ]
+}
diff --git a/options/schema/sb100/numbering_system.schema.json b/options/schema/sb100/numbering_system.schema.json
new file mode 100644
index 0000000000..05eb8e1d24
--- /dev/null
+++ b/options/schema/sb100/numbering_system.schema.json
@@ -0,0 +1,96 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/numbering_system.schema.json",
+ "$$target": "numbering_system.schema.json",
+ "title": "Numbering System",
+ "type": "string",
+ "description": "Numbering System",
+ "enum": [
+ "adlm",
+ "ahom",
+ "arab",
+ "arabext",
+ "armn",
+ "armnlow",
+ "bali",
+ "beng",
+ "bhks",
+ "brah",
+ "cakm",
+ "cham",
+ "cyrl",
+ "deva",
+ "ethi",
+ "finance",
+ "fullwide",
+ "geor",
+ "gong",
+ "gonm",
+ "grek",
+ "greklow",
+ "gujr",
+ "guru",
+ "hanidays",
+ "hanidec",
+ "hans",
+ "hansfin",
+ "hant",
+ "hantfin",
+ "hebr",
+ "hmng",
+ "hmnp",
+ "java",
+ "jpan",
+ "jpanfin",
+ "jpanyear",
+ "kali",
+ "khmr",
+ "knda",
+ "lana",
+ "lanatham",
+ "laoo",
+ "latn",
+ "lepc",
+ "limb",
+ "mathbold",
+ "mathdbl",
+ "mathmono",
+ "mathsanb",
+ "mathsans",
+ "mlym",
+ "modi",
+ "mong",
+ "mroo",
+ "mtei",
+ "mymr",
+ "mymrshan",
+ "mymrtlng",
+ "native",
+ "newa",
+ "nkoo",
+ "olck",
+ "orya",
+ "osma",
+ "rohg",
+ "roman",
+ "romanlow",
+ "saur",
+ "shrd",
+ "sind",
+ "sinh",
+ "sora",
+ "sund",
+ "takr",
+ "talu",
+ "taml",
+ "tamldec",
+ "telu",
+ "thai",
+ "tirh",
+ "tibt",
+ "traditio",
+ "vaii",
+ "wara",
+ "wcho"
+ ]
+}
diff --git a/options/schema/sb100/parascriptural/word_alignment.schema.json b/options/schema/sb100/parascriptural/word_alignment.schema.json
new file mode 100644
index 0000000000..83590e4fe3
--- /dev/null
+++ b/options/schema/sb100/parascriptural/word_alignment.schema.json
@@ -0,0 +1,54 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/parascriptural/word_alignment.schema.json",
+ "title": "Flavor Details: Parascriptural Word Alignment",
+ "type": "object",
+ "description": "Schema of flavor field for word alignment flavor",
+ "properties": {
+ "name": {
+ "const": "wordAlignment"
+ },
+ "autoAlignerVersion": { "type": "string" },
+ "stopWords": { "type": "boolean" },
+ "stemmer": {
+ "type": "object",
+ "properties": {
+ "name": { "type": "string" },
+ "version": { "type": "string" },
+ "affixes": { "type": "boolean" }
+ },
+ "additionalProperties": false
+ },
+ "manualAlignment": {
+ "type": "object",
+ "properties": {
+ "user": { "type": "string" },
+ "references": {
+ "type": "array",
+ "items": {
+ "type": "object",
+ "properties": {
+ "start": {
+ "type": "number",
+ "minimum": 0,
+ "multipleOf": 1.0
+ },
+ "end": {
+ "type": "number",
+ "minimum": 0,
+ "multipleOf": 1.0
+ }
+ },
+ "required": ["start"],
+ "additionalProperties": false
+ },
+ "minItems": 1
+ }
+ },
+ "required": ["user", "references"],
+ "additionalProperties": false
+ }
+ },
+ "required": ["name", "autoAlignerVersion", "stopWords", "stemmer", "manualAlignment"],
+ "additionalProperties": false
+}
diff --git a/options/schema/sb100/progress.schema.json b/options/schema/sb100/progress.schema.json
new file mode 100644
index 0000000000..6456de792e
--- /dev/null
+++ b/options/schema/sb100/progress.schema.json
@@ -0,0 +1,17 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/progress.schema.json",
+ "$$target": "progress.schema.json",
+ "title": "Progress",
+ "type": "object",
+ "properties": {
+ "dateStarted": {
+ "$ref": "common.schema.json#/definitions/timestamp"
+ },
+ "dateCompleted": {
+ "$ref": "common.schema.json#/definitions/timestamp"
+ }
+ },
+ "minProperties": 1,
+ "additionalProperties": false
+}
diff --git a/options/schema/sb100/promotion.schema.json b/options/schema/sb100/promotion.schema.json
new file mode 100644
index 0000000000..e0a40eda5f
--- /dev/null
+++ b/options/schema/sb100/promotion.schema.json
@@ -0,0 +1,18 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/promotion.schema.json",
+ "$$target": "promotion.schema.json",
+ "title": "Promotional Statements",
+ "type": "object",
+ "description": "Contains promotional statements for the burrito.",
+ "properties": {
+ "statementPlain": {
+ "$ref": "common.schema.json#/definitions/localizedText"
+ },
+ "statementRich": {
+ "$ref": "common.schema.json#/definitions/localizedRichText"
+ }
+ },
+ "required": [],
+ "additionalProperties": false
+}
diff --git a/options/schema/sb100/recipe.schema.json b/options/schema/sb100/recipe.schema.json
new file mode 100644
index 0000000000..6fd01212e6
--- /dev/null
+++ b/options/schema/sb100/recipe.schema.json
@@ -0,0 +1,25 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/recipe.schema.json",
+ "$$target": "recipe.schema.json",
+ "title": "Recipes",
+ "type": "array",
+ "description": "Scripture Burrito recipes.",
+ "items": {
+ "type": "object",
+ "properties": {
+ "idAuthority": {
+ "type": "string"
+ },
+ "operation": {
+ "type": "string"
+ },
+ "data": {
+ "type": "object"
+ }
+ },
+ "required": ["idAuthority", "operation", "data"],
+ "additionalProperties": false
+ },
+ "minItems": 1
+}
diff --git a/options/schema/sb100/recipe_element.schema.json b/options/schema/sb100/recipe_element.schema.json
new file mode 100644
index 0000000000..8d99cd07f4
--- /dev/null
+++ b/options/schema/sb100/recipe_element.schema.json
@@ -0,0 +1,21 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/recipe_element.schema.json",
+ "$$target": "recipe_element.schema.json",
+ "title": "Recipe Element",
+ "type": "object",
+ "description": "Scripture Burrito recipe element.",
+ "properties": {
+ "type": {
+ "const": "element"
+ },
+ "nameId": {
+ "$ref": "common.schema.json#/definitions/bareId"
+ },
+ "ingredient": {
+ "$ref": "common.schema.json#/definitions/path"
+ }
+ },
+ "required": ["type", "ingredient"],
+ "additionalProperties": false
+}
diff --git a/options/schema/sb100/recipe_section.schema.json b/options/schema/sb100/recipe_section.schema.json
new file mode 100644
index 0000000000..9d57dcf08a
--- /dev/null
+++ b/options/schema/sb100/recipe_section.schema.json
@@ -0,0 +1,32 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/recipe_section.schema.json",
+ "$$target": "recipe_section.schema.json",
+ "title": "Recipe Section",
+ "type": "object",
+ "description": "Scripture Burrito recipe section.",
+ "properties": {
+ "type": {
+ "const": "section"
+ },
+ "nameId": {
+ "$ref": "common.schema.json#/definitions/bareId"
+ },
+ "content": {
+ "type": "array",
+ "items": {
+ "oneOf": [
+ {
+ "$ref": "recipe_section.schema.json"
+ },
+ {
+ "$ref": "recipe_element.schema.json"
+ }
+ ]
+ },
+ "additionalProperties": false
+ }
+ },
+ "required": ["type", "nameId", "content"],
+ "additionalProperties": false
+}
diff --git a/options/schema/sb100/reference_format.schema.json b/options/schema/sb100/reference_format.schema.json
new file mode 100644
index 0000000000..6a6fbe6416
--- /dev/null
+++ b/options/schema/sb100/reference_format.schema.json
@@ -0,0 +1,53 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/reference_format.schema.json",
+ "title": "Scripture Burrito Reference Format Ingredient",
+ "type": "object",
+ "description": "Scripture Burrito Reference Format Ingredient",
+ "properties": {
+ "noSpaceBetweenBookAndChapter": {
+ "type": "boolean"
+ },
+ "chapterVerseSeparator": {
+ "type": "string"
+ },
+ "rangeIndicator": {
+ "type": "string"
+ },
+ "sequenceIndicator": {
+ "type": "string"
+ },
+ "chapterRangeSeparator": {
+ "type": "string"
+ },
+ "chapterNumberSeparator": {
+ "type": "string"
+ },
+ "bookSequenceSeparator": {
+ "type": "string"
+ },
+ "referenceExtraMaterial": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ },
+ "minItems": 1
+ },
+ "referenceFinalPunctuation": {
+ "type": "string"
+ },
+ "bookSourceForMarkerXt": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "bookSourceForMarkerR": {
+ "type": [
+ "string",
+ "null"
+ ]
+ }
+ },
+ "required": []
+}
diff --git a/options/schema/sb100/relationship.schema.json b/options/schema/sb100/relationship.schema.json
new file mode 100644
index 0000000000..1380842273
--- /dev/null
+++ b/options/schema/sb100/relationship.schema.json
@@ -0,0 +1,87 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/relationship.schema.json",
+ "$$target": "relationship.schema.json",
+ "title": "Relationship",
+ "type": "object",
+ "description": "Describes a relationship to a different burrito that can be obtained from an indicated server.",
+ "properties": {
+ "relationType": {
+ "type": "string",
+ "enum": ["source", "target", "expression", "parascriptural", "peripheral"],
+ "minLength": 1
+ },
+ "flavor": {
+ "type": "string",
+ "oneOf": [
+ {
+ "enum": [
+ "textTranslation",
+ "audioTranslation",
+ "typesetScripture",
+ "signLanguageVideoTranslation",
+ "embossedBrailleScripture",
+ "glossedTextStory"
+ ]
+ },
+ {
+ "pattern": "^x-[a-z][A-za-z0-9]*$"
+ }
+ ],
+ "minLength": 1
+ },
+ "id": {
+ "$ref": "common.schema.json#/definitions/prefixedId"
+ },
+ "revision": {
+ "$ref": "common.schema.json#/definitions/revisionString"
+ },
+ "variant": {
+ "type": "string",
+ "pattern": "^[A-Za-z][A-Za-z0-9_\\-]{0,31}$"
+ }
+ },
+ "required": ["relationType", "flavor", "id"],
+ "additionalProperties": false,
+ "oneOf": [
+ {
+ "properties": {
+ "flavor": {
+ "type": "string",
+ "pattern": "^x-[a-z][A-za-z0-9]*$"
+ }
+ },
+ "$comment": "Custom flavors can be used with any relationType."
+ },
+ {
+ "properties": {
+ "relationType": {
+ "const": "source"
+ },
+ "flavor": {
+ "enum": ["textTranslation", "audioTranslation"]
+ }
+ }
+ },
+ {
+ "properties": {
+ "relationType": {
+ "const": "target"
+ },
+ "flavor": {}
+ }
+ },
+ {
+ "properties": {
+ "relationType": {
+ "const": "expression"
+ },
+ "flavor": {
+ "not": {
+ "const": "scriptureText"
+ }
+ }
+ }
+ }
+ ]
+}
diff --git a/options/schema/sb100/relationships.schema.json b/options/schema/sb100/relationships.schema.json
new file mode 100644
index 0000000000..1b1996665c
--- /dev/null
+++ b/options/schema/sb100/relationships.schema.json
@@ -0,0 +1,12 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/relationships.schema.json",
+ "$$target": "relationships.schema.json",
+ "title": "Relationships",
+ "type": "array",
+ "items": {
+ "$ref": "relationship.schema.json"
+ },
+ "minItems": 1,
+ "description": "Describes a relationship to another burrito that may be obtained from an indicated server."
+}
diff --git a/options/schema/sb100/role.schema.json b/options/schema/sb100/role.schema.json
new file mode 100644
index 0000000000..8643706e0a
--- /dev/null
+++ b/options/schema/sb100/role.schema.json
@@ -0,0 +1,78 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/role.schema.json",
+ "$$target": "role.schema.json",
+ "title": "Role",
+ "type": "string",
+ "description": "Roles which may be optionally attached to an ingredient.",
+ "oneOf": [
+ {
+ "description": "A USX peripheral label,eg \"maps\"",
+ "enum": [
+ "abbreviations",
+ "alphacontents",
+ "chron",
+ "cnc",
+ "contents",
+ "cover",
+ "foreword",
+ "glo",
+ "halftitle",
+ "imprimatur",
+ "lxxquotes",
+ "maps",
+ "measures",
+ "ndx",
+ "preface",
+ "promo",
+ "pubdata",
+ "spine",
+ "tdx",
+ "title"
+ ]
+ },
+ {
+ "description": "A role for story-based or video works, eg \"teaching\"",
+ "enum": [
+ "background",
+ "bridge",
+ "credits",
+ "diagram",
+ "gloss",
+ "illustration",
+ "introduction",
+ "scripture",
+ "teaching",
+ "timing"
+ ]
+ },
+ {
+ "description": "A role for PoD-type content, eg \"printCover\"",
+ "enum": ["body", "thumbnail"]
+ },
+ {
+ "description": "a versification file indicating the delta from the org versification",
+ "enum": ["versification"]
+ },
+ {
+ "description": "A role for textTranslation flavored burritos",
+ "enum": ["localedata"]
+ },
+ {
+ "description": "A label for story-type units",
+ "pattern": "^unit\\s.*\\S$"
+ },
+ {
+ "description": "A label for dictionary-type resources",
+ "pattern": "^(name|sign|word|concept|place)(\\s.*\\S)?$"
+ },
+ {
+ "description": "A role for a full copyright statement",
+ "enum": ["copyrightStatement"]
+ },
+ {
+ "description": "An x-role",
+ "pattern": "^x-\\S.*\\S$"
+ }
+ ]
+}
diff --git a/options/schema/sb100/scope.schema.json b/options/schema/sb100/scope.schema.json
new file mode 100644
index 0000000000..e9202ae920
--- /dev/null
+++ b/options/schema/sb100/scope.schema.json
@@ -0,0 +1,29 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/scope.schema.json",
+ "$$target": "scope.schema.json",
+ "title": "Scope",
+ "type": "object",
+ "description": "Scope specification, used for the whole burrito and for specific ingredients. In both cases it describes the actual content, not future translation goals.",
+ "additionalProperties": {
+ "oneOf": [
+ {
+ "type": "array",
+ "items": {
+ "type": "string",
+ "pattern": "^[1-9][0-9]*$|^[1-9][0-9]*-[1-9][0-9]*$|^[1-9][0-9]*:[1-9][0-9]*(-[1-9][0-9]*)?$|^[1-9][0-9]*:[1-9][0-9]*-[1-9][0-9]*:[1-9][0-9]*$"
+ },
+ "minItems": 1,
+ "uniqueItems": true
+ },
+ {
+ "type": "array",
+ "maxItems": 0
+ }
+ ]
+ },
+ "propertyNames": {
+ "$ref": "common.schema.json#/definitions/bookId"
+ },
+ "minProperties": 1
+}
diff --git a/options/schema/sb100/scripture/audio_translation.schema.json b/options/schema/sb100/scripture/audio_translation.schema.json
new file mode 100644
index 0000000000..578b6093df
--- /dev/null
+++ b/options/schema/sb100/scripture/audio_translation.schema.json
@@ -0,0 +1,105 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/scripture/audio_translation.schema.json",
+ "title": "Flavor Details: Audio Translation",
+ "type": "object",
+ "description": "Schema of flavor field of scripture/audioTranslation flavor",
+ "definitions": {
+ "format": {
+ "type": "object",
+ "properties": {
+ "compression": {
+ "type": "string",
+ "enum": ["mp3", "wav"]
+ },
+ "trackConfiguration": {
+ "type": "string",
+ "enum": ["1/0 (Mono)", "Dual mono", "2/0 (Stereo)", "5.1 Surround"]
+ },
+ "bitRate": { "type": "integer" },
+ "bitDepth": { "type": "integer" },
+ "samplingRate": { "type": "integer" },
+ "timingDir": { "$ref": "../common.schema.json#/definitions/path" }
+ },
+ "required": ["compression"],
+ "additionalProperties": false
+ }
+ },
+ "properties": {
+ "name": {
+ "const": "audioTranslation"
+ },
+ "performance": {
+ "type": "array",
+ "items": {
+ "type": "string",
+ "enum": ["singleVoice", "multipleVoice", "reading", "drama", "withMusic", "withEffects", "withHeadings"]
+ },
+ "uniqueItems": true,
+ "allOf": [
+ {
+ "if": {
+ "contains": {
+ "const": "singleVoice"
+ }
+ },
+ "then": {
+ "not": {
+ "contains": {
+ "const": "multipleVoice"
+ }
+ }
+ },
+ "else": {
+ "contains": {
+ "const": "multipleVoice"
+ }
+ }
+ },
+ {
+ "if": {
+ "contains": {
+ "const": "reading"
+ }
+ },
+ "then": {
+ "not": {
+ "contains": {
+ "const": "drama"
+ }
+ }
+ },
+ "else": {
+ "contains": {
+ "const": "drama"
+ }
+ }
+ }
+ ]
+ },
+ "formats": {
+ "type": "object",
+ "additionalProperties": {
+ "$ref": "#/definitions/format"
+ },
+ "propertyNames": { "type": "string" }
+ },
+ "conventions": {
+ "type": "object",
+ "additionalProperties": {
+ "type": "string",
+ "pattern": "^\\d+[.]\\d+([.].+)?$"
+ },
+ "propertyNames": {
+ "type": "string",
+ "pattern": "^(x-)?[a-z][A-za-z0-9]*$",
+ "oneOf": [
+ { "$ref": "../common.schema.json#/definitions/xToken" },
+ { "enum": ["contentResourcesByChapter", "bookDirs"] }
+ ]
+ }
+ }
+ },
+ "required": ["performance", "formats"],
+ "additionalProperties": false
+}
diff --git a/options/schema/sb100/scripture/embossed_braille_scripture.schema.json b/options/schema/sb100/scripture/embossed_braille_scripture.schema.json
new file mode 100644
index 0000000000..4c61a29816
--- /dev/null
+++ b/options/schema/sb100/scripture/embossed_braille_scripture.schema.json
@@ -0,0 +1,190 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/scripture/embossed_braille_scripture.schema.json",
+ "title": "Flavor Details: Scripture: Braille Publication",
+ "type": "object",
+ "description": "Schema of flavor field for scripture/brailleScripturePublication flavor",
+ "properties": {
+ "name": {
+ "type": "string",
+ "const": "embossedBrailleScripture"
+ },
+ "isContracted": { "type": "boolean" },
+ "processor": {
+ "type": "object",
+ "properties": {
+ "name": {
+ "type": "string",
+ "const": "libLouis"
+ },
+ "version": { "type": "string" },
+ "table": {
+ "type": "object",
+ "properties": {
+ "src": {
+ "type": "string"
+ },
+ "name": { "type": "string" }
+ },
+ "additionalProperties": false,
+ "required": ["src", "name"]
+ }
+ },
+ "required": ["name", "version", "table"],
+ "additionalProperties": false
+ },
+ "hyphenationDictionary": {
+ "type": "object",
+ "properties": {
+ "src": {
+ "type": "string"
+ },
+ "name": { "type": "string" }
+ },
+ "additionalProperties": false,
+ "required": ["src", "name"]
+ },
+ "numberSign": {
+ "type": "object",
+ "properties": {
+ "character": {
+ "type": "string",
+ "pattern": "([⠀-⣿])*"
+ },
+ "useInMargin": { "type": "boolean" }
+ },
+ "required": ["character", "useInMargin"],
+ "additionalProperties": false
+ },
+ "continuousPoetry": {
+ "type": "object",
+ "properties": {
+ "lineIndicatorSpaced": {
+ "type": "string",
+ "enum": ["never", "always", "sometimes"]
+ },
+ "startIndicator": {
+ "type": "string",
+ "pattern": "([⠀-⣿])*"
+ },
+ "lineIndicator": {
+ "type": "string",
+ "pattern": "([⠀-⣿])*"
+ },
+ "endIndicator": {
+ "type": "string",
+ "pattern": "([⠀-⣿])*"
+ }
+ },
+ "additionalProperties": false,
+ "required": ["lineIndicatorSpaced"]
+ },
+ "content": {
+ "type": "object",
+ "properties": {
+ "chapterNumberStyle": {
+ "type": "string",
+ "enum": ["upper", "lower"]
+ },
+ "chapterHeadingsNumberFirst": { "type": "boolean" },
+ "versedParagraphs": { "type": "boolean" },
+ "verseSeparator": {
+ "type": "string",
+ "pattern": "([⠀-⣿])*"
+ },
+ "includeIntros": { "type": "boolean" },
+ "footnotes": {
+ "type": "object",
+ "properties": {
+ "callerSymbol": {
+ "type": "string",
+ "pattern": "([⠀-⣿])*"
+ }
+ },
+ "additionalProperties": false,
+ "required": ["callerSymbol"]
+ },
+ "characterStyles": {
+ "type": "object",
+ "properties": {
+ "callerSymbol": {
+ "type": "string",
+ "pattern": "([⠀-⣿])*"
+ }
+ },
+ "additionalProperties": false,
+ "required": ["callerSymbol"]
+ },
+ "crossReferences": {
+ "type": "object",
+ "properties": {
+ "emphasizedWord": {
+ "type": "string",
+ "pattern": "([⠀-⣿])*"
+ },
+ "emphasizedPassageStart": {
+ "type": "string",
+ "pattern": "([⠀-⣿])*"
+ },
+ "emphasizedPassageEnd": {
+ "type": "string",
+ "pattern": "([⠀-⣿])*"
+ }
+ },
+ "additionalProperties": false,
+ "minProperties": 1
+ }
+ },
+ "required": [
+ "chapterNumberStyle",
+ "chapterHeadingsNumberFirst",
+ "versedParagraphs",
+ "verseSeparator",
+ "includeIntros"
+ ],
+ "additionalProperties": false
+ },
+ "page": {
+ "type": "object",
+ "properties": {
+ "charsPerLine": {
+ "type": "number",
+ "multipleOf": 1.0,
+ "minimum": 1
+ },
+ "linesPerPage": {
+ "type": "number",
+ "multipleOf": 1.0,
+ "minimum": 1
+ },
+ "defaultMarginWidth": {
+ "type": "number",
+ "multipleOf": 1.0,
+ "minimum": 1
+ },
+ "versoLastLineBlank": { "type": "boolean" },
+ "carryLines": {
+ "type": "number",
+ "multipleOf": 1.0,
+ "minimum": 1
+ }
+ },
+ "required": ["charsPerLine", "linesPerPage", "defaultMarginWidth", "versoLastLineBlank", "carryLines"],
+ "additionalProperties": false
+ },
+ "conventions": {
+ "type": "object",
+ "additionalProperties": {
+ "type": "string",
+ "pattern": "^\\d+[.]\\d+([.].+)?$"
+ },
+ "propertyNames": {
+ "type": "string",
+ "pattern": "^(x-)?[a-z][A-za-z0-9]*$",
+ "oneOf": [{ "$ref": "../common.schema.json#/definitions/xToken" }]
+ }
+ }
+ },
+ "required": ["isContracted", "processor", "numberSign", "content", "page"],
+ "additionalProperties": false
+}
diff --git a/options/schema/sb100/scripture/sign_language_video_translation.schema.json b/options/schema/sb100/scripture/sign_language_video_translation.schema.json
new file mode 100644
index 0000000000..c95c552e3c
--- /dev/null
+++ b/options/schema/sb100/scripture/sign_language_video_translation.schema.json
@@ -0,0 +1,80 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/scripture/sign_language_video_translation.schema.json",
+ "title": "Flavor Details: Scripture: Sign Language Video Translation",
+ "type": "object",
+ "description": "Schema of flavor field for signLanguageVideoTranslation flavor",
+ "definitions": {
+ "format": {
+ "type": "object",
+ "properties": {
+ "container": {
+ "type": "string",
+ "enum": ["mp4", "mpg"]
+ },
+ "videoStream": {
+ "type": "object",
+ "properties": {
+ "bitRate": { "type": "integer" },
+ "frameRate": { "type": "integer" },
+ "screenResolution": { "type": "string", "pattern": "^\\d+x\\d+$" }
+ },
+ "required": ["bitRate", "frameRate", "screenResolution"],
+ "additionalProperties": false
+ },
+ "audioStream": {
+ "type": "object",
+ "properties": {
+ "compression": {
+ "type": "string",
+ "enum": ["mp3", "wav"]
+ },
+ "trackConfiguration": {
+ "type": "string",
+ "enum": ["1/0 (Mono)", "Dual mono", "2/0 (Stereo)", "5.1 Surround"]
+ },
+ "bitRate": { "type": "integer" },
+ "bitDepth": { "type": "integer" },
+ "samplingRate": { "type": "integer" }
+ },
+ "required": ["compression"],
+ "additionalProperties": false
+ }
+ },
+ "required": ["container", "videoStream"],
+ "additionalProperties": false
+ }
+ },
+ "properties": {
+ "name": {
+ "type": "string",
+ "const": "signLanguageVideoTranslation"
+ },
+ "contentByChapter": { "type": "boolean" },
+ "formats": {
+ "type": "object",
+ "additionalProperties": {
+ "$ref": "#/definitions/format"
+ },
+ "propertyNames": { "type": "string" },
+ "minProperties": 1
+ },
+ "conventions": {
+ "type": "object",
+ "additionalProperties": {
+ "type": "string",
+ "pattern": "^\\d+[.]\\d+([.].+)?$"
+ },
+ "propertyNames": {
+ "type": "string",
+ "pattern": "^(x-)?[a-z][A-za-z0-9]*$",
+ "oneOf": [
+ { "$ref": "../common.schema.json#/definitions/xToken" },
+ { "enum": ["bookDirs", "rolesInUris"] }
+ ]
+ }
+ }
+ },
+ "required": ["name", "contentByChapter", "formats"],
+ "additionalProperties": false
+}
diff --git a/options/schema/sb100/scripture/text_translation.schema.json b/options/schema/sb100/scripture/text_translation.schema.json
new file mode 100644
index 0000000000..92f41d6020
--- /dev/null
+++ b/options/schema/sb100/scripture/text_translation.schema.json
@@ -0,0 +1,55 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/scripture/text_translation.schema.json",
+ "title": "Flavor Details: scripture/textTranslation",
+ "type": "object",
+ "description": "Schema of flavor field for textTranslation flavor",
+ "properties": {
+ "name": {
+ "type": "string",
+ "const": "textTranslation"
+ },
+ "projectType": {
+ "type": "string",
+ "enum": [
+ "standard",
+ "daughter",
+ "studyBible",
+ "studyBibleAdditions",
+ "backTranslation",
+ "auxiliary",
+ "transliterationManual",
+ "transliterationWithEncoder"
+ ]
+ },
+ "translationType": {
+ "type": "string",
+ "enum": ["firstTranslation", "newTranslation", "revision", "studyOrHelpMaterial"]
+ },
+ "audience": {
+ "type": "string",
+ "enum": ["basic", "common", "common-literary", "literary", "liturgical", "children"]
+ },
+ "usfmVersion": {
+ "type": "string",
+ "pattern": "^\\d+\\.\\d+(\\..+)?$"
+ },
+ "conventions": {
+ "type": "object",
+ "additionalProperties": {
+ "type": "string",
+ "pattern": "^\\d+[.]\\d+([.].+)?$"
+ },
+ "propertyNames": {
+ "type": "string",
+ "pattern": "^(x-)?[a-z][A-za-z0-9]*$",
+ "oneOf": [
+ { "$ref": "../common.schema.json#/definitions/xToken" },
+ { "enum": ["usxRefs", "usxDirs", "typesetAsVersedParagraphs"] }
+ ]
+ }
+ }
+ },
+ "required": ["name", "projectType", "translationType", "audience", "usfmVersion"],
+ "additionalProperties": false
+}
diff --git a/options/schema/sb100/scripture/typeset_scripture.schema.json b/options/schema/sb100/scripture/typeset_scripture.schema.json
new file mode 100644
index 0000000000..97fb26ae45
--- /dev/null
+++ b/options/schema/sb100/scripture/typeset_scripture.schema.json
@@ -0,0 +1,75 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/scripture/typeset_scripture.schema.json",
+ "title": "Flavor Details: Scripture: Print Publication",
+ "type": "object",
+ "description": "Schema of flavor field for scripture/printPublication flavor",
+ "definitions": {
+ "measurementString": {
+ "type": "string",
+ "pattern": "^[1-9][0-9]{0,4}mm$"
+ },
+ "percentageString": {
+ "type": "string",
+ "pattern": "[1-9][0-9]{1,3}%"
+ },
+ "orientation": {
+ "type": "string",
+ "enum": ["portrait", "landscape"]
+ },
+ "colorSpace": {
+ "type": "string",
+ "enum": ["cmyk", "rgb"]
+ }
+ },
+ "properties": {
+ "name": {
+ "type": "string",
+ "const": "typesetScripture"
+ },
+ "contentType": {
+ "type": "string",
+ "const": "pdf"
+ },
+ "pod": { "type": "boolean" },
+ "pageCount": { "type": "integer", "minimum": 0 },
+ "width": { "$ref": "#/definitions/measurementString" },
+ "height": { "$ref": "#/definitions/measurementString" },
+ "scale": { "$ref": "#/definitions/percentageString" },
+ "orientation": { "$ref": "#/definitions/orientation" },
+ "colorSpace": { "$ref": "#/definitions/colorSpace" },
+ "edgeSpace": {
+ "type": "object",
+ "properties": {
+ "top": { "$ref": "#/definitions/measurementString" },
+ "bottom": { "$ref": "#/definitions/measurementString" },
+ "inside": { "$ref": "#/definitions/measurementString" },
+ "outside": { "$ref": "#/definitions/measurementString" }
+ },
+ "additionalProperties": false
+ },
+ "fonts": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ "conventions": {
+ "type": "object",
+ "additionalProperties": {
+ "type": "string",
+ "pattern": "^\\d+[.]\\d+([.].+)?$"
+ },
+ "propertyNames": {
+ "type": "string",
+ "pattern": "^(x-)?[a-z][A-za-z0-9]*$",
+ "oneOf": [
+ { "$ref": "../common.schema.json#/definitions/xToken" },
+ { "enum": ["contentResourcesByChapter"] }
+ ]
+ }
+ }
+ },
+ "required": ["name", "contentType", "pod", "pageCount", "height", "width", "scale", "colorSpace"],
+ "additionalProperties": false
+}
diff --git a/options/schema/sb100/scripture_flavor_type.schema.json b/options/schema/sb100/scripture_flavor_type.schema.json
new file mode 100644
index 0000000000..05e58a8548
--- /dev/null
+++ b/options/schema/sb100/scripture_flavor_type.schema.json
@@ -0,0 +1,47 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/scripture_flavor_type.schema.json",
+ "$$target": "scripture_flavor_type.schema.json",
+ "title": "Scripture Flavor Type",
+ "type": "object",
+ "properties": {
+ "flavorType": {
+ "type": "object",
+ "properties": {
+ "name": {
+ "type": "string",
+ "const": "scripture"
+ },
+ "flavor": {
+ "type": "object",
+ "oneOf": [
+ {
+ "$ref": "scripture/text_translation.schema.json"
+ },
+ {
+ "$ref": "scripture/audio_translation.schema.json"
+ },
+ {
+ "$ref": "scripture/print_publication.schema.json"
+ },
+ {
+ "$ref": "scripture/braille_scripture_publication.schema.json"
+ },
+ {
+ "$ref": "scripture/sign_language_video_translation.schema.json"
+ },
+ {
+ "$ref": "x_flavor.schema.json"
+ }
+ ]
+ },
+ "bookScope": {
+ "$ref": "book_scope.schema.json"
+ },
+ },
+ "required": ["name", "bookScope", "flavor"],
+ "additionalProperties": false
+ }
+ },
+ "additionalProperties": false
+}
diff --git a/options/schema/sb100/software_and_user_info.schema.json b/options/schema/sb100/software_and_user_info.schema.json
new file mode 100644
index 0000000000..a54e3797d3
--- /dev/null
+++ b/options/schema/sb100/software_and_user_info.schema.json
@@ -0,0 +1,27 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/software_and_user_info.schema.json",
+ "$$target": "software_and_user_info.schema.json",
+ "title": "Software and User Info",
+ "type": "object",
+ "properties": {
+ "softwareName": {
+ "type": "string",
+ "description": "The name of the program used."
+ },
+ "softwareVersion": {
+ "type": "string",
+ "description": "The version of the program used."
+ },
+ "userId": {
+ "$ref": "common.schema.json#/definitions/prefixedId",
+ "description": "A system-specific user identifier."
+ },
+ "userName": {
+ "type": "string",
+ "description": "The user's full name, if known."
+ }
+ },
+ "required": ["softwareName", "softwareVersion"],
+ "additionalProperties": false
+}
diff --git a/options/schema/sb100/source_meta.schema.json b/options/schema/sb100/source_meta.schema.json
new file mode 100644
index 0000000000..62e08f3623
--- /dev/null
+++ b/options/schema/sb100/source_meta.schema.json
@@ -0,0 +1,34 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/source_meta.schema.json",
+ "$$target": "source_meta.schema.json",
+ "title": "Meta (Source)",
+ "type": "object",
+ "description": "Information about the Scripture Burrito metadata file (source).",
+ "properties": {
+ "category": {
+ "const": "source"
+ },
+ "dateCreated": {
+ "$ref": "meta_date_created.schema.json"
+ },
+ "version": {
+ "$ref": "meta_version.schema.json"
+ },
+ "generator": {
+ "$ref": "software_and_user_info.schema.json",
+ "description": "Information about the program and user who generated this burrito."
+ },
+ "defaultLocale": {
+ "$ref": "meta_default_language.schema.json"
+ },
+ "normalization": {
+ "$ref": "normalization.schema.json"
+ },
+ "comments": {
+ "$ref": "meta_comments.schema.json"
+ }
+ },
+ "required": ["version", "category", "dateCreated", "defaultLocale"],
+ "additionalProperties": false
+}
diff --git a/options/schema/sb100/source_metadata.schema.json b/options/schema/sb100/source_metadata.schema.json
new file mode 100644
index 0000000000..ed64af3768
--- /dev/null
+++ b/options/schema/sb100/source_metadata.schema.json
@@ -0,0 +1,77 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/source_metadata.schema.json",
+ "$$target": "source_metadata.schema.json",
+ "title": "Metadata (Default)",
+ "type": "object",
+ "description": "Scripture Burrito source kinda-variant root.",
+ "properties": {
+ "format": {
+ "type": "string",
+ "enum": ["scripture burrito"]
+ },
+ "meta": {
+ "$ref": "source_meta.schema.json"
+ },
+ "idAuthorities": {
+ "$ref": "id_authorities.schema.json"
+ },
+ "identification": {
+ "$ref": "identification.schema.json"
+ },
+ "confidential": {
+ "$ref": "confidential.schema.json"
+ },
+ "type": {
+ "$ref": "type.schema.json"
+ },
+ "relationships": {
+ "$ref": "relationships.schema.json"
+ },
+ "languages": {
+ "$ref": "languages.schema.json"
+ },
+ "targetAreas": {
+ "$ref": "target_areas.schema.json"
+ },
+ "agencies": {
+ "$ref": "agencies.schema.json"
+ },
+ "copyright": {
+ "$ref": "copyright.schema.json"
+ },
+ "ingredients": {
+ "$ref": "ingredients.schema.json"
+ },
+ "localizedNames": {
+ "$ref": "localized_names.schema.json"
+ },
+ "progress": {
+ "$ref": "progress.schema.json"
+ }
+ },
+ "required": ["format", "meta", "idAuthorities", "identification", "confidential", "type", "copyright", "ingredients"],
+ "additionalProperties": false,
+ "allOf": [
+ {
+ "if": {
+ "properties": {
+ "type": {
+ "type": "object",
+ "properties": {
+ "flavorType": {
+ "enum": ["scripture", "gloss"]
+ }
+ }
+ }
+ }
+ },
+ "then": {
+ "required": ["languages"]
+ }
+ },
+ {
+ "$ref": "copyright_constraints.schema.json"
+ }
+ ]
+}
diff --git a/options/schema/sb100/target_area.schema.json b/options/schema/sb100/target_area.schema.json
new file mode 100644
index 0000000000..0f05b75a94
--- /dev/null
+++ b/options/schema/sb100/target_area.schema.json
@@ -0,0 +1,25 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/target_area.schema.json",
+ "$$target": "target_area.schema.json",
+ "title": "Target Area",
+ "type": "object",
+ "description": "An area that is a primary target audience of this burrito.",
+ "properties": {
+ "code": {
+ "oneOf": [
+ {
+ "$ref": "common.schema.json#/definitions/countryCode"
+ },
+ {
+ "$ref": "unm49.schema.json"
+ }
+ ]
+ },
+ "name": {
+ "$ref": "common.schema.json#/definitions/localizedText"
+ }
+ },
+ "required": ["code", "name"],
+ "additionalProperties": false
+}
diff --git a/options/schema/sb100/target_areas.schema.json b/options/schema/sb100/target_areas.schema.json
new file mode 100644
index 0000000000..4d259ac5cc
--- /dev/null
+++ b/options/schema/sb100/target_areas.schema.json
@@ -0,0 +1,12 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/target_areas.schema.json",
+ "$$target": "target_areas.schema.json",
+ "title": "Target Areas",
+ "type": "array",
+ "items": {
+ "$ref": "target_area.schema.json"
+ },
+ "minItems": 1,
+ "description": "A list of areas of the primary target audience of this burrito."
+}
diff --git a/options/schema/sb100/template_meta.schema.json b/options/schema/sb100/template_meta.schema.json
new file mode 100644
index 0000000000..c60ba1ad6a
--- /dev/null
+++ b/options/schema/sb100/template_meta.schema.json
@@ -0,0 +1,37 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/template_meta.schema.json",
+ "$$target": "template_meta.schema.json",
+ "title": "Meta (Template)",
+ "type": "object",
+ "description": "Information about the Scripture Burrito metadata file.",
+ "properties": {
+ "category": {
+ "const": "template"
+ },
+ "templateName": {
+ "$ref": "common.schema.json#/definitions/localizedText"
+ },
+ "dateCreated": {
+ "$ref": "meta_date_created.schema.json"
+ },
+ "version": {
+ "$ref": "meta_version.schema.json"
+ },
+ "generator": {
+ "$ref": "software_and_user_info.schema.json",
+ "description": "Information about the program and user who generated this burrito."
+ },
+ "defaultLocale": {
+ "$ref": "meta_default_language.schema.json"
+ },
+ "normalization": {
+ "$ref": "normalization.schema.json"
+ },
+ "comments": {
+ "$ref": "meta_comments.schema.json"
+ }
+ },
+ "required": ["version", "category", "defaultLocale", "dateCreated", "templateName"],
+ "additionalProperties": false
+}
diff --git a/options/schema/sb100/template_metadata.schema.json b/options/schema/sb100/template_metadata.schema.json
new file mode 100644
index 0000000000..1091f3f73b
--- /dev/null
+++ b/options/schema/sb100/template_metadata.schema.json
@@ -0,0 +1,57 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/template_metadata.schema.json",
+ "$$target": "template_metadata.schema.json",
+ "title": "Metadata (Template)",
+ "type": "object",
+ "description": "Scripture Burrito Template root.",
+ "properties": {
+ "format": {
+ "type": "string",
+ "enum": ["scripture burrito"]
+ },
+ "meta": {
+ "$ref": "template_meta.schema.json"
+ },
+ "idAuthorities": {
+ "$ref": "id_authorities.schema.json"
+ },
+ "identification": {
+ "$ref": "identification.schema.json"
+ },
+ "confidential": {
+ "$ref": "confidential.schema.json"
+ },
+ "type": {
+ "$ref": "type.schema.json"
+ },
+ "relationships": {
+ "$ref": "relationships.schema.json"
+ },
+ "languages": {
+ "$ref": "languages.schema.json"
+ },
+ "targetAreas": {
+ "$ref": "target_areas.schema.json"
+ },
+ "agencies": {
+ "$ref": "agencies.schema.json"
+ },
+ "copyright": {
+ "$ref": "copyright.schema.json"
+ },
+ "ingredients": {
+ "$ref": "ingredients.schema.json"
+ },
+ "localizedNames": {
+ "$ref": "localized_names.schema.json"
+ }
+ },
+ "required": ["format", "meta", "copyright"],
+ "additionalProperties": false,
+ "allOf": [
+ {
+ "$ref": "copyright_constraints.schema.json"
+ }
+ ]
+}
diff --git a/options/schema/sb100/type.schema.json b/options/schema/sb100/type.schema.json
new file mode 100644
index 0000000000..9d0efc5968
--- /dev/null
+++ b/options/schema/sb100/type.schema.json
@@ -0,0 +1,351 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/type.schema.json",
+ "$$target": "type.schema.json",
+ "title": "Type",
+ "description": "Contains properties describing the burrito flavor type.",
+ "type": "object",
+ "properties": {
+ "flavorType": {
+ "type": "object",
+ "properties": {
+ "name": {
+ "enum": [
+ "scripture",
+ "gloss",
+ "parascriptural",
+ "peripheral"
+ ]
+ }
+ }
+ }
+ },
+ "if" : {
+ "properties": {
+ "flavorType": {
+ "type": "object",
+ "properties": {
+ "name": {
+ "const": "scripture"
+ }
+ }
+ }
+ }
+ },
+ "then": {
+ "properties": {
+ "flavorType": {
+ "type": "object",
+ "properties": {
+ "name": {
+ "type": "string",
+ "const": "scripture"
+ },
+ "flavor": {
+ "type": "object",
+ "properties": {
+ "name": {
+ "type": "string",
+ "oneOf": [
+ {
+ "enum": [
+ "textTranslation",
+ "audioTranslation",
+ "typesetScripture",
+ "embossedBrailleScripture",
+ "signLanguageVideoTranslation"
+ ]
+ },
+ {
+ "pattern": "^x-"
+ }
+ ]
+ }
+ }
+ },
+ "currentScope": {
+ "$ref": "scope.schema.json"
+ }
+ },
+ "required": ["name", "flavor", "currentScope"],
+ "additionalProperties": false
+ }
+ },
+ "required": ["flavorType"],
+ "if": {
+ "properties": {
+ "flavorType" : {
+ "type": "object",
+ "properties": {
+ "flavor": {
+ "type": "object",
+ "properties": {
+ "name": {
+ "const": "textTranslation"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "then":
+ {
+ "properties": {
+ "flavorType" : {
+ "type": "object",
+ "properties": {
+ "flavor" : {
+ "$ref": "scripture/text_translation.schema.json"
+ }
+ }
+ }
+ }
+ },
+ "else": {
+ "if": {
+ "properties": {
+ "flavorType" : {
+ "type": "object",
+ "properties": {
+ "flavor": {
+ "type": "object",
+ "properties": {
+ "name": {
+ "const": "audioTranslation"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "then": {
+ "properties": {
+ "flavorType" : {
+ "type": "object",
+ "properties": {
+ "flavor" : {
+ "$ref": "scripture/audio_translation.schema.json"
+ }
+ }
+ }
+ }
+ },
+ "else": {
+ "if": {
+ "properties": {
+ "flavorType" : {
+ "type": "object",
+ "properties": {
+ "flavor": {
+ "type": "object",
+ "properties": {
+ "name": {
+ "const": "typesetScripture"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "then": {
+ "properties": {
+ "flavorType" : {
+ "type": "object",
+ "properties": {
+ "flavor" : {
+ "$ref": "scripture/typeset_scripture.schema.json"
+ }
+ }
+ }
+ }
+ },
+ "else": {
+ "if": {
+ "properties": {
+ "flavorType" : {
+ "type": "object",
+ "properties": {
+ "flavor": {
+ "type": "object",
+ "properties": {
+ "name": {
+ "const": "embossedBrailleScripture"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "then": {
+ "properties": {
+ "flavorType" : {
+ "type": "object",
+ "properties": {
+ "flavor" : {
+ "$ref": "scripture/embossed_braille_scripture.schema.json"
+ }
+ }
+ }
+ }
+ },
+ "else": {
+ "if": {
+ "properties": {
+ "flavorType" : {
+ "type": "object",
+ "properties": {
+ "flavor": {
+ "type": "object",
+ "properties": {
+ "name": {
+ "const": "signLanguageVideoTranslation"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "then": {
+ "properties": {
+ "flavorType" : {
+ "type": "object",
+ "properties": {
+ "flavor" : {
+ "$ref": "scripture/sign_language_video_translation.schema.json"
+ }
+ }
+ }
+ }
+ },
+ "else": {
+ "properties": {
+ "flavorType" : {
+ "type": "object",
+ "properties": {
+ "flavor" : {
+ "$ref": "x_flavor.schema.json"
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "else": {
+ "if" : {
+ "properties": {
+ "flavorType": {
+ "type": "object",
+ "properties": {
+ "name": {
+ "const": "gloss"
+ }
+ }
+ }
+ }
+ },
+ "then": {
+ "properties": {
+ "flavorType": {
+ "type": "object",
+ "properties": {
+ "name": {
+ "type": "string",
+ "const": "gloss"
+ },
+ "flavor": {
+ "type": "object",
+ "oneOf": [
+ {
+ "$ref": "gloss/text_stories.schema.json"
+ },
+ {
+ "$ref": "x_flavor.schema.json"
+ }
+ ]
+ },
+ "currentScope": {
+ "$ref": "scope.schema.json"
+ }
+ },
+ "required": ["name", "flavor", "currentScope"],
+ "additionalProperties": false
+ }
+ }
+ },
+ "else": {
+ "if" : {
+ "properties": {
+ "flavorType": {
+ "type": "object",
+ "properties": {
+ "name": {
+ "const": "parascriptural"
+ }
+ }
+ }
+ }
+ },
+ "then": {
+ "properties": {
+ "flavorType": {
+ "type": "object",
+ "properties": {
+ "name": {
+ "type": "string",
+ "const": "parascriptural"
+ },
+ "flavor": {
+ "type": "object",
+ "oneOf": [
+ {
+ "$ref": "x_flavor.schema.json"
+ }
+ ]
+ },
+ "currentScope": {
+ "$ref": "scope.schema.json"
+ }
+ },
+ "required": ["name", "flavor"],
+ "additionalProperties": false
+ }
+ }
+ },
+ "else": {
+ "properties": {
+ "flavorType": {
+ "type": "object",
+ "properties": {
+ "name": {
+ "type": "string",
+ "const": "peripheral"
+ },
+ "flavor": {
+ "type": "object",
+ "oneOf": [
+ {
+ "$ref": "x_flavor.schema.json"
+ }
+ ]
+ },
+ "currentScope": {
+ "$ref": "scope.schema.json"
+ }
+ },
+ "required": ["name", "flavor"],
+ "additionalProperties": false
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/options/schema/sb100/unm49.schema.json b/options/schema/sb100/unm49.schema.json
new file mode 100644
index 0000000000..f1d9ea83df
--- /dev/null
+++ b/options/schema/sb100/unm49.schema.json
@@ -0,0 +1,47 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/unm49.schema.json",
+ "$$target": "unm49.schema.json",
+ "title": "UNM49 enum",
+ "type": "string",
+ "description": "UNM49 region code enum",
+ "enum": [
+ "001",
+ "002",
+ "003",
+ "005",
+ "009",
+ "011",
+ "013",
+ "014",
+ "015",
+ "017",
+ "018",
+ "019",
+ "021",
+ "024",
+ "029",
+ "030",
+ "034",
+ "035",
+ "039",
+ "053",
+ "054",
+ "057",
+ "061",
+ "142",
+ "143",
+ "145",
+ "150",
+ "151",
+ "154",
+ "155",
+ "202",
+ "419",
+ "496",
+ "554",
+ "591",
+ "756",
+ "830"
+ ]
+}
diff --git a/options/schema/sb100/x_flavor.schema.json b/options/schema/sb100/x_flavor.schema.json
new file mode 100644
index 0000000000..a3eff84eeb
--- /dev/null
+++ b/options/schema/sb100/x_flavor.schema.json
@@ -0,0 +1,16 @@
+{
+ "$schema": "http://json-schema.org/draft-07/schema",
+ "$id": "https://burrito.bible/schema/x_flavor.schema.json",
+ "$$target": "x_flavor.schema.json",
+ "title": "Flavor Details: X-Flavor",
+ "description": "Schema of flavor field for xFlavor",
+ "type": "object",
+ "properties": {
+ "name": {
+ "type": "string",
+ "pattern": "^x-[a-z][a-zA-Z0-9]*$"
+ }
+ },
+ "required": ["name"],
+ "additionalProperties": true
+}
diff --git a/public/assets/img/apple-touch-icon.png b/public/assets/img/apple-touch-icon.png
index 0c803d35dc..a236c780f5 100644
Binary files a/public/assets/img/apple-touch-icon.png and b/public/assets/img/apple-touch-icon.png differ
diff --git a/public/assets/img/avatar_default.png b/public/assets/img/avatar_default.png
index 129967112d..efd53da1c7 100644
Binary files a/public/assets/img/avatar_default.png and b/public/assets/img/avatar_default.png differ
diff --git a/public/assets/img/dcs/rc.png b/public/assets/img/dcs/rc.png
new file mode 100644
index 0000000000..83f59533e0
Binary files /dev/null and b/public/assets/img/dcs/rc.png differ
diff --git a/public/assets/img/dcs/sb.png b/public/assets/img/dcs/sb.png
new file mode 100644
index 0000000000..fc97fed150
Binary files /dev/null and b/public/assets/img/dcs/sb.png differ
diff --git a/public/assets/img/dcs/tc.png b/public/assets/img/dcs/tc.png
new file mode 100644
index 0000000000..afd844e514
Binary files /dev/null and b/public/assets/img/dcs/tc.png differ
diff --git a/public/assets/img/dcs/ts.png b/public/assets/img/dcs/ts.png
new file mode 100644
index 0000000000..378a987d43
Binary files /dev/null and b/public/assets/img/dcs/ts.png differ
diff --git a/public/assets/img/dcs/uw-32.png b/public/assets/img/dcs/uw-32.png
new file mode 100644
index 0000000000..83f59533e0
Binary files /dev/null and b/public/assets/img/dcs/uw-32.png differ
diff --git a/public/assets/img/dcs/uw.png b/public/assets/img/dcs/uw.png
new file mode 100644
index 0000000000..9d759766dd
Binary files /dev/null and b/public/assets/img/dcs/uw.png differ
diff --git a/public/assets/img/favicon.png b/public/assets/img/favicon.png
index dcd4edb1a3..45f65b840f 100644
Binary files a/public/assets/img/favicon.png and b/public/assets/img/favicon.png differ
diff --git a/public/assets/img/favicon.svg b/public/assets/img/favicon.svg
index afeeacb77c..92287a95cc 100644
--- a/public/assets/img/favicon.svg
+++ b/public/assets/img/favicon.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/public/assets/img/logo.png b/public/assets/img/logo.png
index c7971f9183..7cb59aac97 100644
Binary files a/public/assets/img/logo.png and b/public/assets/img/logo.png differ
diff --git a/public/assets/img/logo.svg b/public/assets/img/logo.svg
index afeeacb77c..03f911de98 100644
--- a/public/assets/img/logo.svg
+++ b/public/assets/img/logo.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/robots.txt b/robots.txt
new file mode 100644
index 0000000000..5fc61889af
--- /dev/null
+++ b/robots.txt
@@ -0,0 +1,75 @@
+User-agent: *
+Disallow: /api/*
+Disallow: /avatars
+Disallow: /user/*
+Disallow: /explore/*
+Disallow: /*/*/src/commit/*
+Disallow: /*/*/commit/*
+Disallow: /*/*/*/refs/*
+Disallow: /*/*/*/star
+Disallow: /*/*/*/watch
+Disallow: /*/*/labels
+Disallow: /*/*/activity/*
+Disallow: /vendor/*
+Disallow: /swagger.*.json
+
+# Query spam
+Disallow: /*?lang=
+Disallow: /*q=
+
+# taken from Github since Gitea mimics their structure
+Allow: /*/*/tree/master
+Allow: /*/*/blob/master
+Disallow: /*/*/pulse
+Disallow: /*/*/tree/*
+Disallow: /*/*/blob/*
+Disallow: /*/*/wiki/*/*
+Disallow: /*/forks
+Disallow: /*/stars
+Disallow: /*/download
+Disallow: /*/revisions
+Disallow: /*/*/issues/new
+Disallow: /*/*/issues/search
+Disallow: /*/*/commits/*/*
+Disallow: /*/*/commits/*?author
+Disallow: /*/*/commits/*?path
+Disallow: /*/*/branches
+Disallow: /*/*/tags
+Disallow: /*/*/contributors
+Disallow: /*/*/comments
+Disallow: /*/*/stargazers
+Disallow: /*/*/search
+Disallow: /*/tarball/
+Disallow: /*/zipball/
+Disallow: /*/*/archive/
+Disallow: /raw/*
+Disallow: /*/followers
+Disallow: /*/following
+Disallow: /stars/*
+Disallow: /*/blame/
+Disallow: /*/watchers
+Disallow: /*/network
+Disallow: /*/graphs
+Disallow: /*/raw/
+Disallow: /*/compare/
+Disallow: /*/cache/
+Disallow: /*/*/blame/
+Disallow: /*/*/watchers
+Disallow: /*/*/network
+Disallow: /*/*/graphs
+Disallow: /*/*/raw/
+Disallow: /*/*/compare/
+Disallow: /*/*/cache/
+Disallow: /.git/
+Disallow: /*/.git/
+Disallow: /*.git$
+Disallow: /*/sitemap.xml
+Disallow: /search/advanced
+Disallow: /search
+Disallow: /*.atom
+
+# DCS specific
+Disallow: /unfoldingword-dev/
+Disallow: /unfoldingword-box3/
+
+Crawl-delay: 2
diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go
index 09d7c1a940..00d0eef858 100644
--- a/routers/api/v1/admin/user.go
+++ b/routers/api/v1/admin/user.go
@@ -82,7 +82,7 @@ func CreateUser(ctx *context.APIContext) {
FullName: form.FullName,
Email: form.Email,
Passwd: form.Password,
- MustChangePassword: true,
+ MustChangePassword: false, // DCS Customizations - so that tS user creation works
LoginType: auth.Plain,
}
if form.MustChangePassword != nil {
diff --git a/routers/api/v1/admin/user_dcs.go b/routers/api/v1/admin/user_dcs.go
new file mode 100644
index 0000000000..5c78134a98
--- /dev/null
+++ b/routers/api/v1/admin/user_dcs.go
@@ -0,0 +1,101 @@
+// Copyright 2015 The Gogs Authors. All rights reserved.
+// Copyright 2019 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package admin
+
+import (
+ "net/http"
+
+ "code.gitea.io/gitea/models"
+ "code.gitea.io/gitea/models/db"
+ user_model "code.gitea.io/gitea/models/user"
+ "code.gitea.io/gitea/modules/context"
+ "code.gitea.io/gitea/modules/log"
+ api "code.gitea.io/gitea/modules/structs"
+ "code.gitea.io/gitea/services/convert"
+ user_service "code.gitea.io/gitea/services/user"
+)
+
+// ListSpamUsers API for getting all users considered to be spam
+func ListSpamUsers(ctx *context.APIContext) {
+ // swagger:operation GET /admin/users/spam admin adminListSpamUsers
+ // ---
+ // summary: List all users considered to be spam. (have a description & website, last logged in on the day they signed up, and is older than a week)
+ // produces:
+ // - application/json
+ // responses:
+ // "200":
+ // "$ref": "#/responses/UserList"
+ // "403":
+ // "$ref": "#/responses/forbidden"
+
+ users, err := getSpamUsers(ctx)
+ if err != nil {
+ ctx.Error(http.StatusInternalServerError, "ListSpamUsers", err)
+ return
+ }
+
+ results := make([]*api.User, len(users))
+ for i := range users {
+ results[i] = convert.ToUser(ctx, users[i], ctx.Doer)
+ }
+
+ ctx.JSON(http.StatusOK, &results)
+}
+
+// DeleteSpamUsers api for deleting all spam users
+func DeleteSpamUsers(ctx *context.APIContext) {
+ // swagger:operation DELETE /admin/users/spam admin adminDeleteSpamUsers
+ // ---
+ // summary: Delete spam users - deletes those listed in the spam users list, but WILL NOT delete those that logged in more than 2 days from signing up, have repos, or was created in the last week.
+ // produces:
+ // - application/json
+ // parameters:
+ // - name: purge
+ // in: query
+ // description: purge the users from the system completely
+ // type: boolean
+ // responses:
+ // "204":
+ // "$ref": "#/responses/empty"
+ // "403":
+ // "$ref": "#/responses/forbidden"
+ // "422":
+ // "$ref": "#/responses/validationError"
+
+ users, err := getSpamUsers(ctx)
+ if err != nil {
+ ctx.Error(http.StatusInternalServerError, "DeleteSpamUsers", err)
+ return
+ }
+
+ for _, user := range users {
+ if err := user_service.DeleteUser(ctx, user, ctx.FormBool("purge")); err != nil {
+ if models.IsErrUserOwnRepos(err) ||
+ models.IsErrUserHasOrgs(err) ||
+ models.IsErrUserOwnPackages(err) {
+ ctx.Error(http.StatusUnprocessableEntity, "", err)
+ } else {
+ ctx.Error(http.StatusInternalServerError, "DeleteUser", err)
+ }
+ return
+ }
+ log.Info("Account deleted by admin(%s) due to being spam: %s", ctx.Doer.Name, user.Name)
+ }
+
+ ctx.Status(http.StatusNoContent)
+}
+
+func getSpamUsers(ctx *context.APIContext) ([]*user_model.User, error) {
+ users := make([]*user_model.User, 0)
+ err := db.GetEngine(ctx).
+ OrderBy("id").
+ Where("type = ?", user_model.UserTypeIndividual).
+ And("TIMESTAMPDIFF(DAY, FROM_UNIXTIME(created_unix), FROM_UNIXTIME(last_login_unix)) <= 2").
+ And("description != ''").
+ And("website != ''").
+ And("num_repos = 0").
+ And("last_login_unix < UNIX_TIMESTAMP(NOW() - INTERVAL 1 WEEK)").Find(&users)
+ return users, err
+}
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 53ae8c4d01..05a63d97ec 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -2,9 +2,9 @@
// Copyright 2016 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT
-// Package v1 Gitea API.
+// Package v1 DCS (Gitea) API.
//
-// This documentation describes the Gitea API.
+// This documentation describes the DCS (Gitea) API.
//
// Schemes: http, https
// BasePath: /api/v1
@@ -84,6 +84,8 @@ import (
"code.gitea.io/gitea/modules/web"
"code.gitea.io/gitea/routers/api/v1/activitypub"
"code.gitea.io/gitea/routers/api/v1/admin"
+ "code.gitea.io/gitea/routers/api/v1/catalog"
+ "code.gitea.io/gitea/routers/api/v1/dcs"
"code.gitea.io/gitea/routers/api/v1/misc"
"code.gitea.io/gitea/routers/api/v1/notify"
"code.gitea.io/gitea/routers/api/v1/org"
@@ -330,7 +332,10 @@ func reqToken() func(ctx *context.APIContext) {
func reqExploreSignIn() func(ctx *context.APIContext) {
return func(ctx *context.APIContext) {
if setting.Service.Explore.RequireSigninView && !ctx.IsSigned {
- ctx.Error(http.StatusUnauthorized, "reqExploreSignIn", "you must be signed in to search for users")
+ /*** DCS Customizations ***/
+ return
+ //ctx.Error(http.StatusUnauthorized, "reqExploreSignIn", "you must be signed in to search for users")
+ /*** END DCS Customizations ***/
}
}
}
@@ -1239,8 +1244,15 @@ func Routes() *web.Route {
m.Get("/{sha}", repo.GetSingleCommit)
m.Get("/{sha}.{diffType:diff|patch}", repo.DownloadCommitDiffOrPatch)
})
- m.Get("/refs", repo.GetGitAllRefs)
- m.Get("/refs/*", repo.GetGitRefs)
+ m.Group("/refs", func() {
+ m.Get("", repo.GetGitAllRefs)
+ m.Post("", reqToken(), reqRepoWriter(unit.TypeCode), bind(api.CreateGitRefOption{}), repo.CreateGitRef)
+ m.Get("/*", repo.GetGitRefs)
+ m.Group("/*", func() {
+ m.Patch("", bind(api.UpdateGitRefOption{}), repo.UpdateGitRef)
+ m.Delete("", repo.DeleteGitRef)
+ }, reqToken(), reqRepoWriter(unit.TypeCode))
+ })
m.Get("/trees/{sha}", repo.GetTree)
m.Get("/blobs/{sha}", repo.GetBlob)
m.Get("/tags/{sha}", repo.GetAnnotatedTag)
@@ -1497,6 +1509,12 @@ func Routes() *web.Route {
m.Get("/orgs", admin.GetAllOrgs)
m.Group("/users", func() {
m.Get("", admin.SearchUsers)
+ /*** DCS Customizations ***/
+ m.Group("/spam", func() {
+ m.Get("", admin.ListSpamUsers)
+ m.Delete("", admin.DeleteSpamUsers)
+ })
+ /*** END DCS Customizations ***/
m.Post("", bind(api.CreateUserOption{}), admin.CreateUser)
m.Group("/{username}", func() {
m.Combo("").Patch(bind(api.EditUserOption{}), admin.EditUser).
@@ -1532,6 +1550,36 @@ func Routes() *web.Route {
m.Group("/topics", func() {
m.Get("/search", repo.TopicSearch)
}, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryRepository))
+
+ /*** DCS Customizations ***/
+ m.Post("/yaml", bind(misc.YamlOption{}), misc.Yaml)
+ m.Group("/languages", func() {
+ m.Get("/langnames.json", dcs.ServeLangnamesJSON)
+ m.Get("/langnames_keyed.json", dcs.ServeLangnamesJSONKeyed)
+ })
+ m.Group("/catalog", func() {
+ m.Get("", catalog.Search)
+ m.Group("/list", func() {
+ m.Get("/subjects", catalog.ListCatalogSubjects)
+ m.Get("/owners", catalog.ListCatalogOwners)
+ m.Get("/languages", catalog.ListCatalogLanguages)
+ m.Get("/metadata-types", catalog.ListCatalogMetadataTypes)
+ })
+ m.Group("/search", func() {
+ m.Get("", catalog.Search)
+ m.Group("/{username}", func() {
+ m.Get("", catalog.SearchOwner)
+ m.Group("/{reponame}", func() {
+ m.Get("", catalog.SearchRepo)
+ }, repoAssignment())
+ })
+ })
+ m.Group("/entry/{username}/{reponame}/{ref}", func() {
+ m.Get("", catalog.GetCatalogEntry)
+ m.Get("/metadata", catalog.GetCatalogMetadata)
+ }, repoAssignment())
+ })
+ /*** END DCS Customizations ***/
}, sudo())
return m
diff --git a/routers/api/v1/catalog/catalog.go b/routers/api/v1/catalog/catalog.go
new file mode 100644
index 0000000000..b1f6ba39cb
--- /dev/null
+++ b/routers/api/v1/catalog/catalog.go
@@ -0,0 +1,1264 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package catalog
+
+import (
+ "fmt"
+ "net/http"
+ "strings"
+ "time"
+
+ "code.gitea.io/gitea/models"
+ "code.gitea.io/gitea/models/db"
+ "code.gitea.io/gitea/models/door43metadata"
+ access_model "code.gitea.io/gitea/models/perm/access"
+ "code.gitea.io/gitea/models/repo"
+ user_model "code.gitea.io/gitea/models/user"
+ "code.gitea.io/gitea/modules/context"
+ "code.gitea.io/gitea/modules/dcs"
+ "code.gitea.io/gitea/modules/log"
+ api "code.gitea.io/gitea/modules/structs"
+ "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/services/convert"
+)
+
+var searchOrderByMap = map[string]map[string]door43metadata.CatalogOrderBy{
+ "asc": {
+ "title": door43metadata.CatalogOrderByTitle,
+ "subject": door43metadata.CatalogOrderBySubject,
+ "resource": door43metadata.CatalogOrderByResource,
+ "reponame": door43metadata.CatalogOrderByRepoName,
+ "released": door43metadata.CatalogOrderByOldest,
+ "lang": door43metadata.CatalogOrderByLangCode,
+ "releases": door43metadata.CatalogOrderByReleases,
+ "stars": door43metadata.CatalogOrderByStars,
+ "forks": door43metadata.CatalogOrderByForks,
+ "tag": door43metadata.CatalogOrderByTag,
+ },
+ "desc": {
+ "title": door43metadata.CatalogOrderByTitleReverse,
+ "subject": door43metadata.CatalogOrderBySubjectReverse,
+ "resouce": door43metadata.CatalogOrderByResourceReverse,
+ "reponame": door43metadata.CatalogOrderByRepoNameReverse,
+ "released": door43metadata.CatalogOrderByNewest,
+ "lang": door43metadata.CatalogOrderByLangCodeReverse,
+ "releases": door43metadata.CatalogOrderByReleasesReverse,
+ "stars": door43metadata.CatalogOrderByStarsReverse,
+ "forks": door43metadata.CatalogOrderByForksReverse,
+ "tag": door43metadata.CatalogOrderByTagReverse,
+ },
+}
+
+// Search search the catalog via options
+func Search(ctx *context.APIContext) {
+ // swagger:operation GET /catalog/search catalog catalogSearch
+ // ---
+ // summary: Search the catalog
+ // produces:
+ // - application/json
+ // parameters:
+ // - name: q
+ // in: query
+ // description: keyword(s). Can use multiple `q=`s or a comma-delimited string for more than one keyword. Is case insensitive
+ // type: string
+ // - name: owner
+ // in: query
+ // description: search only for entries with the given owner name(s). Will perform an exact match (case insensitive) unlesss partialMatch=true
+ // type: string
+ // - name: repo
+ // in: query
+ // description: search only for entries with the given repo name(s). To match multiple, give the parameter multiple times or give a list comma delimited. Will perform an exact match (case insensitive) unlesss partialMatch=true
+ // type: string
+ // - name: tag
+ // in: query
+ // description: search only for entries with the given release tag(s). To match multiple, give the parameter multiple times or give a list comma delimited. Will perform an exact match (case insensitive)
+ // type: string
+ // - name: lang
+ // in: query
+ // description: search only for entries with the given language(s). To match multiple, give the parameter multiple times or give a list comma delimited. Will perform an exact match (case insensitive) unlesss partialMatch=true
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: is_gl
+ // in: query
+ // description: list only those that are (true) or are not (false) a gatetway language
+ // type: boolean
+ // - name: stage
+ // in: query
+ // description: 'specifies which release stage to be return of these stages:
+ // "prod" - return only the production releases (default);
+ // "preprod" - return the pre-production release if it exists instead of the production release;
+ // "latest" - return the default branch (e.g. master) if it is a valid repo'
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [prod,preprod,latest]
+ // - name: subject
+ // in: query
+ // description: search only for entries with the given subject(s). To match multiple, give the parameter multiple times or give a list comma delimited. Will perform an exact match (case insensitive) unlesss partialMatch=true
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [Aligned Bible,Aramaic Grammar,Bible,Greek Grammar,Greek Lexicon,Greek New Testament,Hebrew Grammar,Hebrew Old Testament,Hebrew-Aramaic Lexicon,OBS Study Notes,OBS Study Questions,OBS Translation Notes,OBS Translation Questions,Open Bible Stories,Study Notes,Study Questions,Training Library,Translation Academy,Translation Notes,Translation Questions,Translation Words,TSV Study Notes,TSV Study Questions,TSV Translation Notes,TSV Translation Questions,TSV Translation Words Links,TSV OBS Study Notes,TSV OBS Study Questions,TSV OBS Translation Notes,TSV OBS Translation Questions,TSV OBS Translation Words Links]
+ // - name: resource
+ // in: query
+ // description: resource identifier. Multiple resources are ORed.
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [glt,gst,obs,obs-sn,obs-sq,obs-tn,obs-tq,obs-twl,sn,sq,ta,tn,tq,tw,twl,ugnt,uhb,ult,ust]
+ // - name: format
+ // in: query
+ // description: content format (usfm, text, markdown, etc.). Multiple formats are ORed.
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: checkingLevel
+ // in: query
+ // description: search only for entries with the given checking level(s)
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: ["1","2","3"]
+ // - name: book
+ // in: query
+ // description: search only for entries with the given book(s) (ingredient identifiers). To match multiple, give the parameter multiple times or give a list comma delimited. Will perform an exact match (case insensitive)
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: metadataType
+ // in: query
+ // description: return repos only with metadata of this type
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [rc,sb,tc,ts]
+ // - name: metadataVersion
+ // in: query
+ // description: return repos only with the version of metadata given. Does not apply if metadataType is not given
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: partialMatch
+ // in: query
+ // description: if true, subject, owner and repo search fields will use partial match (LIKE) when querying the catalog. Default is false
+ // type: boolean
+ // - name: includeHistory
+ // in: query
+ // description: if true, all releases, not just the latest, are included. Default is false
+ // type: boolean
+ // - name: showIngredients
+ // in: query
+ // description: if true, the list of ingredients (files/projects) in the resource and their file paths will be listed for each entry. Default is true
+ // type: boolean
+ // - name: sort
+ // in: query
+ // description: sort repos alphanumerically by attribute. Supported values are
+ // "subject", "title", "reponame", "tag", "released", "lang", "releases", "stars", "forks".
+ // Default is by "language", "subject" and then "tag"
+ // type: string
+ // - name: order
+ // in: query
+ // description: sort order, either "asc" (ascending) or "desc" (descending).
+ // Default is "asc", ignored if "sort" is not specified.
+ // type: string
+ // - name: page
+ // in: query
+ // description: page number of results to return (1-based)
+ // type: integer
+ // - name: limit
+ // in: query
+ // description: page size of results, defaults to no limit
+ // type: integer
+ // responses:
+ // "200":
+ // "$ref": "#/responses/CatalogSearchResults"
+ // "422":
+ // "$ref": "#/responses/validationError"
+
+ searchCatalog(ctx)
+}
+
+// SearchOwner search the catalog via owner and via options
+func SearchOwner(ctx *context.APIContext) {
+ // swagger:operation GET /catalog/search/{owner} catalog catalogSearchOwner
+ // ---
+ // summary: Search the catalog by owner
+ // produces:
+ // - application/json
+ // parameters:
+ // - name: owner
+ // in: path
+ // description: owner of the returned entries
+ // type: string
+ // required: true
+ // - name: q
+ // in: query
+ // description: keyword(s). Can use multiple `q=`s or a comma-delimited string for more than one keyword. Is case insensitive
+ // type: string
+ // - name: repo
+ // in: query
+ // description: search only for entries with the given repo name(s). To match multiple, give the parameter multiple times or give a list comma delimited. Will perform an exact match (case insensitive) unlesss partialMatch=true
+ // type: string
+ // - name: tag
+ // in: query
+ // description: search only for entries with the given release tag(s). To match multiple, give the parameter multiple times or give a list comma delimited. Will perform an exact match (case insensitive)
+ // type: string
+ // - name: lang
+ // in: query
+ // description: search only for entries with the given language(s). To match multiple, give the parameter multiple times or give a list comma delimited. Will perform an exact match (case insensitive) unlesss partialMatch=true
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: is_gl
+ // in: query
+ // description: list only those that are (true) or are not (false) a gatetway language
+ // type: boolean
+ // - name: stage
+ // in: query
+ // description: 'specifies which release stage to be return of these stages:
+ // "prod" - return only the production releases (default);
+ // "preprod" - return the pre-production release if it exists instead of the production release;
+ // "latest" -return the default branch (e.g. master) if it is a valid RC instead of the above'
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [prod,preprod,latest]
+ // - name: subject
+ // in: query
+ // description: search only for entries with the given subject(s). To match multiple, give the parameter multiple times or give a list comma delimited. Will perform an exact match (case insensitive) unlesss partialMatch=true
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [Aligned Bible,Aramaic Grammar,Bible,Greek Grammar,Greek Lexicon,Greek New Testament,Hebrew Grammar,Hebrew Old Testament,Hebrew-Aramaic Lexicon,OBS Study Notes,OBS Study Questions,OBS Translation Notes,OBS Translation Questions,Open Bible Stories,Study Notes,Study Questions,Training Library,Translation Academy,Translation Notes,Translation Questions,Translation Words,TSV Study Notes,TSV Study Questions,TSV Translation Notes,TSV Translation Questions,TSV Translation Words Links,TSV OBS Study Notes,TSV OBS Study Questions,TSV OBS Translation Notes,TSV OBS Translation Questions,TSV OBS Translation Words Links]
+ // - name: resource
+ // in: query
+ // description: resource identifier. Multiple resources are ORed.
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [glt,gst,obs,obs-sn,obs-sq,obs-tn,obs-tq,obs-twl,sn,sq,ta,tn,tq,tw,twl,ugnt,uhb,ult,ust]
+ // - name: format
+ // in: query
+ // description: content format (usfm, text, markdown, etc.). Multiple formats are ORed.
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: checkingLevel
+ // in: query
+ // description: search only for entries with the given checking level(s)
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: ["1","2","3"]
+ // - name: book
+ // in: query
+ // description: search only for entries with the given book(s) (ingredient identifiers). To match multiple, give the parameter multiple times or give a list comma delimited. Will perform an exact match (case insensitive)
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: metadataType
+ // in: query
+ // description: return repos only with metadata of this type
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [rc,sb,tc,ts]
+ // - name: metadataVersion
+ // in: query
+ // description: return repos only with the version of metadata given. Does not apply if metadataType is not given
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: partialMatch
+ // in: query
+ // description: if true, subject, owner and repo search fields will use partial match (LIKE) when querying the catalog. Default is false
+ // type: boolean
+ // - name: includeHistory
+ // in: query
+ // description: if true, all releases, not just the latest, are included. Default is false
+ // type: boolean
+ // - name: showIngredients
+ // in: query
+ // description: if true, the list of ingredients (files/projects) in the resource and their file paths will be listed for each entry. Default is true
+ // type: boolean
+ // - name: sort
+ // in: query
+ // description: sort repos alphanumerically by attribute. Supported values are
+ // "subject", "title", "reponame", "tag", "released", "lang", "releases", "stars", "forks".
+ // Default is by "language", "subject" and then "tag"
+ // type: string
+ // - name: order
+ // in: query
+ // description: sort order, either "asc" (ascending) or "desc" (descending).
+ // Default is "asc", ignored if "sort" is not specified.
+ // type: string
+ // - name: page
+ // in: query
+ // description: page number of results to return (1-based)
+ // type: integer
+ // - name: limit
+ // in: query
+ // description: page size of results, defaults to no limit
+ // type: integer
+ // responses:
+ // "200":
+ // "$ref": "#/responses/CatalogSearchResults"
+ // "422":
+ // "$ref": "#/responses/validationError"
+
+ searchCatalog(ctx)
+}
+
+// SearchRepo search the catalog via repo and options
+func SearchRepo(ctx *context.APIContext) {
+ // swagger:operation GET /catalog/search/{owner}/{repo} catalog catalogSearchRepo
+ // ---
+ // summary: Search the catalog by owner and repo
+ // produces:
+ // - application/json
+ // parameters:
+ // - name: owner
+ // in: path
+ // description: owner of the returned entries
+ // type: string
+ // required: true
+ // - name: repo
+ // in: path
+ // description: name of the repo of the returned entries
+ // type: string
+ // required: true
+ // - name: q
+ // in: query
+ // description: keyword(s). Can use multiple `q=`s or a comma-delimited string for more than one keyword. Is case insensitive
+ // type: string
+ // - name: owner
+ // in: query
+ // description: search only for entries with the given owner name(s). Will perform an exact match (case insensitive) unlesss partialMatch=true
+ // type: string
+ // - name: repo
+ // in: query
+ // description: search only for entries with the given repo name(s). To match multiple, give the parameter multiple times or give a list comma delimited. Will perform an exact match (case insensitive) unlesss partialMatch=true
+ // type: string
+ // - name: tag
+ // in: query
+ // description: search only for entries with the given release tag(s). To match multiple, give the parameter multiple times or give a list comma delimited. Will perform an exact match (case insensitive)
+ // type: string
+ // - name: lang
+ // in: query
+ // description: search only for entries with the given language(s). To match multiple, give the parameter multiple times or give a list comma delimited. Will perform an exact match (case insensitive) unlesss partialMatch=true
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: is_gl
+ // in: query
+ // description: list only those that are (true) or are not (false) a gatetway language
+ // type: boolean
+ // - name: stage
+ // in: query
+ // description: 'specifies which release stage to be return of these stages:
+ // "prod" - return only the production releases (default);
+ // "preprod" - return the pre-production release if it exists instead of the production release;
+ // "latest" - return the default branch (e.g. master) if it is a valid repo'
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [prod,preprod,latest]
+ // - name: subject
+ // in: query
+ // description: search only for entries with the given subject(s). To match multiple, give the parameter multiple times or give a list comma delimited. Will perform an exact match (case insensitive) unlesss partialMatch=true
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [Aligned Bible,Aramaic Grammar,Bible,Greek Grammar,Greek Lexicon,Greek New Testament,Hebrew Grammar,Hebrew Old Testament,Hebrew-Aramaic Lexicon,OBS Study Notes,OBS Study Questions,OBS Translation Notes,OBS Translation Questions,Open Bible Stories,Study Notes,Study Questions,Training Library,Translation Academy,Translation Notes,Translation Questions,Translation Words,TSV Study Notes,TSV Study Questions,TSV Translation Notes,TSV Translation Questions,TSV Translation Words Links,TSV OBS Study Notes,TSV OBS Study Questions,TSV OBS Translation Notes,TSV OBS Translation Questions,TSV OBS Translation Words Links]
+ // - name: resource
+ // in: query
+ // description: resource identifier. Multiple resources are ORed.
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [glt,gst,obs,obs-sn,obs-sq,obs-tn,obs-tq,obs-twl,sn,sq,ta,tn,tq,tw,twl,ugnt,uhb,ult,ust]
+ // - name: format
+ // in: query
+ // description: content format (usfm, text, markdown, etc.). Multiple formats are ORed.
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: checkingLevel
+ // in: query
+ // description: search only for entries with the given checking level(s)
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: ["1","2","3"]
+ // - name: book
+ // in: query
+ // description: search only for entries with the given book(s) (ingredient identifiers). To match multiple, give the parameter multiple times or give a list comma delimited. Will perform an exact match (case insensitive)
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: metadataType
+ // in: query
+ // description: return repos only with metadata of this type
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [rc,sb,tc,ts]
+ // - name: metadataVersion
+ // in: query
+ // description: return repos only with the version of metadata given. Does not apply if metadataType is not given
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: partialMatch
+ // in: query
+ // description: if true, subject, owner and repo search fields will use partial match (LIKE) when querying the catalog. Default is false
+ // type: boolean
+ // - name: includeHistory
+ // in: query
+ // description: if true, all releases, not just the latest, are included. Default is false
+ // type: boolean
+ // - name: showIngredients
+ // in: query
+ // description: if true, the list of ingredients (files/projects) in the resource and their file paths will be listed for each entry. Default is true
+ // type: boolean
+ // - name: sort
+ // in: query
+ // description: sort repos alphanumerically by attribute. Supported values are
+ // "subject", "title", "reponame", "tag", "released", "lang", "releases", "stars", "forks".
+ // Default is by "language", "subject" and then "tag"
+ // type: string
+ // - name: order
+ // in: query
+ // description: sort order, either "asc" (ascending) or "desc" (descending).
+ // Default is "asc", ignored if "sort" is not specified.
+ // type: string
+ // - name: page
+ // in: query
+ // description: page number of results to return (1-based)
+ // type: integer
+ // - name: limit
+ // in: query
+ // description: page size of results, defaults to no limit
+ // type: integer
+ // responses:
+ // "200":
+ // "$ref": "#/responses/CatalogSearchResults"
+ // "422":
+ // "$ref": "#/responses/validationError"
+
+ searchCatalog(ctx)
+}
+
+// ListCatalogSubjects list the subjects available in the catalog
+func ListCatalogSubjects(ctx *context.APIContext) {
+ // swagger:operation GET /catalog/list/subjects catalog catalogListSubjects
+ // ---
+ // summary: List of subjects in the catalog based on the given criteria
+ // produces:
+ // - application/json
+ // parameters:
+ // - name: owner
+ // in: query
+ // description: list only subjects in the given owner(s). To match multiple, give the parameter multiple times or give a list comma delimited.
+ // type: string
+ // - name: lang
+ // in: query
+ // description: list only subjects in the given language(s). To match multiple, give the parameter multiple times or give a list comma delimited. Will perform an exact match (case insensitive) unlesss partialMatch=true
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: is_gl
+ // in: query
+ // description: list only those that are (true) or are not (false) a gatetway language
+ // type: boolean
+ // - name: stage
+ // in: query
+ // description: 'list only those of the given stage or lower, with low to high being:
+ // "prod" - return only the production subjects (default);
+ // "preprod" - return pre-production and production subjects;
+ // "latest" - return all subjects in the catalog for all stages'
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [prod,preprod,latest]
+ // - name: subject
+ // in: query
+ // description: list only the those if they are in the catalog meeting the criteria given (e.g. way to test a given language has the given subject)
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [Aligned Bible,Aramaic Grammar,Bible,Greek Grammar,Greek Lexicon,Greek New Testament,Hebrew Grammar,Hebrew Old Testament,Hebrew-Aramaic Lexicon,OBS Study Notes,OBS Study Questions,OBS Translation Notes,OBS Translation Questions,Open Bible Stories,Study Notes,Study Questions,Training Library,Translation Academy,Translation Notes,Translation Questions,Translation Words,TSV Study Notes,TSV Study Questions,TSV Translation Notes,TSV Translation Questions,TSV Translation Words Links,TSV OBS Study Notes,TSV OBS Study Questions,TSV OBS Translation Notes,TSV OBS Translation Questions,TSV OBS Translation Words Links]
+ // - name: resource
+ // in: query
+ // description: list only those with the given resource identifier. Multiple resources are ORed.
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [glt,gst,obs,obs-sn,obs-sq,obs-tn,obs-tq,obs-twl,sn,sq,ta,tn,tq,tw,twl,ugnt,uhb,ult,ust]
+ // - name: format
+ // in: query
+ // description: list only those with the given content format (usfm, text, markdown, etc.). Multiple formats are ORed.
+ // type: string
+ // - name: checkingLevel
+ // in: query
+ // description: list only those with the given checking level(s)
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: ["1","2","3"]
+ // - name: book
+ // in: query
+ // description: list only those with the given book(s) (ingredient identifiers). To match multiple, give the parameter multiple times or give a list comma delimited. Will perform an exact match (case insensitive)
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: metadataType
+ // in: query
+ // description: list only those with the given metadata type
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [rc,sb,tc,ts]
+ // - name: metadataVersion
+ // in: query
+ // description: list only those with the given metadatay version. Does not apply if metadataType is not given
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: partialMatch
+ // in: query
+ // description: if true, owner, subject and language search fields will use partial match (LIKE) when querying the catalog. Default is false
+ // type: boolean
+ // responses:
+ // "200":
+ // description: "SearchResults of a successful catalog owner search"
+ // schema:
+ // type: object
+ // properties:
+ // ok:
+ // type: boolean
+ // data:
+ // type: array
+ // items:
+ // "$ref": "#/responses/StringSlice"
+
+ list, err := getSingleDMFieldList(ctx, "`door43_metadata`.subject")
+ if err != nil {
+ ctx.JSON(http.StatusUnprocessableEntity, map[string]any{
+ "ok": false,
+ "error": err.Error(),
+ })
+ }
+ ctx.RespHeader().Set("X-Total-Count", fmt.Sprintf("%d", len(list)))
+ ctx.JSON(http.StatusOK, map[string]any{
+ "ok": true,
+ "data": list,
+ })
+}
+
+// ListCatalogMetadataTypes list the metadata types available in the catalog
+func ListCatalogMetadataTypes(ctx *context.APIContext) {
+ // swagger:operation GET /catalog/list/metadata-types catalog catalogListMetadataTypes
+ // ---
+ // summary: List of metadata types in the catalog based on the given criteria
+ // produces:
+ // - application/json
+ // parameters:
+ // - name: owner
+ // in: query
+ // description: list only subjects in the given owner(s). To match multiple, give the parameter multiple times or give a list comma delimited.
+ // type: string
+ // - name: lang
+ // in: query
+ // description: list only subjects in the given language(s). To match multiple, give the parameter multiple times or give a list comma delimited. Will perform an exact match (case insensitive) unlesss partialMatch=true
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: is_gl
+ // in: query
+ // description: list only those that are (true) or are not (false) a gatetway language
+ // type: boolean
+ // - name: stage
+ // in: query
+ // description: 'list only those of the given stage or lower, with low to high being:
+ // "prod" - return only the production subjects (default);
+ // "preprod" - return pre-production and production subjects;
+ // "latest" - return all subjects in the catalog for all stages'
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [prod,preprod,latest]
+ // - name: subject
+ // in: query
+ // description: list only the those if they are in the catalog meeting the criteria given (e.g. way to test a given language has the given subject)
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [Aligned Bible,Aramaic Grammar,Bible,Greek Grammar,Greek Lexicon,Greek New Testament,Hebrew Grammar,Hebrew Old Testament,Hebrew-Aramaic Lexicon,OBS Study Notes,OBS Study Questions,OBS Translation Notes,OBS Translation Questions,Open Bible Stories,Study Notes,Study Questions,Training Library,Translation Academy,Translation Notes,Translation Questions,Translation Words,TSV Study Notes,TSV Study Questions,TSV Translation Notes,TSV Translation Questions,TSV Translation Words Links,TSV OBS Study Notes,TSV OBS Study Questions,TSV OBS Translation Notes,TSV OBS Translation Questions,TSV OBS Translation Words Links]
+ // - name: resource
+ // in: query
+ // description: list only those with the given resource identifier. Multiple resources are ORed.
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [glt,gst,obs,obs-sn,obs-sq,obs-tn,obs-tq,obs-twl,sn,sq,ta,tn,tq,tw,twl,ugnt,uhb,ult,ust]
+ // - name: format
+ // in: query
+ // description: list only those with the given content format (usfm, text, markdown, etc.). Multiple formats are ORed.
+ // type: string
+ // - name: checkingLevel
+ // in: query
+ // description: list only those with the given checking level(s)
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: ["1","2","3"]
+ // - name: book
+ // in: query
+ // description: list only those with the given book(s) (ingredient identifiers). To match multiple, give the parameter multiple times or give a list comma delimited. Will perform an exact match (case insensitive)
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: metadataType
+ // in: query
+ // description: list only those with the given metadata type
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [rc,sb,tc,ts]
+ // - name: metadataVersion
+ // in: query
+ // description: list only those with the given metadatay version. Does not apply if metadataType is not given
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: partialMatch
+ // in: query
+ // description: if true, owner, subject and language search fields will use partial match (LIKE) when querying the catalog. Default is false
+ // type: boolean
+ // responses:
+ // "200":
+ // description: "SearchResults of a successful catalog owner search"
+ // schema:
+ // type: object
+ // properties:
+ // ok:
+ // type: boolean
+ // data:
+ // type: array
+ // items:
+ // "$ref": "#/responses/StringSlice"
+
+ list, err := getSingleDMFieldList(ctx, "`door43_metadata`.metadata_type")
+ if err != nil {
+ ctx.JSON(http.StatusUnprocessableEntity, map[string]any{
+ "ok": false,
+ "error": err.Error(),
+ })
+ }
+ ctx.RespHeader().Set("X-Total-Count", fmt.Sprintf("%d", len(list)))
+ ctx.JSON(http.StatusOK, map[string]any{
+ "ok": true,
+ "data": list,
+ })
+}
+
+// ListCatalogOwners list the owners available in the catalog
+func ListCatalogOwners(ctx *context.APIContext) {
+ // swagger:operation GET /catalog/list/owners catalog catalogListOwners
+ // ---
+ // summary: List owners in the catalog based on the given criteria
+ // produces:
+ // - application/json
+ // parameters:
+ // - name: owner
+ // in: query
+ // description: list only the given owners(s) if they have entries in the catalog meeting the criteria given (e.g. way to test an owner has a given language or subject)
+ // type: string
+ // - name: lang
+ // in: query
+ // description: list only those with entries in the given language(s). To match multiple, give the parameter multiple times or give a list comma delimited. Will perform an exact match (case insensitive) unlesss partialMatch=true
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: is_gl
+ // in: query
+ // description: list only those that are (true) or are not (false) a gatetway language
+ // type: boolean
+ // - name: stage
+ // in: query
+ // description: 'list only those of the given stage or lower, with low to high being:
+ // "prod" - return only the production subjects (default);
+ // "preprod" - return pre-production and production subjects;
+ // "latest" - return all subjects in the catalog for all stages'
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [prod,preprod,latest]
+ // - name: subject
+ // in: query
+ // description: list only the those if they are in the catalog meeting the criteria given (e.g. way to test a given language has the given subject)
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [Aligned Bible,Aramaic Grammar,Bible,Greek Grammar,Greek Lexicon,Greek New Testament,Hebrew Grammar,Hebrew Old Testament,Hebrew-Aramaic Lexicon,OBS Study Notes,OBS Study Questions,OBS Translation Notes,OBS Translation Questions,Open Bible Stories,Study Notes,Study Questions,Training Library,Translation Academy,Translation Notes,Translation Questions,Translation Words,TSV Study Notes,TSV Study Questions,TSV Translation Notes,TSV Translation Questions,TSV Translation Words Links,TSV OBS Study Notes,TSV OBS Study Questions,TSV OBS Translation Notes,TSV OBS Translation Questions,TSV OBS Translation Words Links]
+ // - name: resource
+ // in: query
+ // description: list only those with the given resource identifier. Multiple resources are ORed.
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [glt,gst,obs,obs-sn,obs-sq,obs-tn,obs-tq,obs-twl,sn,sq,ta,tn,tq,tw,twl,ugnt,uhb,ult,ust]
+ // - name: format
+ // in: query
+ // description: list only those with the given content format (usfm, text, markdown, etc.). Multiple formats are ORed.
+ // type: string
+ // - name: checkingLevel
+ // in: query
+ // description: list only those with the given checking level(s)
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: ["1","2","3"]
+ // - name: book
+ // in: query
+ // description: list only those with the given book(s) (ingredient identifiers). To match multiple, give the parameter multiple times or give a list comma delimited. Will perform an exact match (case insensitive)
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: metadataType
+ // in: query
+ // description: list only those with the given metadata type
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [rc,sb,tc,ts]
+ // - name: metadataVersion
+ // in: query
+ // description: list only those with the given metadatay version. Does not apply if metadataType is not given
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // responses:
+ // "200":
+ // description: "SearchResults of a successful catalog owner search"
+ // schema:
+ // type: object
+ // properties:
+ // ok:
+ // type: boolean
+ // data:
+ // type: array
+ // items:
+ // "$ref": "#/responses/UserList"
+
+ list, err := getSingleDMFieldList(ctx, "`user`.name")
+ if err != nil {
+ ctx.JSON(http.StatusUnprocessableEntity, map[string]any{
+ "ok": false,
+ "error": err.Error(),
+ })
+ }
+ var users []*api.User
+ for _, name := range list {
+ user, err := user_model.GetUserByName(ctx, name)
+ if err != nil {
+ log.Error("unable to get user [%s]: %v", name, err)
+ }
+ users = append(users, convert.ToUser(ctx, user, ctx.Doer))
+ }
+ ctx.RespHeader().Set("X-Total-Count", fmt.Sprintf("%d", len(users)))
+ ctx.JSON(http.StatusOK, map[string]any{
+ "ok": true,
+ "data": users,
+ })
+}
+
+// ListCatalogLanguages list the languages available in the catalog
+func ListCatalogLanguages(ctx *context.APIContext) {
+ // swagger:operation GET /catalog/list/languages catalog catalogListLanguages
+ // ---
+ // summary: List languages in the catalog based on the given criteria
+ // produces:
+ // - application/json
+ // parameters:
+ // - name: owner
+ // in: query
+ // description: list only those with the given owners(s). To match multiple, give the parameter multiple times or give a list comma delimited. Will perform an exact match (case insensitive) unlesss partialMatch=true
+ // type: string
+ // - name: lang
+ // in: query
+ // description: list only the given languages(s) if they have entries in the catalog meeting the criteria given (e.g. way to test an language has a given owner and/or subject)
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: is_gl
+ // in: query
+ // description: list only those that are (true) or are not (false) a gatetway language
+ // type: boolean
+ // - name: stage
+ // in: query
+ // description: 'list only those of the given stage or lower, with low to high being:
+ // "prod" - return only the production subjects (default);
+ // "preprod" - return pre-production and production subjects;
+ // "latest" - return all subjects in the catalog for all stages'
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [prod,preprod,latest]
+ // - name: subject
+ // in: query
+ // description: list only the those if they are in the catalog meeting the criteria given (e.g. way to test a given language has the given subject)
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [Aligned Bible,Aramaic Grammar,Bible,Greek Grammar,Greek Lexicon,Greek New Testament,Hebrew Grammar,Hebrew Old Testament,Hebrew-Aramaic Lexicon,OBS Study Notes,OBS Study Questions,OBS Translation Notes,OBS Translation Questions,Open Bible Stories,Study Notes,Study Questions,Training Library,Translation Academy,Translation Notes,Translation Questions,Translation Words,TSV Study Notes,TSV Study Questions,TSV Translation Notes,TSV Translation Questions,TSV Translation Words Links,TSV OBS Study Notes,TSV OBS Study Questions,TSV OBS Translation Notes,TSV OBS Translation Questions,TSV OBS Translation Words Links]
+ // - name: resource
+ // in: query
+ // description: list only those with the given resource identifier. Multiple resources are ORed.
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [glt,gst,obs,obs-sn,obs-sq,obs-tn,obs-tq,obs-twl,sn,sq,ta,tn,tq,tw,twl,ugnt,uhb,ult,ust]
+ // - name: format
+ // in: query
+ // description: list only those with the given content format (usfm, text, markdown, etc.). Multiple formats are ORed.
+ // type: string
+ // - name: checkingLevel
+ // in: query
+ // description: list only those with the given checking level(s)
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: ["1","2","3"]
+ // - name: book
+ // in: query
+ // description: list only those with the given book(s) (ingredient identifiers). To match multiple, give the parameter multiple times or give a list comma delimited. Will perform an exact match (case insensitive)
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: metadataType
+ // in: query
+ // description: list only those with the given metadata type
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [rc,sb,tc,ts]
+ // - name: metadataVersion
+ // in: query
+ // description: list only those with the given metadatay version. Does not apply if metadataType is not given
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // responses:
+ // "200":
+ // description: "SearchResults of a successful catalog owner search"
+ // schema:
+ // type: object
+ // properties:
+ // ok:
+ // type: boolean
+ // data:
+ // type: array
+ // items:
+ // "$ref": "#/responses/Language"
+
+ list, err := getSingleDMFieldList(ctx, "`door43_metadata`.language")
+ if err != nil {
+ ctx.JSON(http.StatusUnprocessableEntity, map[string]any{
+ "ok": false,
+ "error": err.Error(),
+ })
+ }
+ var languages []map[string]interface{}
+ langnames := dcs.GetLangnamesJSONKeyed()
+ for _, lang := range list {
+ if val, ok := langnames[lang]; ok {
+ languages = append(languages, val)
+ }
+ }
+ ctx.RespHeader().Set("X-Total-Count", fmt.Sprintf("%d", len(list)))
+ ctx.JSON(http.StatusOK, map[string]any{
+ "ok": true,
+ "data": languages,
+ })
+}
+
+// GetCatalogEntry Get the catalog entry from the given ownername, reponame and ref
+func GetCatalogEntry(ctx *context.APIContext) {
+ // swagger:operation GET /catalog/entry/{owner}/{repo}/{ref} catalog catalogGetEntry
+ // ---
+ // summary: Get a catalog entry
+ // produces:
+ // - application/json
+ // parameters:
+ // - name: owner
+ // in: path
+ // description: name of the owner
+ // type: string
+ // required: true
+ // - name: repo
+ // in: path
+ // description: name of the repo
+ // type: string
+ // required: true
+ // - name: ref
+ // in: path
+ // description: release tag or default branch
+ // type: string
+ // required: true
+ // responses:
+ // "200":
+ // "$ref": "#/responses/CatalogEntry"
+ // "404":
+ // "$ref": "#/responses/notFound"
+
+ ref := ctx.Params("ref")
+ var dm *repo.Door43Metadata
+ var err error
+ dm, err = repo.GetDoor43MetadataByRepoIDAndRef(ctx, ctx.Repo.Repository.ID, ref)
+ if err != nil {
+ if !repo.IsErrDoor43MetadataNotExist(err) {
+ ctx.Error(http.StatusInternalServerError, "GetDoor43MetadataByRepoIDAndRef", err)
+ } else {
+ ctx.NotFound()
+ }
+ return
+ }
+ if err := dm.LoadAttributes(ctx); err != nil {
+ ctx.Error(http.StatusInternalServerError, "LoadAttributes", err)
+ return
+ }
+ perm, err := access_model.GetUserRepoPermission(ctx, dm.Repo, ctx.ContextUser)
+ if err != nil {
+ ctx.Error(http.StatusInternalServerError, "GetUserRepoPermission", err)
+ return
+ }
+ ctx.JSON(http.StatusOK, convert.ToCatalogEntry(ctx, dm, perm))
+}
+
+// GetCatalogMetadata Get the metadata (RC 0.2 manifest) in JSON format for the given ownername, reponame and ref
+func GetCatalogMetadata(ctx *context.APIContext) {
+ // swagger:operation GET /catalog/entry/{owner}/{repo}/{ref}/metadata catalog catalogGetMetadata
+ // ---
+ // summary: Get the metdata metadata (metadata.json or manifest.yaml in JSON format) of a catalog entry
+ // produces:
+ // - application/json
+ // parameters:
+ // - name: owner
+ // in: path
+ // description: name of the owner
+ // type: string
+ // required: true
+ // - name: repo
+ // in: path
+ // description: name of the repo
+ // type: string
+ // required: true
+ // - name: ref
+ // in: path
+ // description: release tag or default branch
+ // type: string
+ // required: true
+ // responses:
+ // "200":
+ // "$ref": "#/responses/CatalogMetadata"
+ // "404":
+ // "$ref": "#/responses/notFound"
+
+ ref := ctx.Params("ref")
+ dm, err := repo.GetDoor43MetadataByRepoIDAndRef(ctx, ctx.Repo.Repository.ID, ref)
+ if err != nil {
+ if !repo.IsErrDoor43MetadataNotExist(err) {
+ ctx.Error(http.StatusInternalServerError, "GetDoor43MetadataByRepoIDAndRef", err)
+ } else {
+ ctx.NotFound()
+ }
+ return
+ }
+ ctx.JSON(http.StatusOK, dm.Metadata)
+}
+
+// QueryStrings After calling QueryStrings on the context, it also separates strings that have commas into substrings
+func QueryStrings(ctx *context.APIContext, name string) []string {
+ strs := ctx.FormStrings(name)
+ if len(strs) == 0 {
+ return strs
+ }
+ var newStrs []string
+ for _, str := range strs {
+ newStrs = append(newStrs, door43metadata.SplitAtCommaNotInString(str, false)...)
+ }
+ return newStrs
+}
+
+func searchCatalog(ctx *context.APIContext) {
+ var repoID int64
+ var owners, repos []string
+ if ctx.Repo.Repository != nil {
+ repoID = ctx.Repo.Repository.ID
+ } else {
+ if ctx.Params("username") != "" {
+ owners = []string{ctx.Params("username")}
+ } else {
+ owners = QueryStrings(ctx, "owner")
+ }
+ repos = QueryStrings(ctx, "repo")
+ }
+
+ stageStr := ctx.FormString("stage")
+ stage := door43metadata.StageProd
+ if stageStr != "" {
+ var ok bool
+ stage, ok = door43metadata.StageMap[stageStr]
+ if !ok {
+ ctx.Error(http.StatusUnprocessableEntity, "", fmt.Errorf("invalid stage [%s]", stageStr))
+ return
+ }
+ }
+
+ metadataTypes := QueryStrings(ctx, "metadataType")
+ metadataVersions := QueryStrings(ctx, "metadataVersion")
+
+ keywords := []string{}
+ query := strings.Trim(ctx.FormString("q"), " ")
+ if query != "" {
+ keywords = door43metadata.SplitAtCommaNotInString(query, false)
+ }
+ listOptions := db.ListOptions{
+ Page: ctx.FormInt("page"),
+ PageSize: ctx.FormInt("limit"),
+ }
+ if listOptions.Page < 1 {
+ listOptions.Page = 1
+ }
+
+ opts := &door43metadata.SearchCatalogOptions{
+ ListOptions: listOptions,
+ Keywords: keywords,
+ Owners: owners,
+ Repos: repos,
+ RepoID: repoID,
+ Tags: QueryStrings(ctx, "tag"),
+ Stage: stage,
+ Languages: QueryStrings(ctx, "lang"),
+ LanguageIsGL: ctx.FormOptionalBool("is_gl"),
+ Subjects: QueryStrings(ctx, "subject"),
+ Resources: QueryStrings(ctx, "resource"),
+ ContentFormats: QueryStrings(ctx, "format"),
+ CheckingLevels: QueryStrings(ctx, "checkingLevel"),
+ Books: QueryStrings(ctx, "book"),
+ IncludeHistory: ctx.FormBool("includeHistory"),
+ ShowIngredients: ctx.FormOptionalBool("showIngredients"),
+ MetadataTypes: metadataTypes,
+ MetadataVersions: metadataVersions,
+ PartialMatch: ctx.FormBool("partialMatch"),
+ }
+
+ sortModes := QueryStrings(ctx, "sort")
+ if len(sortModes) > 0 {
+ sortOrder := ctx.FormString("order")
+ if sortOrder == "" {
+ sortOrder = "asc"
+ }
+ if searchModeMap, ok := searchOrderByMap[sortOrder]; ok {
+ for _, sortMode := range sortModes {
+ if orderBy, ok := searchModeMap[strings.ToLower(sortMode)]; ok {
+ opts.OrderBy = append(opts.OrderBy, orderBy)
+ } else {
+ ctx.Error(http.StatusUnprocessableEntity, "", fmt.Errorf("invalid sort mode: \"%s\"", sortMode))
+ return
+ }
+ }
+ } else {
+ ctx.Error(http.StatusUnprocessableEntity, "", fmt.Errorf("invalid sort order [%s]", sortOrder))
+ return
+ }
+ } else {
+ opts.OrderBy = []door43metadata.CatalogOrderBy{door43metadata.CatalogOrderByLangCode, door43metadata.CatalogOrderBySubject, door43metadata.CatalogOrderByReleaseDateReverse}
+ }
+
+ dms, count, err := models.SearchCatalog(ctx, opts)
+ if err != nil {
+ ctx.Error(http.StatusInternalServerError, "SearchCatalog", err)
+ return
+ }
+
+ results := make([]*api.CatalogEntry, len(dms))
+ var lastUpdated time.Time
+ for i, dm := range dms {
+ if ctx.Repo != nil && ctx.Repo.Repository != nil {
+ dm.Repo = ctx.Repo.Repository
+ } else {
+ err := dm.LoadAttributes(ctx)
+ if err != nil {
+ ctx.Error(http.StatusInternalServerError, "LoadAttributes", err)
+ return
+ }
+ }
+ perm, err := access_model.GetUserRepoPermission(ctx, dm.Repo, ctx.ContextUser)
+ if err != nil {
+ ctx.Error(http.StatusInternalServerError, "GetUserRepoPermission", err)
+ return
+ }
+ dmAPI := convert.ToCatalogEntry(ctx, dm, perm)
+ if opts.ShowIngredients == util.OptionalBoolFalse {
+ dmAPI.Ingredients = nil
+ }
+ if dmAPI.Released.After(lastUpdated) {
+ lastUpdated = dmAPI.Released
+ }
+ results[i] = dmAPI
+ }
+
+ if lastUpdated.IsZero() {
+ lastUpdated = time.Now()
+ }
+
+ if opts.PageSize > 0 {
+ ctx.SetLinkHeader(int(count), opts.PageSize)
+ } else {
+ ctx.SetLinkHeader(int(count), int(count))
+ }
+ ctx.RespHeader().Set("X-Total-Count", fmt.Sprintf("%d", count))
+ ctx.JSON(http.StatusOK, api.CatalogSearchResults{
+ OK: true,
+ Data: results,
+ LastUpdated: lastUpdated,
+ })
+}
+
+func getSingleDMFieldList(ctx *context.APIContext, field string) ([]string, error) {
+ stageStr := ctx.FormString("stage")
+ stage := door43metadata.StageProd
+ if stageStr != "" {
+ var ok bool
+ stage, ok = door43metadata.StageMap[stageStr]
+ if !ok {
+ err := fmt.Errorf("invalid stage [%s]", stageStr)
+ return nil, err
+ }
+ }
+
+ metadataTypes := QueryStrings(ctx, "metadataType")
+ metadataVersions := QueryStrings(ctx, "metadataVersion")
+
+ listOptions := db.ListOptions{
+ ListAll: true,
+ }
+
+ opts := &door43metadata.SearchCatalogOptions{
+ ListOptions: listOptions,
+ Owners: QueryStrings(ctx, "owner"),
+ Repos: QueryStrings(ctx, "repos"),
+ Tags: QueryStrings(ctx, "tag"),
+ Stage: stage,
+ Languages: QueryStrings(ctx, "lang"),
+ LanguageIsGL: ctx.FormOptionalBool("is_gl"),
+ Subjects: QueryStrings(ctx, "subject"),
+ Resources: QueryStrings(ctx, "resource"),
+ ContentFormats: QueryStrings(ctx, "format"),
+ CheckingLevels: QueryStrings(ctx, "checkingLevel"),
+ Books: QueryStrings(ctx, "book"),
+ IncludeHistory: ctx.FormBool("includeHistory"),
+ ShowIngredients: ctx.FormOptionalBool("showIngredients"),
+ MetadataTypes: metadataTypes,
+ MetadataVersions: metadataVersions,
+ PartialMatch: ctx.FormBool("partialMatch"),
+ }
+
+ sortModes := QueryStrings(ctx, "sort")
+ if len(sortModes) > 0 {
+ sortOrder := ctx.FormString("order")
+ if sortOrder == "" {
+ sortOrder = "asc"
+ }
+ if searchModeMap, ok := searchOrderByMap[sortOrder]; ok {
+ for _, sortMode := range sortModes {
+ if orderBy, ok := searchModeMap[strings.ToLower(sortMode)]; ok {
+ opts.OrderBy = append(opts.OrderBy, orderBy)
+ } else {
+ err := fmt.Errorf("invalid sort mode [%s]", sortMode)
+ ctx.JSON(http.StatusUnprocessableEntity, map[string]any{
+ "ok": false,
+ "error": err.Error(),
+ })
+ return nil, err
+ }
+ }
+ } else {
+ err := fmt.Errorf("invalid sort order [%s]", sortOrder)
+ return nil, err
+ }
+ } else {
+ opts.OrderBy = []door43metadata.CatalogOrderBy{door43metadata.CatalogOrderByLangCode, door43metadata.CatalogOrderBySubject, door43metadata.CatalogOrderByReleaseDateReverse}
+ }
+
+ results, err := models.SearchDoor43MetadataField(ctx, opts, field)
+ if err != nil {
+ return nil, err
+ }
+
+ return results, nil
+}
diff --git a/routers/api/v1/dcs/dcs.go b/routers/api/v1/dcs/dcs.go
new file mode 100644
index 0000000000..a9c290302a
--- /dev/null
+++ b/routers/api/v1/dcs/dcs.go
@@ -0,0 +1,177 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package dcs
+
+import (
+ "net/http"
+ "sort"
+ "strings"
+
+ "code.gitea.io/gitea/modules/context"
+ "code.gitea.io/gitea/modules/dcs"
+ "code.gitea.io/gitea/modules/util"
+)
+
+// ServeLangnamesJSON serves the langname.json file from td.unfoldingword.org
+func ServeLangnamesJSON(ctx *context.APIContext) {
+ // swagger:operation GET /languages/langnames.json languages languagesLangnamesJSON
+ // ---
+ // summary: Fetches the langnames.json file
+ // produces:
+ // - application/json
+ // parameters:
+ // - name: lc
+ // in: query
+ // description: list only the given language codes
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: gw
+ // in: query
+ // description: if true, only show gateway languages, if false, only non-gateway languages (other languages)
+ // type: boolean
+ // - name: ld
+ // in: query
+ // description: direction of the language
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [ltr,rtl]
+ // - name: sort
+ // in: query
+ // description: sort alphanumerically by attribute. Supported values are
+ // "ang", "hc", "lc", "ld", "ln", "lr".
+ // Default is "lc"
+ // type: string
+ // - name: order
+ // in: query
+ // description: sort order, either "asc" (ascending) or "desc" (descending).
+ // Default is "asc"
+ // type: string
+ // responses:
+ // "200":
+ // "$ref": "#/responses/LangnamesJSON"
+
+ ctx.JSON(http.StatusOK, searchLangnamesJSON(ctx))
+}
+
+// ServeLangnamesJSONKeyed serves the langname.json file from td.unfoldingword.org but keyed by lang code
+func ServeLangnamesJSONKeyed(ctx *context.APIContext) {
+ // swagger:operation GET /languages/langnames_keyed.json languages languagesLangnamesJSONKeyed
+ // ---
+ // summary: Fetches the langnames.json file and keys it by language code (lc)
+ // produces:
+ // - application/json
+ // parameters:
+ // - name: lc
+ // in: query
+ // description: list only the given language codes
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: gw
+ // in: query
+ // description: if true, only show gateway languages, if false, only non-gateway languages (other languages)
+ // type: boolean
+ // - name: ld
+ // in: query
+ // description: direction of the language
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [ltr,rtl]
+ // responses:
+ // "200":
+ // "$ref": "#/responses/LangnamesJSON"
+
+ ctx.JSON(http.StatusOK, searchLangnamesJSONKeyed(ctx))
+}
+
+func searchLangnamesJSON(ctx *context.APIContext) []map[string]interface{} {
+ langnames := dcs.GetLangnamesJSON()
+ if len(langnames) == 0 {
+ return langnames
+ }
+
+ lcArr := ctx.FormStrings("lc")
+ gw := ctx.FormOptionalBool("gw")
+ ld := ctx.FormString("ld")
+ sortField := ctx.FormString("sort")
+ if sortField != "ang" && sortField != "hc" && sortField != "lc" && sortField != "ld" && sortField != "ln" && sortField != "lr" {
+ sortField = "lc"
+ }
+ orderAsc := true
+ if strings.ToLower(ctx.FormString("order")) == "desc" {
+ orderAsc = false
+ }
+
+ if len(lcArr) > 0 || gw != util.OptionalBoolNone || ld != "" {
+ filteredLangnames := []map[string]interface{}{}
+ for _, data := range langnames {
+ lcMatches := true
+ gwMatches := true
+ ldMatches := true
+
+ if len(lcArr) > 0 {
+ lcMatches = false
+ for _, lc := range lcArr {
+ if data["lc"] == lc {
+ lcMatches = true
+ break
+ }
+ }
+ }
+ if gw != util.OptionalBoolNone {
+ gwMatches = false
+ if data["gw"].(bool) == gw.IsTrue() {
+ gwMatches = true
+ }
+ }
+ if ld != "" {
+ ldMatches = false
+ if data["ld"] == ld {
+ ldMatches = true
+ }
+ }
+ if lcMatches && gwMatches && ldMatches {
+ filteredLangnames = append(filteredLangnames, data)
+ }
+ }
+ langnames = filteredLangnames
+ }
+
+ sort.Slice(langnames, func(i, j int) bool {
+ iStr, ok := langnames[i][sortField].(string)
+ if !ok {
+ return true
+ }
+ jStr, ok := langnames[j][sortField].(string)
+ if !ok {
+ return false
+ }
+ if iStr == jStr {
+ iStr = langnames[i]["lc"].(string)
+ jStr = langnames[j]["lc"].(string)
+ }
+ if orderAsc {
+ return iStr < jStr
+ }
+ return iStr > jStr
+ })
+
+ return langnames
+}
+
+func searchLangnamesJSONKeyed(ctx *context.APIContext) map[string]map[string]interface{} {
+ langnames := searchLangnamesJSON(ctx)
+ langnamesKeyed := map[string]map[string]interface{}{}
+ for _, data := range langnames {
+ langnamesKeyed[data["lc"].(string)] = data
+ }
+ return langnamesKeyed
+}
diff --git a/routers/api/v1/misc/yaml.go b/routers/api/v1/misc/yaml.go
new file mode 100644
index 0000000000..0985af4d53
--- /dev/null
+++ b/routers/api/v1/misc/yaml.go
@@ -0,0 +1,40 @@
+// Copyright 2019 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+/*** DCS Customizations - Router for YAML API ***/
+
+package misc
+
+import (
+ "code.gitea.io/gitea/modules/context"
+ "code.gitea.io/gitea/modules/web"
+ "code.gitea.io/gitea/modules/yaml"
+)
+
+// YamlOption options for YAML
+type YamlOption struct {
+ Text string
+}
+
+// Yaml https://github.com/gogits/go-gogs-client/wiki/Miscellaneous#render-an-arbitrary-markdown-document
+func Yaml(ctx *context.APIContext) {
+ form := web.GetForm(ctx).(*YamlOption)
+
+ if ctx.HasAPIError() {
+ ctx.Error(422, "", ctx.GetErrMsg())
+ return
+ }
+
+ if len(form.Text) == 0 {
+ _, err := ctx.Write([]byte(""))
+ if err != nil {
+ ctx.Error(400, "Unable to write YAML", err)
+ }
+ return
+ }
+ if rendered, err := yaml.RenderSanitized([]byte(form.Text)); err != nil {
+ ctx.Error(400, "Unable to parse YAML", err)
+ } else if _, err := ctx.Write(rendered); err != nil {
+ ctx.Error(400, "Unable to write YAML", err)
+ }
+}
diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go
index 6fb8ecd403..a0d464cbec 100644
--- a/routers/api/v1/org/org.go
+++ b/routers/api/v1/org/org.go
@@ -181,6 +181,29 @@ func GetAll(ctx *context.APIContext) {
// produces:
// - application/json
// parameters:
+ // - name: lang
+ // in: query
+ // description: if the org has one or more repos with the given language(s), the org will be in the results. Multiple lang's are ORed.
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: is_gl
+ // in: query
+ // description: if the org has one or more repos that is a gateway language, the org will be in the results
+ // type: boolean
+ // - name: subject
+ // in: query
+ // description: if the org has one or more repos with the given subject(s), the org will be in the results. Multiple subjects are ORed.
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [Aligned Bible,Aramaic Grammar,Bible,Greek Grammar,Greek Lexicon,Greek New Testament,Hebrew Grammar,Hebrew Old Testament,Hebrew-Aramaic Lexicon,OBS Study Notes,OBS Study Questions,OBS Translation Notes,OBS Translation Questions,Open Bible Stories,Study Notes,Study Questions,Training Library,Translation Academy,Translation Notes,Translation Questions,Translation Words,TSV Study Notes,TSV Study Questions,TSV Translation Notes,TSV Translation Questions,TSV Translation Words Links,TSV OBS Study Notes,TSV OBS Study Questions,TSV OBS Translation Notes,TSV OBS Translation Questions,TSV OBS Translation Words Links]
+ // - name: metadataType
+ // in: query
+ // description: if the org has one or more repos with the given metadata type(s), the org will be in the results. Multiple metadata types are ORed.
+ // type: string
// - name: page
// in: query
// description: page number of results to return (1-based)
@@ -209,6 +232,11 @@ func GetAll(ctx *context.APIContext) {
Type: user_model.UserTypeOrganization,
OrderBy: db.SearchOrderByAlphabetically,
Visible: vMode,
+ /*** DCS Customizations ***/
+ RepoLanguages: ctx.FormStrings("lang"),
+ RepoSubjects: ctx.FormStrings("subject"),
+ RepoMetadataTypes: ctx.FormStrings("metadataType"),
+ /*** END DCS Customizations ***/
})
if err != nil {
ctx.Error(http.StatusInternalServerError, "SearchOrganizations", err)
diff --git a/routers/api/v1/repo/git_ref.go b/routers/api/v1/repo/git_ref.go
index 34d2dcfcc8..ccc787e3e1 100644
--- a/routers/api/v1/repo/git_ref.go
+++ b/routers/api/v1/repo/git_ref.go
@@ -4,13 +4,16 @@
package repo
import (
+ "fmt"
"net/http"
- "net/url"
"code.gitea.io/gitea/modules/context"
+ "code.gitea.io/gitea/modules/git"
api "code.gitea.io/gitea/modules/structs"
- "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/web"
"code.gitea.io/gitea/routers/api/v1/utils"
+ "code.gitea.io/gitea/services/convert"
+ "code.gitea.io/gitea/services/gitref"
)
// GetGitAllRefs get ref or an list all the refs of a repository
@@ -88,15 +91,7 @@ func getGitRefsInternal(ctx *context.APIContext, filter string) {
apiRefs := make([]*api.Reference, len(refs))
for i := range refs {
- apiRefs[i] = &api.Reference{
- Ref: refs[i].Name,
- URL: ctx.Repo.Repository.APIURL() + "/git/" + util.PathEscapeSegments(refs[i].Name),
- Object: &api.GitObject{
- SHA: refs[i].Object.String(),
- Type: refs[i].Type,
- URL: ctx.Repo.Repository.APIURL() + "/git/" + url.PathEscape(refs[i].Type) + "s/" + url.PathEscape(refs[i].Object.String()),
- },
- }
+ apiRefs[i] = convert.ToGitRef(ctx.Repo.Repository, refs[i])
}
// If single reference is found and it matches filter exactly return it as object
if len(apiRefs) == 1 && apiRefs[0].Ref == filter {
@@ -105,3 +100,200 @@ func getGitRefsInternal(ctx *context.APIContext, filter string) {
}
ctx.JSON(http.StatusOK, &apiRefs)
}
+
+// CreateGitRef creates a git ref for a repository that points to a target commitish
+func CreateGitRef(ctx *context.APIContext) {
+ // swagger:operation POST /repos/{owner}/{repo}/git/refs repository repoCreateGitRef
+ // ---
+ // summary: Create a reference
+ // description: Creates a reference for your repository. You are unable to create new references for empty repositories,
+ // even if the commit SHA-1 hash used exists. Empty repositories are repositories without branches.
+ // consumes:
+ // - application/json
+ // produces:
+ // - application/json
+ // parameters:
+ // - name: owner
+ // in: path
+ // description: owner of the repo
+ // type: string
+ // required: true
+ // - name: repo
+ // in: path
+ // description: name of the repo
+ // type: string
+ // required: true
+ // - name: body
+ // in: body
+ // schema:
+ // "$ref": "#/definitions/CreateGitRefOption"
+ // responses:
+ // "201":
+ // "$ref": "#/responses/Reference"
+ // "404":
+ // "$ref": "#/responses/notFound"
+ // "409":
+ // description: The git ref with the same name already exists.
+ // "422":
+ // description: Unable to form reference
+
+ opt := web.GetForm(ctx).(*api.CreateGitRefOption)
+
+ if ctx.Repo.GitRepo.IsReferenceExist(opt.RefName) {
+ ctx.Error(http.StatusConflict, "reference exists", fmt.Errorf("reference already exists: %s", opt.RefName))
+ return
+ }
+
+ commitID, err := ctx.Repo.GitRepo.GetRefCommitID(opt.Target)
+ if err != nil {
+ if git.IsErrNotExist(err) {
+ ctx.Error(http.StatusNotFound, "invalid target", fmt.Errorf("target does not exist: %s", opt.Target))
+ return
+ }
+ ctx.Error(http.StatusInternalServerError, "GetRefCommitID", err)
+ return
+ }
+
+ ref, err := gitref.UpdateReferenceWithChecks(ctx, opt.RefName, commitID)
+ if err != nil {
+ if git.IsErrInvalidRefName(err) {
+ ctx.Error(http.StatusUnprocessableEntity, "invalid reference'", err)
+ } else if git.IsErrProtectedRefName(err) {
+ ctx.Error(http.StatusMethodNotAllowed, "protected reference", err)
+ } else if git.IsErrRefNotFound(err) {
+ ctx.Error(http.StatusUnprocessableEntity, "UpdateReferenceWithChecks", fmt.Errorf("unable to load reference [ref_name: %s]", opt.RefName))
+ } else {
+ ctx.InternalServerError(err)
+ }
+ return
+ }
+
+ ctx.JSON(http.StatusCreated, convert.ToGitRef(ctx.Repo.Repository, ref))
+}
+
+// UpdateGitRef updates a branch for a repository from a commit SHA
+func UpdateGitRef(ctx *context.APIContext) {
+ // swagger:operation PATCH /repos/{owner}/{repo}/git/refs/{ref} repository repoUpdateGitRef
+ // ---
+ // summary: Update a reference
+ // description:
+ // consumes:
+ // - application/json
+ // produces:
+ // - application/json
+ // parameters:
+ // - name: owner
+ // in: path
+ // description: owner of the repo
+ // type: string
+ // required: true
+ // - name: repo
+ // in: path
+ // description: name of the repo
+ // type: string
+ // required: true
+ // - name: ref
+ // in: path
+ // description: name of the ref to update
+ // type: string
+ // required: true
+ // - name: body
+ // in: body
+ // schema:
+ // "$ref": "#/definitions/UpdateGitRefOption"
+ // responses:
+ // "200":
+ // "$ref": "#/responses/Reference"
+ // "404":
+ // "$ref": "#/responses/notFound"
+
+ refName := fmt.Sprintf("refs/%s", ctx.Params("*"))
+ opt := web.GetForm(ctx).(*api.UpdateGitRefOption)
+
+ if ctx.Repo.GitRepo.IsReferenceExist(refName) {
+ ctx.Error(http.StatusConflict, "reference exists", fmt.Errorf("reference already exists: %s", refName))
+ return
+ }
+
+ commitID, err := ctx.Repo.GitRepo.GetRefCommitID(opt.Target)
+ if err != nil {
+ if git.IsErrNotExist(err) {
+ ctx.Error(http.StatusNotFound, "invalid target", fmt.Errorf("target does not exist: %s", opt.Target))
+ return
+ }
+ ctx.Error(http.StatusInternalServerError, "GetRefCommitID", err)
+ return
+ }
+
+ ref, err := gitref.UpdateReferenceWithChecks(ctx, refName, commitID)
+ if err != nil {
+ if git.IsErrInvalidRefName(err) {
+ ctx.Error(http.StatusUnprocessableEntity, "invalid reference'", err)
+ } else if git.IsErrProtectedRefName(err) {
+ ctx.Error(http.StatusMethodNotAllowed, "protected reference", err)
+ } else if git.IsErrRefNotFound(err) {
+ ctx.Error(http.StatusUnprocessableEntity, "UpdateReferenceWithChecks", fmt.Errorf("unable to load reference [ref_name: %s]", refName))
+ } else {
+ ctx.InternalServerError(err)
+ }
+ return
+ }
+
+ ctx.JSON(http.StatusCreated, ref)
+}
+
+// DeleteGitRef deletes a git ref for a repository that points to a target commitish
+func DeleteGitRef(ctx *context.APIContext) {
+ // swagger:operation DELETE /repos/{owner}/{repo}/git/refs/{ref} repository repoDeleteGitRef
+ // ---
+ // summary: Delete a reference
+ // consumes:
+ // - application/json
+ // produces:
+ // - application/json
+ // parameters:
+ // - name: owner
+ // in: path
+ // description: owner of the repo
+ // type: string
+ // required: true
+ // - name: repo
+ // in: path
+ // description: name of the repo
+ // type: string
+ // required: true
+ // - name: ref
+ // in: path
+ // description: name of the ref to be deleted
+ // type: string
+ // required: true
+ // responses:
+ // "204":
+ // "$ref": "#/responses/empty"
+ // "404":
+ // "$ref": "#/responses/notFound"
+ // "405":
+ // "$ref": "#/responses/error"
+ // "409":
+ // "$ref": "#/responses/conflict"
+
+ refName := fmt.Sprintf("refs/%s", ctx.Params("*"))
+
+ if !ctx.Repo.GitRepo.IsReferenceExist(refName) {
+ ctx.Error(http.StatusNotFound, "git ref does not exist:", fmt.Errorf("reference does not exist: %s", refName))
+ return
+ }
+
+ err := gitref.RemoveReferenceWithChecks(ctx, refName)
+ if err != nil {
+ if git.IsErrInvalidRefName(err) {
+ ctx.Error(http.StatusUnprocessableEntity, "invalid reference'", err)
+ } else if git.IsErrProtectedRefName(err) {
+ ctx.Error(http.StatusMethodNotAllowed, "protected reference", err)
+ } else {
+ ctx.InternalServerError(err)
+ }
+ return
+ }
+ ctx.Status(http.StatusNoContent)
+}
diff --git a/routers/api/v1/repo/issue_dependency.go b/routers/api/v1/repo/issue_dependency.go
index 0e3bcd93ef..4d78740ca8 100644
--- a/routers/api/v1/repo/issue_dependency.go
+++ b/routers/api/v1/repo/issue_dependency.go
@@ -135,7 +135,7 @@ func GetIssueDependencies(ctx *context.APIContext) {
Issue: issues_model.Issue{
RepoID: blocker.Issue.RepoID,
Index: blocker.Index,
- Title: blocker.Title,
+ Title: blocker.Issue.Title,
IsClosed: blocker.IsClosed,
IsPull: blocker.IsPull,
},
diff --git a/routers/api/v1/repo/release.go b/routers/api/v1/repo/release.go
index 61e5bdd679..fad68dd023 100644
--- a/routers/api/v1/repo/release.go
+++ b/routers/api/v1/repo/release.go
@@ -255,7 +255,7 @@ func CreateRelease(ctx *context.APIContext) {
}
} else {
if !rel.IsTag {
- ctx.Error(http.StatusConflict, "GetRelease", "Release is has no Tag")
+ ctx.Error(http.StatusConflict, "GetRelease", "Release has no Tag")
return
}
diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
index 64c41d3a97..5044ff72c7 100644
--- a/routers/api/v1/repo/repo.go
+++ b/routers/api/v1/repo/repo.go
@@ -29,6 +29,7 @@ import (
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/modules/validation"
"code.gitea.io/gitea/modules/web"
+ "code.gitea.io/gitea/routers/api/v1/catalog"
"code.gitea.io/gitea/routers/api/v1/utils"
"code.gitea.io/gitea/services/convert"
"code.gitea.io/gitea/services/issue"
@@ -53,7 +54,7 @@ func Search(ctx *context.APIContext) {
// type: boolean
// - name: includeDesc
// in: query
- // description: include search of keyword within repository description
+ // description: include search of keyword within repository description (defaults to false)
// type: boolean
// - name: uid
// in: query
@@ -100,6 +101,68 @@ func Search(ctx *context.APIContext) {
// in: query
// description: if `uid` is given, search only for repos that the user owns
// type: boolean
+ // - name: repo
+ // in: query
+ // description: name of the repo. Multiple repos are ORed.
+ // type: string
+ // - name: owner
+ // in: query
+ // description: owner of the repo. Multiple owners are ORed.
+ // type: string
+ // - name: lang
+ // in: query
+ // description: if the repo is a resource of the given language(s), the repo will be in the results. Multiple langs are ORed.
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: is_gl
+ // in: query
+ // description: if the repo is a gateway language resource, the repo will be in the results
+ // type: boolean
+ // - name: subject
+ // in: query
+ // description: resource subject. Multiple subjects are ORed.
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [Aligned Bible,Aramaic Grammar,Bible,Greek Grammar,Greek Lexicon,Greek New Testament,Hebrew Grammar,Hebrew Old Testament,Hebrew-Aramaic Lexicon,OBS Study Notes,OBS Study Questions,OBS Translation Notes,OBS Translation Questions,Open Bible Stories,Study Notes,Study Questions,Training Library,Translation Academy,Translation Notes,Translation Questions,Translation Words,TSV Study Notes,TSV Study Questions,TSV Translation Notes,TSV Translation Questions,TSV Translation Words Links,TSV OBS Study Notes,TSV OBS Study Questions,TSV OBS Translation Notes,TSV OBS Translation Questions,TSV OBS Translation Words Links]
+ // - name: resource
+ // in: query
+ // description: resource identifier. Multiple resources are ORed.
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [glt,gst,obs,obs-sn,obs-sq,obs-tn,obs-tq,obs-twl,sn,sq,ta,tn,tq,tw,twl,ugnt,uhb,ult,ust]
+ // - name: format
+ // in: query
+ // description: content format (usfm, text, markdown, etc.). Multiple formats are ORed.
+ // type: string
+ // - name: book
+ // in: query
+ // description: book (project id or ingredients id) that exist in a resource. If the resource contains the
+ // the book, its repository will be included in the results. Multiple books are ORed.
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: metadataType
+ // in: query
+ // description: return repos only with metadata of this type
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [rc,sb,tc,ts]
+ // - name: metadataVersion
+ // in: query
+ // description: return repos only with the version of metadata given. Does not apply if metadataType is not given
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
// - name: sort
// in: query
// description: sort repos by attribute. Supported values are
@@ -138,6 +201,18 @@ func Search(ctx *context.APIContext) {
Template: util.OptionalBoolNone,
StarredByID: ctx.FormInt64("starredBy"),
IncludeDescription: ctx.FormBool("includeDesc"),
+ /*** DCS Customizations ***/
+ Languages: catalog.QueryStrings(ctx, "lang"),
+ Repos: catalog.QueryStrings(ctx, "repo"),
+ Owners: catalog.QueryStrings(ctx, "owner"),
+ Subjects: catalog.QueryStrings(ctx, "subject"),
+ Resources: catalog.QueryStrings(ctx, "resource"),
+ ContentFormats: catalog.QueryStrings(ctx, "format"),
+ Books: catalog.QueryStrings(ctx, "book"),
+ MetadataTypes: catalog.QueryStrings(ctx, "metadataType"),
+ MetadataVersions: catalog.QueryStrings(ctx, "metadataVersion"),
+ LanguageIsGL: ctx.FormOptionalBool("is_gl"),
+ /*** END DCS Customizations ***/
}
if ctx.FormString("template") != "" {
diff --git a/routers/api/v1/swagger/catalog.go b/routers/api/v1/swagger/catalog.go
new file mode 100644
index 0000000000..6faf4145a6
--- /dev/null
+++ b/routers/api/v1/swagger/catalog.go
@@ -0,0 +1,36 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package swagger
+
+import (
+ api "code.gitea.io/gitea/modules/structs"
+)
+
+// CatalogSearchResults
+// swagger:response CatalogSearchResults
+type swaggerResponseCatalogSearchResults struct {
+ // in:body
+ Body api.CatalogSearchResults `json:"body"`
+}
+
+// CatalogEntry
+// swagger:response CatalogEntry
+type swaggerResponseCatalogEntry struct {
+ // in:body
+ Body api.CatalogEntry `json:"body"`
+}
+
+// CatalogMetadata
+// swagger:response CatalogMetadata
+type swaggerResponseCatalogMetadata struct {
+ // in:body
+ Body map[string]interface{} `json:"body"`
+}
+
+// Language
+// swagger:response Language
+type swaggerResponseLanguage struct {
+ // in:body
+ Body map[string]interface{} `json:"body"`
+}
diff --git a/routers/api/v1/swagger/dcs.go b/routers/api/v1/swagger/dcs.go
new file mode 100644
index 0000000000..6d01f59e1a
--- /dev/null
+++ b/routers/api/v1/swagger/dcs.go
@@ -0,0 +1,11 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package swagger
+
+// LanguLangnamesJSON
+// swagger:response LangnamesJSON
+type swaggerResponseLangnamesJSON struct {
+ // in:body
+ Body map[string]interface{} `json:"body"`
+}
diff --git a/routers/api/v1/swagger/options.go b/routers/api/v1/swagger/options.go
index 6f7859df62..ede08f3586 100644
--- a/routers/api/v1/swagger/options.go
+++ b/routers/api/v1/swagger/options.go
@@ -179,6 +179,12 @@ type swaggerParameterBodies struct {
// in:body
CreateWikiPageOptions api.CreateWikiPageOptions
+ // in:body
+ CreateGitRefOption api.CreateGitRefOption
+
+ // in:body
+ UpdateGitRefOption api.UpdateGitRefOption
+
// in:body
CreatePushMirrorOption api.CreatePushMirrorOption
diff --git a/routers/api/v1/user/app.go b/routers/api/v1/user/app.go
index fef0240b0f..295481f781 100644
--- a/routers/api/v1/user/app.go
+++ b/routers/api/v1/user/app.go
@@ -5,7 +5,6 @@
package user
import (
- "errors"
"fmt"
"net/http"
"strconv"
@@ -13,6 +12,7 @@ import (
auth_model "code.gitea.io/gitea/models/auth"
"code.gitea.io/gitea/modules/context"
+ "code.gitea.io/gitea/modules/log"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/web"
"code.gitea.io/gitea/routers/api/v1/utils"
@@ -113,10 +113,18 @@ func CreateAccessToken(ctx *context.APIContext) {
return
}
if exist {
- ctx.Error(http.StatusBadRequest, "AccessTokenByNameExists", errors.New("access token name has been used already"))
- return
+ /*** DCS Customizations - Commented out so tokens can have the same name for translationCore ***/
+ //ctx.Error(http.StatusBadRequest, "AccessTokenByNameExists", errors.New("access token name has been used already"))
+ //return
+ log.Info("Ignoring existing Access Token for DCS/translationCore, UID: %v, Token Name: %v", ctx.ContextUser.ID, form.Name)
+ /*** END DCS Customizations ***/
}
+ /*** DCS Customizations - set a default scope since our apps don't do that currently ***/
+ if len(form.Scopes) == 0 {
+ form.Scopes = []string{"write:activitypub", "write:misc", "write:notification", "write:organization", "write:package", "write:issue", "write:repository", "write:user"}
+ }
+ /*** END DCS Customizations ***/
scope, err := auth_model.AccessTokenScope(strings.Join(form.Scopes, ",")).Normalize()
if err != nil {
ctx.Error(http.StatusBadRequest, "AccessTokenScope.Normalize", fmt.Errorf("invalid access token scope provided: %w", err))
diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go
index 6359138369..e4fee6ec46 100644
--- a/routers/api/v1/user/user.go
+++ b/routers/api/v1/user/user.go
@@ -31,6 +31,33 @@ func Search(ctx *context.APIContext) {
// description: ID of the user to search for
// type: integer
// format: int64
+ // - name: lang
+ // in: query
+ // description: if the user has one or more repos with the given language(s), the user will be in the results. Multiple lang's are ORed.
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // - name: is_gl
+ // in: query
+ // description: if the user has one or more repos that is a gateway language, the user will be in the results
+ // type: boolean
+ // - name: subject
+ // in: query
+ // description: if the user has one or more repos with the given subject(s), the user will be in the results. Multiple subjects are ORed.
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [Aligned Bible,Aramaic Grammar,Bible,Greek Grammar,Greek Lexicon,Greek New Testament,Hebrew Grammar,Hebrew Old Testament,Hebrew-Aramaic Lexicon,OBS Study Notes,OBS Study Questions,OBS Translation Notes,OBS Translation Questions,Open Bible Stories,Study Notes,Study Questions,Training Library,Translation Academy,Translation Notes,Translation Questions,Translation Words,TSV Study Notes,TSV Study Questions,TSV Translation Notes,TSV Translation Questions,TSV Translation Words Links,TSV OBS Study Notes,TSV OBS Study Questions,TSV OBS Translation Notes,TSV OBS Translation Questions,TSV OBS Translation Words Links]
+ // - name: metadataType
+ // in: query
+ // description: if the user has one or more repos with the given metadata type(s), the user will be in the results. Multiple metadata types are ORed.
+ // type: array
+ // collectionFormat: multi
+ // items:
+ // type: string
+ // enum: [rc,sb,tc,ts]
// - name: page
// in: query
// description: page number of results to return (1-based)
@@ -60,6 +87,12 @@ func Search(ctx *context.APIContext) {
UID: ctx.FormInt64("uid"),
Type: user_model.UserTypeIndividual,
ListOptions: listOptions,
+ // DCS Customizations
+ RepoLanguages: ctx.FormStrings("lang"),
+ RepoSubjects: ctx.FormStrings("subject"),
+ RepoMetadataTypes: ctx.FormStrings("metadata_type"),
+ RepoLanguageIsGL: ctx.FormOptionalBool("is_gl"),
+ // END DCS Customizations
})
if err != nil {
ctx.JSON(http.StatusInternalServerError, map[string]any{
diff --git a/routers/init.go b/routers/init.go
index c1cfe26bc4..a116d87bd5 100644
--- a/routers/init.go
+++ b/routers/init.go
@@ -37,6 +37,7 @@ import (
"code.gitea.io/gitea/services/auth/source/oauth2"
"code.gitea.io/gitea/services/automerge"
"code.gitea.io/gitea/services/cron"
+ "code.gitea.io/gitea/services/door43metadata" // DCS Customizations
feed_service "code.gitea.io/gitea/services/feed"
indexer_service "code.gitea.io/gitea/services/indexer"
"code.gitea.io/gitea/services/mailer"
@@ -121,6 +122,9 @@ func InitWebInstalled(ctx context.Context) {
mustInit(cache.NewContext)
mustInit(feed_service.Init)
mustInit(uinotification.Init)
+ /*** DCS Customizations ***/
+ mustInit(door43metadata.Init)
+ /*** END DCS Customizations ***/
mustInitCtx(ctx, archiver.Init)
highlight.NewContext()
diff --git a/routers/private/default_branch.go b/routers/private/default_branch.go
index a23e101e9d..0f39e263df 100644
--- a/routers/private/default_branch.go
+++ b/routers/private/default_branch.go
@@ -11,6 +11,7 @@ import (
gitea_context "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/private"
+ door43metadata_service "code.gitea.io/gitea/services/door43metadata"
)
// SetDefaultBranch updates the default branch
@@ -35,5 +36,15 @@ func SetDefaultBranch(ctx *gitea_context.PrivateContext) {
})
return
}
+
+ /*** DCS Customizations ***/
+ if err := door43metadata_service.ProcessDoor43MetadataForRepo(ctx, ctx.Repo.Repository, branch); err != nil {
+ ctx.JSON(http.StatusInternalServerError, map[string]interface{}{
+ "Err": fmt.Sprintf("Unable to process default branch on repository: %s/%s Error: %v", ownerName, repoName, err),
+ })
+ return
+ }
+ /*** END DCS Customizations ***/
+
ctx.PlainText(http.StatusOK, "success")
}
diff --git a/routers/web/admin/orgs.go b/routers/web/admin/orgs.go
index ab44f8048b..5d3dfb79dc 100644
--- a/routers/web/admin/orgs.go
+++ b/routers/web/admin/orgs.go
@@ -35,5 +35,8 @@ func Organizations(ctx *context.Context) {
PageSize: setting.UI.Admin.OrgPagingNum,
},
Visible: []structs.VisibleType{structs.VisibleTypePublic, structs.VisibleTypeLimited, structs.VisibleTypePrivate},
+ /*** DCS Customizations ***/
+ RepoLanguages: ctx.FormStrings("lang"),
+ /*** END DCS Customizations ***/
}, tplOrgs)
}
diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go
index 91a578fb55..2757ea2de0 100644
--- a/routers/web/admin/users.go
+++ b/routers/web/admin/users.go
@@ -43,7 +43,7 @@ func Users(ctx *context.Context) {
ctx.Data["PageIsAdminUsers"] = true
extraParamStrings := map[string]string{}
- statusFilterKeys := []string{"is_active", "is_admin", "is_restricted", "is_2fa_enabled", "is_prohibit_login"}
+ statusFilterKeys := []string{"is_active", "is_admin", "is_restricted", "is_2fa_enabled", "is_prohibit_login", "is_spam_user"} // DCS Customizations - adds "is_spam_user"
statusFilterMap := map[string]string{}
for _, filterKey := range statusFilterKeys {
paramKey := "status_filter[" + filterKey + "]"
@@ -78,6 +78,10 @@ func Users(ctx *context.Context) {
IsProhibitLogin: util.OptionalBoolParse(statusFilterMap["is_prohibit_login"]),
IncludeReserved: true, // administrator needs to list all acounts include reserved, bot, remote ones
ExtraParamStrings: extraParamStrings,
+ /*** DCS Customizations ***/
+ IsSpamUser: util.OptionalBoolParse(statusFilterMap["is_spam_user"]),
+ RepoLanguages: ctx.FormStrings("lang"),
+ /*** END DCS Customizations ***/
}, tplUsers)
}
diff --git a/routers/web/dcs/about.go b/routers/web/dcs/about.go
new file mode 100644
index 0000000000..7edf5941df
--- /dev/null
+++ b/routers/web/dcs/about.go
@@ -0,0 +1,23 @@
+// Copyright 2019 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+/*** DCS Customizations - Router for About page ***/
+
+package dcs
+
+import (
+ "code.gitea.io/gitea/modules/base"
+ "code.gitea.io/gitea/modules/context"
+)
+
+const (
+ // tplAbout about page template. This is the same as the home page that
+ // unauthenticated users see.
+ tplAbout base.TplName = "home"
+)
+
+// About render about page
+func About(ctx *context.Context) {
+ ctx.Data["PageIsAbout"] = true
+ ctx.HTML(200, tplAbout)
+}
diff --git a/routers/web/dcs/catalog.go b/routers/web/dcs/catalog.go
new file mode 100644
index 0000000000..d4f923d7b8
--- /dev/null
+++ b/routers/web/dcs/catalog.go
@@ -0,0 +1,179 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+/*** DCS Customizations - Router for Catalog page ***/
+
+package dcs
+
+import (
+ "strings"
+
+ "code.gitea.io/gitea/models"
+ "code.gitea.io/gitea/models/db"
+ "code.gitea.io/gitea/models/door43metadata"
+ "code.gitea.io/gitea/models/repo"
+ "code.gitea.io/gitea/modules/base"
+ "code.gitea.io/gitea/modules/context"
+ "code.gitea.io/gitea/modules/setting"
+)
+
+const (
+ // tplCatalog catalog page template.
+ tplCatalog base.TplName = "catalog/catalog"
+)
+
+// CatalogSearchOptions when calling search catalog
+type CatalogSearchOptions struct {
+ PageSize int
+ TplName base.TplName
+}
+
+// RenderCatalogSearch render catalog search page
+func RenderCatalogSearch(ctx *context.Context, opts *CatalogSearchOptions) {
+ page := ctx.FormInt("page")
+ if page <= 0 {
+ page = 1
+ }
+
+ var (
+ dms []*repo.Door43Metadata
+ count int64
+ err error
+ orderBy door43metadata.CatalogOrderBy
+ )
+
+ ctx.Data["SortType"] = ctx.FormString("sort")
+ switch ctx.FormString("sort") {
+ case "newest":
+ orderBy = door43metadata.CatalogOrderByNewest
+ case "oldest":
+ orderBy = door43metadata.CatalogOrderByOldest
+ case "reversetitle":
+ orderBy = door43metadata.CatalogOrderByTitleReverse
+ case "title":
+ orderBy = door43metadata.CatalogOrderByTitle
+ case "reversesubject":
+ orderBy = door43metadata.CatalogOrderBySubjectReverse
+ case "subject":
+ orderBy = door43metadata.CatalogOrderBySubject
+ case "reverserresource":
+ orderBy = door43metadata.CatalogOrderByResourceReverse
+ case "resource":
+ orderBy = door43metadata.CatalogOrderByResource
+ case "reverserepo":
+ orderBy = door43metadata.CatalogOrderByRepoNameReverse
+ case "repo":
+ orderBy = door43metadata.CatalogOrderByRepoName
+ case "reversetag":
+ orderBy = door43metadata.CatalogOrderByTagReverse
+ case "tag":
+ orderBy = door43metadata.CatalogOrderByTag
+ case "reverselangcode":
+ orderBy = door43metadata.CatalogOrderByLangCodeReverse
+ case "langcode":
+ orderBy = door43metadata.CatalogOrderByLangCode
+ case "mostreleases":
+ orderBy = door43metadata.CatalogOrderByReleasesReverse
+ case "fewestreleases":
+ orderBy = door43metadata.CatalogOrderByReleases
+ case "moststars":
+ orderBy = door43metadata.CatalogOrderByStarsReverse
+ case "feweststars":
+ orderBy = door43metadata.CatalogOrderByStars
+ case "mostforks":
+ orderBy = door43metadata.CatalogOrderByForksReverse
+ case "fewestforks":
+ orderBy = door43metadata.CatalogOrderByForks
+ default:
+ ctx.Data["SortType"] = "newest"
+ orderBy = door43metadata.CatalogOrderByNewest
+ }
+
+ var keywords, books, langs, subjects, resources, contentFormats, repos, owners, tags, checkingLevels, metadataTypes, metadataVersions []string
+ stage := door43metadata.StageProd
+ query := strings.Trim(ctx.FormString("q"), " ")
+ if query != "" {
+ for _, token := range door43metadata.SplitAtCommaNotInString(query, true) {
+ if strings.HasPrefix(token, "book:") {
+ books = append(books, strings.TrimPrefix(token, "book:"))
+ } else if strings.HasPrefix(token, "lang:") {
+ langs = append(langs, strings.TrimPrefix(token, "lang:"))
+ } else if strings.HasPrefix(token, "subject:") {
+ subjects = append(subjects, strings.Trim(strings.TrimPrefix(token, "subject:"), `"`))
+ } else if strings.HasPrefix(token, "resource:") {
+ resources = append(resources, strings.Trim(strings.TrimPrefix(token, "resource:"), `"`))
+ } else if strings.HasPrefix(token, "format:") {
+ contentFormats = append(contentFormats, strings.Trim(strings.TrimPrefix(token, "format:"), `"`))
+ } else if strings.HasPrefix(token, "repo:") {
+ repos = append(repos, strings.TrimPrefix(token, "repo:"))
+ } else if strings.HasPrefix(token, "owner:") {
+ owners = append(owners, strings.TrimPrefix(token, "owner:"))
+ } else if strings.HasPrefix(token, "tag:") {
+ tags = append(tags, strings.TrimPrefix(token, "tag:"))
+ } else if strings.HasPrefix(token, "checkinglevel:") {
+ checkingLevels = append(checkingLevels, strings.TrimPrefix(token, "checkinglevel:"))
+ } else if strings.HasPrefix(token, "metadata_type:") {
+ metadataTypes = append(metadataTypes, strings.TrimPrefix(token, "metadata_type:"))
+ } else if strings.HasPrefix(token, "metadata_version:") {
+ metadataVersions = append(metadataVersions, strings.TrimPrefix(token, "metadata_version:"))
+ } else if strings.HasPrefix(token, "stage:") {
+ if s, ok := door43metadata.StageMap[strings.Trim(strings.TrimPrefix(token, "stage:"), `"`)]; ok {
+ stage = s
+ } else {
+ stage = 0 // Makes it invalid, return no results
+ }
+ } else {
+ keywords = append(keywords, token)
+ }
+ }
+ }
+
+ dms, count, err = models.SearchCatalog(ctx, &door43metadata.SearchCatalogOptions{
+ ListOptions: db.ListOptions{
+ Page: page,
+ PageSize: opts.PageSize,
+ },
+ OrderBy: []door43metadata.CatalogOrderBy{orderBy},
+ Keywords: keywords,
+ Stage: stage,
+ IncludeHistory: false,
+ Books: books,
+ Subjects: subjects,
+ Resources: resources,
+ ContentFormats: contentFormats,
+ Languages: langs,
+ Repos: repos,
+ Owners: owners,
+ MetadataTypes: metadataTypes,
+ MetadataVersions: metadataVersions,
+ Tags: tags,
+ CheckingLevels: checkingLevels,
+ })
+ if err != nil {
+ ctx.ServerError("SearchCatalog", err)
+ return
+ }
+ ctx.Data["Keyword"] = query
+ ctx.Data["Total"] = count
+ ctx.Data["Door43Metadatas"] = dms
+ ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
+
+ pager := context.NewPagination(int(count), opts.PageSize, page, 5)
+ pager.SetDefaultParams(ctx)
+ pager.AddParam(ctx, "topic", "TopicOnly")
+ ctx.Data["Page"] = pager
+
+ ctx.HTML(200, opts.TplName)
+}
+
+// Catalog render catalog page
+func Catalog(ctx *context.Context) {
+ ctx.Data["Title"] = ctx.Tr("catalog")
+ ctx.Data["PageIsCatalog"] = true
+ ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
+
+ RenderCatalogSearch(ctx, &CatalogSearchOptions{
+ PageSize: setting.UI.ExplorePagingNum,
+ TplName: tplCatalog,
+ })
+}
diff --git a/routers/web/explore/repo.go b/routers/web/explore/repo.go
index e5f7977abd..27b5536954 100644
--- a/routers/web/explore/repo.go
+++ b/routers/web/explore/repo.go
@@ -6,8 +6,10 @@ package explore
import (
"fmt"
"net/http"
+ "strings" // DCS Customizations
"code.gitea.io/gitea/models/db"
+ "code.gitea.io/gitea/models/door43metadata"
repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/context"
@@ -51,7 +53,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
}
var (
- repos []*repo_model.Repository
+ repos repo_model.RepositoryList // DCS Customizations - Fixed this
count int64
err error
orderBy db.SearchOrderBy
@@ -101,6 +103,37 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
topicOnly := ctx.FormBool("topic")
ctx.Data["TopicOnly"] = topicOnly
+ /*** DCS Customizations ***/
+ var books, langs, keywords, subjects, resources, contentFormats, repoNames, owners, metadataTypes, metadataVersions []string
+ origKeyword := keyword
+ if keyword != "" {
+ for _, token := range door43metadata.SplitAtCommaNotInString(keyword, true) {
+ if strings.HasPrefix(token, "book:") {
+ books = append(books, strings.TrimPrefix(token, "book:"))
+ } else if strings.HasPrefix(token, "lang:") {
+ langs = append(langs, strings.TrimPrefix(token, "lang:"))
+ } else if strings.HasPrefix(token, "subject:") {
+ subjects = append(subjects, strings.Trim(strings.TrimPrefix(token, "subject:"), `"`))
+ } else if strings.HasPrefix(token, "resource:") {
+ resources = append(resources, strings.Trim(strings.TrimPrefix(token, "resouce:"), `"`))
+ } else if strings.HasPrefix(token, "format:") {
+ contentFormats = append(contentFormats, strings.Trim(strings.TrimPrefix(token, "format:"), `"`))
+ } else if strings.HasPrefix(token, "repo:") {
+ repoNames = append(repoNames, strings.TrimPrefix(token, "repo:"))
+ } else if strings.HasPrefix(token, "owner:") {
+ owners = append(owners, strings.TrimPrefix(token, "owner:"))
+ } else if strings.HasPrefix(token, "metadata_type:") {
+ metadataTypes = append(metadataTypes, strings.TrimPrefix(token, "metadata_type:"))
+ } else if strings.HasPrefix(token, "metadata_version:") {
+ metadataVersions = append(metadataVersions, strings.TrimPrefix(token, "metadata_version:"))
+ } else {
+ keywords = append(keywords, token)
+ }
+ }
+ keyword = strings.Join(keywords, ", ")
+ }
+ /*** END DCS Customizations ***/
+
language := ctx.FormTrim("language")
ctx.Data["Language"] = language
@@ -119,12 +152,29 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
TopicOnly: topicOnly,
Language: language,
IncludeDescription: setting.UI.SearchRepoDescription,
+ Books: books, // DCS Customizaitons
+ Languages: langs, // DCS Customizaitons
+ Subjects: subjects, // DCS Customizaitons
+ Resources: resources, // DCS Customizations
+ ContentFormats: contentFormats, // DCS Customizations
+ Repos: repoNames, // DCS Customizaitons
+ Owners: owners, // DCS Customizaitons
+ MetadataTypes: metadataTypes, // DCS Customizaitons
+ MetadataVersions: metadataVersions, // DCS Customizaitons
OnlyShowRelevant: opts.OnlyShowRelevant,
})
if err != nil {
ctx.ServerError("SearchRepository", err)
return
}
+
+ /*** DCS Customizations ***/
+ err = repos.LoadLatestDMs(ctx)
+ if err != nil {
+ log.Error("LoadLatestDMs: unable to load DMs for repos")
+ }
+ /*** END DCS Customizations ***/
+
if isSitemap {
m := sitemap.NewSitemap()
for _, item := range repos {
@@ -137,7 +187,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
return
}
- ctx.Data["Keyword"] = keyword
+ ctx.Data["Keyword"] = origKeyword // DCS Customizations
ctx.Data["Total"] = count
ctx.Data["Repos"] = repos
ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
diff --git a/routers/web/org/home.go b/routers/web/org/home.go
index ec866eb6b3..e6e883d968 100644
--- a/routers/web/org/home.go
+++ b/routers/web/org/home.go
@@ -8,11 +8,13 @@ import (
"strings"
"code.gitea.io/gitea/models/db"
+ "code.gitea.io/gitea/models/door43metadata"
"code.gitea.io/gitea/models/organization"
repo_model "code.gitea.io/gitea/models/repo"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/context"
+ "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/markup"
"code.gitea.io/gitea/modules/markup/markdown"
"code.gitea.io/gitea/modules/setting"
@@ -95,8 +97,37 @@ func Home(ctx *context.Context) {
page = 1
}
+ /*** DCS Customizations ***/
+ var books, langs, keywords, subjects, resources, contentFormats, repoNames, owners, metadataTypes, metadataVersions []string
+ if keyword != "" {
+ for _, token := range door43metadata.SplitAtCommaNotInString(keyword, true) {
+ if strings.HasPrefix(token, "book:") {
+ books = append(books, strings.TrimPrefix(token, "book:"))
+ } else if strings.HasPrefix(token, "lang:") {
+ langs = append(langs, strings.TrimPrefix(token, "lang:"))
+ } else if strings.HasPrefix(token, "subject:") {
+ subjects = append(subjects, strings.Trim(strings.TrimPrefix(token, "subject:"), `"`))
+ } else if strings.HasPrefix(token, "resource:") {
+ resources = append(resources, strings.Trim(strings.TrimPrefix(token, "resource:"), `"`))
+ } else if strings.HasPrefix(token, "format:") {
+ contentFormats = append(contentFormats, strings.Trim(strings.TrimPrefix(token, "format:"), `"`))
+ } else if strings.HasPrefix(token, "repo:") {
+ repoNames = append(repoNames, strings.TrimPrefix(token, "repo:"))
+ } else if strings.HasPrefix(token, "owner:") {
+ owners = append(owners, strings.TrimPrefix(token, "owner:"))
+ } else if strings.HasPrefix(token, "metadata_type:") {
+ metadataTypes = append(metadataTypes, strings.TrimPrefix(token, "metadata_type:"))
+ } else if strings.HasPrefix(token, "metadata_version:") {
+ metadataVersions = append(metadataVersions, strings.TrimPrefix(token, "metadata_version:"))
+ } else {
+ keywords = append(keywords, token)
+ }
+ }
+ }
+ /*** END DCS Customizations ***/
+
var (
- repos []*repo_model.Repository
+ repos repo_model.RepositoryList // DCS Customizations - Fixed this
count int64
err error
)
@@ -105,19 +136,35 @@ func Home(ctx *context.Context) {
PageSize: setting.UI.User.RepoPagingNum,
Page: page,
},
- Keyword: keyword,
+ Keyword: strings.Join(keywords, ", "),
OwnerID: org.ID,
OrderBy: orderBy,
Private: ctx.IsSigned,
Actor: ctx.Doer,
Language: language,
IncludeDescription: setting.UI.SearchRepoDescription,
+ Books: books, // DCS Customizations
+ Languages: langs, // DCS Customizations
+ Subjects: subjects, // DCS Customizations
+ Resources: resources, // DCS Customizations
+ ContentFormats: contentFormats, // DCS Customizations
+ Repos: repoNames, // DCS Customizations
+ Owners: owners, // DCS Customizations
+ MetadataTypes: metadataTypes, // DCS Customizations
+ MetadataVersions: metadataVersions, // DCS Customizations
})
if err != nil {
ctx.ServerError("SearchRepository", err)
return
}
+ /*** DCS Customizations ***/
+ err = repos.LoadLatestDMs(ctx)
+ if err != nil {
+ log.Error("LoadLatestDMs: unable to load DMs for repos")
+ }
+ /*** End DCS Customizations ***/
+
opts := &organization.FindOrgMembersOpts{
OrgID: org.ID,
PublicOnly: ctx.Org.PublicMemberOnly,
diff --git a/routers/web/repo/blame.go b/routers/web/repo/blame.go
index 1f1cca897e..80472f562e 100644
--- a/routers/web/repo/blame.go
+++ b/routers/web/repo/blame.go
@@ -108,6 +108,10 @@ func RefBlame(ctx *context.Context) {
ctx.Data["UsesIgnoreRevs"] = result.UsesIgnoreRevs
ctx.Data["FaultyIgnoreRevsFile"] = result.FaultyIgnoreRevsFile
+ /*** DCS Customizations ***/
+ ctx.Data["Entry"] = entry
+ /*** END DCS Customizations ***/
+
// Get Topics of this repo
renderRepoTopics(ctx)
if ctx.Written() {
diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go
index b69af3c61c..70e493c23f 100644
--- a/routers/web/repo/compare.go
+++ b/routers/web/repo/compare.go
@@ -142,6 +142,18 @@ func setCsvCompareContext(ctx *context.Context) {
return nil, nil, err
}
+ /*** DCS Customizations ***/
+ if filepath.Ext(diffFile.Name) == ".tsv" {
+ csvReader, err := csv_module.CreateReaderAndDetermineDelimiter(ctx, charset.ToUTF8WithFallbackReader(reader))
+ if csvReader != nil {
+ csvReader.Comma = '\t' // This is a .tsv file so assume \t is delimiter
+ csvReader.LazyQuotes = true
+ csvReader.TrimLeadingSpace = false
+ }
+ return csvReader, reader, err
+ }
+ /*** END DCS Customizations ***/
+
csvReader, err := csv_module.CreateReaderAndDetermineDelimiter(ctx, charset.ToUTF8WithFallbackReader(reader))
return csvReader, reader, err
}
@@ -683,6 +695,17 @@ func PrepareCompareDiff(
setCompareContext(ctx, beforeCommit, headCommit, ci.HeadUser.Name, repo.Name)
+ /*** DCS Customizations ***/
+ // For Validation
+ for _, file := range diff.Files {
+ if strings.HasSuffix(file.Name, ".json") || strings.HasSuffix(file.Name, ".yaml") || strings.HasSuffix(file.Name, ".yml") {
+ if entry, _ := headCommit.GetTreeEntryByPath(file.Name); entry != nil {
+ file.Entry = entry
+ }
+ }
+ }
+ /*** END DCS Customizations ***/
+
return false
}
diff --git a/routers/web/repo/door43metadata.go b/routers/web/repo/door43metadata.go
new file mode 100644
index 0000000000..2950c4f682
--- /dev/null
+++ b/routers/web/repo/door43metadata.go
@@ -0,0 +1,55 @@
+// Copyright 2023 The Gogs Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package repo
+
+import (
+ "net/http"
+
+ "code.gitea.io/gitea/models/db"
+ repo_model "code.gitea.io/gitea/models/repo"
+ "code.gitea.io/gitea/modules/base"
+ "code.gitea.io/gitea/modules/context"
+ "code.gitea.io/gitea/modules/log"
+ door43metadata_service "code.gitea.io/gitea/services/door43metadata"
+
+ "xorm.io/builder"
+)
+
+const (
+ tplDoor43Metadata base.TplName = "repo/dcs_metadata"
+)
+
+// Door43Metadtas renders door43 metadatas page
+func Door43Metadatas(ctx *context.Context) {
+ dms := make([]*repo_model.Door43Metadata, 0, 50)
+ err := db.GetEngine(ctx).
+ Where(builder.Eq{"repo_id": ctx.Repo.Repository.ID}).
+ OrderBy("is_repo_metadata DESC, is_latest_for_stage DESC, ref_type DESC, release_date_unix DESC").
+ Find(&dms)
+ if err != nil {
+ log.Error("ERROR: %v", err)
+ }
+
+ ctx.Data["PageIsMetadata"] = true
+ ctx.Data["Title"] = "Door43 Metadata"
+ ctx.Data["PageIsSettingsDoor43Metadata"] = true
+ ctx.Data["Door43Metadatas"] = dms
+ ctx.HTML(http.StatusOK, tplDoor43Metadata)
+}
+
+// UpdateDoor43Metadata updates the repo's metadata
+func UpdateDoor43Metadata(ctx *context.Context) {
+ if err := door43metadata_service.ProcessDoor43MetadataForRepo(ctx, ctx.Repo.Repository, ""); err != nil {
+ ctx.Flash.Error("ProcessDoor43MetadataForRepo: " + err.Error())
+ } else {
+ if err := ctx.Repo.Repository.LoadLatestDMs(ctx); err != nil {
+ ctx.Flash.Warning("Error loading metadata. Please try again.")
+ } else if ctx.Repo.Repository.RepoDM.Metadata != nil {
+ ctx.Flash.Success("Successfully scanned this repo's metadata.")
+ } else {
+ ctx.Flash.Warning("No metadata found!")
+ }
+ }
+ ctx.Redirect(ctx.Repo.RepoLink + "/metadata")
+}
diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go
index 1ad091b70f..b0f07bb723 100644
--- a/routers/web/repo/editor.go
+++ b/routers/web/repo/editor.go
@@ -172,9 +172,15 @@ func editFile(ctx *context.Context, isNewFile bool) {
} else {
ctx.Data["FileContent"] = content
}
+ /*** DCS Customizations ***/
+ ctx.Data["Entry"] = entry
+ /*** END DCS Customizations ***/
} else {
// Append filename from query, or empty string to allow user name the new file.
treeNames = append(treeNames, fileName)
+ /*** DCS Customizations ***/
+ ctx.Data["Entry"] = nil
+ /*** END DCS Customizations ***/
}
ctx.Data["TreeNames"] = treeNames
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index ec109ed665..7bdb63e8e8 100644
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -1003,6 +1003,17 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
ctx.Data["IsIssuePoster"] = ctx.IsSigned && issue.IsPoster(ctx.Doer.ID)
ctx.Data["HasIssuesOrPullsWritePermission"] = ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull)
+ /*** DCS Customizations ***/
+ // For Validation
+ for _, file := range diff.Files {
+ if strings.HasSuffix(file.Name, ".json") || strings.HasSuffix(file.Name, ".yaml") || strings.HasSuffix(file.Name, ".yml") {
+ if entry, _ := commit.GetTreeEntryByPath(file.Name); entry != nil {
+ file.Entry = entry
+ }
+ }
+ }
+ /*** END DCS Customizations ***/
+
ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled
// For files changed page
PrepareBranchList(ctx)
diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go
index 5cbd6b3d51..290d32abea 100644
--- a/routers/web/repo/release.go
+++ b/routers/web/repo/release.go
@@ -144,6 +144,15 @@ func Releases(ctx *context.Context) {
ctx.ServerError("RenderString", err)
return
}
+ /*** DCS Customizations ***/
+ if !r.IsTag {
+ r.Door43Metadata, err = repo_model.GetDoor43MetadataByRepoIDAndRef(ctx, r.RepoID, r.TagName)
+ if err != nil && !repo_model.IsErrDoor43MetadataNotExist(err) {
+ ctx.ServerError("GetDoor43Metadata", err)
+ return
+ }
+ }
+ /*** END DCS Customizations ***/
if r.IsDraft {
continue
@@ -294,6 +303,13 @@ func SingleRelease(ctx *context.Context) {
return
}
+ /*** DCS Customizations ***/
+ if err := release.LoadAttributes(ctx); err != nil {
+ ctx.ServerError("LoadAttributes", err)
+ return
+ }
+ /*** END DCS Customizations ***/
+
ctx.Data["Releases"] = []*repo_model.Release{release}
ctx.HTML(http.StatusOK, tplReleasesList)
}
diff --git a/routers/web/repo/setting/setting.go b/routers/web/repo/setting/setting.go
index 0864b1c911..c4d75f7aa4 100644
--- a/routers/web/repo/setting/setting.go
+++ b/routers/web/repo/setting/setting.go
@@ -25,6 +25,7 @@ import (
"code.gitea.io/gitea/modules/lfs"
"code.gitea.io/gitea/modules/log"
repo_module "code.gitea.io/gitea/modules/repository"
+ "code.gitea.io/gitea/modules/scrubber"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/util"
@@ -174,7 +175,7 @@ func SettingsPost(ctx *context.Context) {
return
}
- repo.IsPrivate = form.Private
+ repo.IsPrivate = form.Private && ctx.ContextUser.IsAdmin // DCS Customizations - must be admin
if err := repo_service.UpdateRepository(ctx, repo, visibilityChanged); err != nil {
ctx.ServerError("UpdateRepository", err)
return
@@ -907,6 +908,55 @@ func SettingsPost(ctx *context.Context) {
log.Trace("Repository was un-archived: %s/%s", ctx.Repo.Owner.Name, repo.Name)
ctx.Redirect(ctx.Repo.RepoLink + "/settings")
+ /*** DCS Customizations ***/
+ case "scrub":
+ if !ctx.Repo.IsOwner() {
+ ctx.Error(404)
+ return
+ }
+ if repo.Name != form.RepoName {
+ ctx.RenderWithErr(ctx.Tr("form.enterred_invalid_repo_name"), tplSettingsOptions, nil)
+ return
+ }
+
+ if ctx.Repo.Owner.IsOrganization() {
+ org := organization.OrgFromUser(ctx.Repo.Owner)
+ owned, err := org.IsOwnedBy(ctx, ctx.ContextUser.ID)
+ if err != nil {
+ ctx.ServerError("IsOwnedBy", err)
+ return
+ } else if !owned {
+ ctx.Error(404)
+ return
+ }
+ }
+
+ if err := scrubber.ScrubSensitiveData(&ctx.Repo.GitRepo.Ctx, repo, ctx.ContextUser, scrubber.ScrubSensitiveDataOptions{
+ LastCommitID: ctx.Repo.CommitID,
+ CommitMessage: ctx.Tr("repo.settings.scrub_commit_message"),
+ }); err != nil {
+ log.Error("%v", err)
+ ctx.Flash.Error(ctx.Tr("repo.settings.scrub_error"))
+ } else {
+ log.Trace("Repository scrubbed: %s/%s", ctx.Repo.Owner.Name, repo.Name)
+
+ units := make([]repo_model.RepoUnit, 0, len(repo.Units))
+ var deleteUnitTypes []unit_model.Type
+
+ for _, unit := range repo.Units {
+ if unit.Type != unit_model.TypeWiki {
+ units = append(units, *unit)
+ }
+ }
+ if err := repo_model.UpdateRepositoryUnits(ctx, repo, units, deleteUnitTypes); err != nil {
+ ctx.ServerError("UpdateRepositoryUnits", err)
+ return
+ }
+ ctx.Flash.Success(ctx.Tr("repo.settings.scrub_success"))
+ }
+ ctx.Redirect(ctx.Repo.RepoLink + "/settings")
+ /*** END DCS Customizations ***/
+
default:
ctx.NotFound("", nil)
}
diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
index 4dfa01d8e2..2aae2a8ee3 100644
--- a/routers/web/repo/view.go
+++ b/routers/web/repo/view.go
@@ -14,6 +14,7 @@ import (
"net/http"
"net/url"
"path"
+ "path/filepath"
"slices"
"strings"
"time"
@@ -46,6 +47,7 @@ import (
"code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/typesniffer"
"code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/modules/yaml" // DCS Customizations
"code.gitea.io/gitea/routers/web/feed"
issue_service "code.gitea.io/gitea/services/issue"
@@ -347,6 +349,11 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
ctx.Data["Title"] = ctx.Tr("repo.file.title", ctx.Repo.Repository.Name+"/"+path.Base(ctx.Repo.TreePath), ctx.Repo.RefName)
ctx.Data["FileIsSymlink"] = entry.IsLink()
ctx.Data["FileName"] = blob.Name()
+ /*** DCS Customizations ***/
+ fileExt := filepath.Ext(blob.Name())
+ ctx.Data["FileExt"] = fileExt
+ ctx.Data["IgnoreLanguageDirection"] = fileExt != ".md" || blob.Name() == "README.md" || blob.Name() == "LICENSE.md"
+ /*** END DCS Customizations ***/
ctx.Data["RawFileLink"] = rawLink + "/" + util.PathEscapeSegments(ctx.Repo.TreePath)
if ctx.Repo.TreePath == ".editorconfig" {
@@ -451,6 +458,11 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
readmeExist := util.IsReadmeFileName(blob.Name())
ctx.Data["ReadmeExist"] = readmeExist
+ /*** DCS Customizations ***/
+ isTocYaml := blob.Name() == "toc.yaml"
+ ctx.Data["IsTocYaml"] = isTocYaml
+ /*** END DCS Customizations ***/
+
markupType := markup.Type(blob.Name())
// If the markup is detected by custom markup renderer it should not be reset later on
// to not pass it down to the render context.
@@ -485,6 +497,18 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
}
// to prevent iframe load third-party url
ctx.Resp.Header().Add("Content-Security-Policy", "frame-src 'self'")
+ /*** DCS Customizations ***/
+ } else if isTocYaml {
+ ctx.Data["IsRenderedHTML"] = true
+ if rendered, err := yaml.Render(buf); err != nil {
+ log.Error("RenderYaml: %v", err)
+ ctx.Flash.ErrorMsg = fmt.Sprintf("Unable to parse %v", err)
+ ctx.Data["Flash"] = ctx.Flash
+ ctx.Data["FileContent"] = string(buf)
+ } else {
+ ctx.Data["FileContent"] = string(rendered)
+ }
+ /*** END DCS Customizations ***/
} else {
buf, _ := io.ReadAll(rd)
@@ -984,6 +1008,9 @@ func renderCode(ctx *context.Context) {
if entry.IsDir() {
renderDirectory(ctx, treeLink)
+ /*** DCS Customizations ***/
+ ctx.Data["IgnoreLanguageDirection"] = true
+ /*** END DCS Customizations ***/
} else {
renderFile(ctx, entry, treeLink, rawLink)
}
@@ -1029,6 +1056,11 @@ func renderCode(ctx *context.Context) {
ctx.Data["TreeLink"] = treeLink
ctx.Data["TreeNames"] = treeNames
ctx.Data["BranchLink"] = branchLink
+
+ /*** DCS Customizations ***/
+ ctx.Data["Entry"] = entry
+ /*** END DCS Customizations ***/
+
ctx.HTML(http.StatusOK, tplRepoHome)
}
diff --git a/routers/web/user/home.go b/routers/web/user/home.go
index 8b9a4cd224..8f8515ffbb 100644
--- a/routers/web/user/home.go
+++ b/routers/web/user/home.go
@@ -231,6 +231,13 @@ func Milestones(ctx *context.Context) {
return
}
sort.Sort(showRepos)
+ /*** DCS Customizations ***/
+ for _, repo := range showRepos {
+ if err := repo.LoadLatestDMs(ctx); err != nil {
+ log.Error("Error LoadLatestDMs [%s]: %v", repo.FullName(), err)
+ }
+ }
+ /*** End DCS Customizations ***/
for i := 0; i < len(milestones); {
for _, repo := range showRepos {
diff --git a/routers/web/user/notification.go b/routers/web/user/notification.go
index 579287ffac..bf8935dbea 100644
--- a/routers/web/user/notification.go
+++ b/routers/web/user/notification.go
@@ -393,6 +393,14 @@ func NotificationWatching(ctx *context.Context) {
return
}
total := int(count)
+
+ /*** DCS Customizations ***/
+ err = repos.LoadLatestDMs(ctx)
+ if err != nil {
+ log.Error("LoadLatestDMs: unable to load DMs for repos")
+ }
+ /*** END DCS Customizations ***/
+
ctx.Data["Total"] = total
ctx.Data["Repos"] = repos
diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go
index 48a4b94c19..1e134459c9 100644
--- a/routers/web/user/profile.go
+++ b/routers/web/user/profile.go
@@ -11,6 +11,7 @@ import (
activities_model "code.gitea.io/gitea/models/activities"
"code.gitea.io/gitea/models/db"
+ "code.gitea.io/gitea/models/door43metadata"
repo_model "code.gitea.io/gitea/models/repo"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/context"
@@ -244,13 +245,42 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileGi
}
}
default: // default to "repositories"
+ /*** DCS Customizations ***/
+ var books, langs, keywords, subjects, resources, contentFormats, repoNames, owners, metadataTypes, metadataVersions []string
+ if keyword != "" {
+ for _, token := range door43metadata.SplitAtCommaNotInString(keyword, true) {
+ if strings.HasPrefix(token, "book:") {
+ books = append(books, strings.TrimPrefix(token, "book:"))
+ } else if strings.HasPrefix(token, "lang:") {
+ langs = append(langs, strings.TrimPrefix(token, "lang:"))
+ } else if strings.HasPrefix(token, "subject:") {
+ subjects = append(subjects, strings.Trim(strings.TrimPrefix(token, "subject:"), `"`))
+ } else if strings.HasPrefix(token, "resource:") {
+ resources = append(resources, strings.Trim(strings.TrimPrefix(token, "resource:"), `"`))
+ } else if strings.HasPrefix(token, "format:") {
+ contentFormats = append(contentFormats, strings.Trim(strings.TrimPrefix(token, "format:"), `"`))
+ } else if strings.HasPrefix(token, "repo:") {
+ repoNames = append(repoNames, strings.TrimPrefix(token, "repo:"))
+ } else if strings.HasPrefix(token, "owner:") {
+ owners = append(owners, strings.TrimPrefix(token, "owner:"))
+ } else if strings.HasPrefix(token, "metadata_type:") {
+ metadataTypes = append(metadataTypes, strings.TrimPrefix(token, "metadata_type:"))
+ } else if strings.HasPrefix(token, "metadata_version:") {
+ metadataVersions = append(metadataVersions, strings.TrimPrefix(token, "metadata_version:"))
+ } else {
+ keywords = append(keywords, token)
+ }
+ }
+ }
+ /*** END DCS Customizations ***/
+
repos, count, err = repo_model.SearchRepository(ctx, &repo_model.SearchRepoOptions{
ListOptions: db.ListOptions{
PageSize: pagingNum,
Page: page,
},
Actor: ctx.Doer,
- Keyword: keyword,
+ Keyword: strings.Join(keywords, ", "), // DCS Customizations
OwnerID: ctx.ContextUser.ID,
OrderBy: orderBy,
Private: ctx.IsSigned,
@@ -258,6 +288,15 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileGi
TopicOnly: topicOnly,
Language: language,
IncludeDescription: setting.UI.SearchRepoDescription,
+ Books: books, // DCS Customizations
+ Languages: langs, // DCS Customizations
+ Subjects: subjects, // DCS Customizations
+ Resources: resources, // DCS Customizations
+ ContentFormats: contentFormats, // DCS Customizations
+ Repos: repoNames, // DCS Customizations
+ Owners: owners, // DCS Customizations
+ MetadataTypes: metadataTypes, // DCS Customizations
+ MetadataVersions: metadataVersions, // DCS Customizations
})
if err != nil {
ctx.ServerError("SearchRepository", err)
@@ -266,6 +305,14 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileGi
total = int(count)
}
+ /*** DCS Customizations ***/
+ for _, repo := range repos {
+ if err := repo.LoadLatestDMs(ctx); err != nil {
+ log.Error("Error LoadLatestDMs [%s]: %v", repo.FullName(), err)
+ }
+ }
+ /*** End DCS Customizations ***/
+
ctx.Data["Repos"] = repos
ctx.Data["Total"] = total
diff --git a/routers/web/user/setting/applications.go b/routers/web/user/setting/applications.go
index ee44d48dce..f2cd2686ff 100644
--- a/routers/web/user/setting/applications.go
+++ b/routers/web/user/setting/applications.go
@@ -10,6 +10,7 @@ import (
auth_model "code.gitea.io/gitea/models/auth"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/context"
+ "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/web"
"code.gitea.io/gitea/services/forms"
@@ -59,9 +60,12 @@ func ApplicationsPost(ctx *context.Context) {
return
}
if exist {
- ctx.Flash.Error(ctx.Tr("settings.generate_token_name_duplicate", t.Name))
- ctx.Redirect(setting.AppSubURL + "/user/settings/applications")
- return
+ /*** DCS Customizations - Commented out so tokens can have the same name for translationCore ***/
+ //ctx.Flash.Error(ctx.Tr("settings.generate_token_name_duplicate", t.Name))
+ //ctx.Redirect(setting.AppSubURL + "/user/settings/applications")
+ //return
+ log.Info("Ignoring existing Access Token for DCS/translationCore, UID: %v, Token Name: %v", ctx.ContextUser.ID, form.Name)
+ /*** END DCS Customizations ***/
}
if err := auth_model.NewAccessToken(ctx, t); err != nil {
diff --git a/routers/web/web.go b/routers/web/web.go
index 6449f7716c..ae17bd4bce 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -27,6 +27,7 @@ import (
"code.gitea.io/gitea/routers/common"
"code.gitea.io/gitea/routers/web/admin"
"code.gitea.io/gitea/routers/web/auth"
+ "code.gitea.io/gitea/routers/web/dcs" // DCS Customizations
"code.gitea.io/gitea/routers/web/devtest"
"code.gitea.io/gitea/routers/web/events"
"code.gitea.io/gitea/routers/web/explore"
@@ -1092,6 +1093,13 @@ func registerRoutes(m *web.Route) {
m.Get("/info", repo.GetIssueInfo)
})
})
+ // DCS Customizations
+ m.Group("/metadata", func() {
+ m.Get("", repo.Door43Metadatas)
+ m.Get("/update", repo.UpdateDoor43Metadata)
+ m.Post("/update", repo.UpdateDoor43Metadata) // TODO: Make this /{id} for a single DM
+ })
+ // END DCS Customizations
}, ignSignIn, context.RepoAssignment, context.UnitTypes()) // for "/{username}/{reponame}" which doesn't require authentication
// Grouping for those endpoints that do require authentication
@@ -1548,6 +1556,13 @@ func registerRoutes(m *web.Route) {
m.Any("/devtest/{sub}", devtest.Tmpl)
}
+ /*** DCS Customizations ***/
+ m.Get("/about", dcs.About)
+ m.Group("/catalog", func() {
+ m.Get("", dcs.Catalog)
+ }, ignSignIn)
+ /*** END DCS Customizations ***/
+
m.NotFound(func(w http.ResponseWriter, req *http.Request) {
ctx := context.GetWebContext(req)
ctx.NotFound("", nil)
diff --git a/services/convert/catalog.go b/services/convert/catalog.go
new file mode 100644
index 0000000000..26f84df6a8
--- /dev/null
+++ b/services/convert/catalog.go
@@ -0,0 +1,111 @@
+// Copyright 2021 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package convert
+
+import (
+ "context"
+
+ access_model "code.gitea.io/gitea/models/perm/access"
+ "code.gitea.io/gitea/models/repo"
+ "code.gitea.io/gitea/modules/log"
+ api "code.gitea.io/gitea/modules/structs"
+)
+
+// ToIngredient converts a Door43Metadata project to an api.Ingredient
+func ToIngredient(project map[string]interface{}) *api.Ingredient {
+ ingredient := &api.Ingredient{}
+ if val, ok := project["categories"].([]string); ok {
+ ingredient.Categories = val
+ }
+ if val, ok := project["identifier"].(string); ok {
+ ingredient.Identifier = val
+ }
+ if val, ok := project["path"].(string); ok {
+ ingredient.Path = val
+ }
+ if val, ok := project["sort"].(int); ok {
+ ingredient.Sort = val
+ }
+ if val, ok := project["title"].(string); ok {
+ ingredient.Title = val
+ }
+ if val, ok := project["versification"].(string); ok {
+ ingredient.Versification = val
+ }
+ return ingredient
+}
+
+// ToCatalogEntry converts a Door43Metadata to an api.CatalogEntry
+func ToCatalogEntry(ctx context.Context, dm *repo.Door43Metadata, perm access_model.Permission) *api.CatalogEntry {
+ if err := dm.LoadRepo(ctx); err != nil {
+ log.Error("ToCatalogEntry: dm.LoadAttributes() ERROR: %v", err)
+ return nil
+ }
+
+ if err := dm.Repo.LoadOwner(ctx); err != nil {
+ log.Error("ToCatalogEntry: dm.Repo.GetOwner() ERROR: %v", err)
+ return nil
+ }
+
+ var release *api.Release
+ if dm.Release != nil {
+ release = ToAPIRelease(ctx, dm.Repo, dm.Release)
+ }
+
+ return &api.CatalogEntry{
+ ID: dm.ID,
+ Self: dm.APIURL(),
+ Name: dm.Repo.Name,
+ Owner: dm.Repo.OwnerName,
+ FullName: dm.Repo.FullName(),
+ Repo: innerToRepo(ctx, dm.Repo, perm, true),
+ Release: release,
+ TarballURL: dm.GetTarballURL(),
+ ZipballURL: dm.GetZipballURL(),
+ GitTreesURL: dm.GetGitTreesURL(),
+ ContentsURL: dm.GetContentsURL(),
+ Ref: dm.Ref,
+ RefType: dm.RefType,
+ CommitSHA: dm.CommitSHA,
+ Language: dm.Language,
+ LanguageTitle: dm.LanguageTitle,
+ LanguageDir: dm.LanguageDirection,
+ LanguageIsGL: dm.LanguageIsGL,
+ Subject: dm.Subject,
+ Resource: dm.Resource,
+ Title: dm.Title,
+ Stage: dm.Stage.String(),
+ Released: dm.ReleaseDateUnix.AsTime(),
+ MetadataType: dm.MetadataType,
+ MetadataVersion: dm.MetadataVersion,
+ MetadataURL: dm.GetMetadataURL(),
+ MetadataJSONURL: dm.GetMetadataJSONURL(),
+ MetadataAPIContentsURL: dm.GetMetadataAPIContentsURL(),
+ Ingredients: dm.Ingredients,
+ Books: dm.GetIngredientsIdentifierList(),
+ ContentFormat: dm.ContentFormat,
+ }
+}
+
+// ToCatalogStage converts a Door43Metadata to an api.CatalogStage
+func ToCatalogStage(ctx context.Context, dm *repo.Door43Metadata) *api.CatalogStage {
+ if dm == nil {
+ return nil
+ }
+ _ = dm.LoadAttributes(ctx)
+ catalogStage := &api.CatalogStage{
+ Ref: dm.Ref,
+ Released: dm.ReleaseDateUnix.AsTime(),
+ CommitSHA: dm.CommitSHA,
+ ZipballURL: dm.GetZipballURL(),
+ TarballURL: dm.GetTarballURL(),
+ GitTreesURL: dm.GetGitTreesURL(),
+ ContentsURL: dm.GetContentsURL(),
+ }
+ url := dm.GetReleaseURL(ctx)
+ if url != "" {
+ catalogStage.ReleaseURL = &url
+ }
+ return catalogStage
+}
diff --git a/services/convert/convert.go b/services/convert/convert.go
index 366782390a..49bdf2b8d3 100644
--- a/services/convert/convert.go
+++ b/services/convert/convert.go
@@ -11,6 +11,7 @@ import (
"strings"
"time"
+ "code.gitea.io/gitea/models"
asymkey_model "code.gitea.io/gitea/models/asymkey"
"code.gitea.io/gitea/models/auth"
git_model "code.gitea.io/gitea/models/git"
@@ -294,6 +295,11 @@ func ToOrganization(ctx context.Context, org *organization.Organization) *api.Or
Location: org.Location,
Visibility: org.Visibility.String(),
RepoAdminChangeTeamAccess: org.RepoAdminChangeTeamAccess,
+ /*** DCS Customizations ***/
+ RepoLanguages: models.GetRepoLanguages(ctx, (*user_model.User)(org)),
+ RepoSubjects: models.GetRepoSubjects(ctx, (*user_model.User)(org)),
+ RepoMetadataTypes: models.GetRepoMetadataTypes(ctx, (*user_model.User)(org)),
+ /*** END DCS Customizations ***/
}
}
diff --git a/services/convert/git_ref.go b/services/convert/git_ref.go
new file mode 100644
index 0000000000..7ffeda92e5
--- /dev/null
+++ b/services/convert/git_ref.go
@@ -0,0 +1,26 @@
+// Copyright 2022 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package convert
+
+import (
+ "net/url"
+
+ repo_model "code.gitea.io/gitea/models/repo"
+ "code.gitea.io/gitea/modules/git"
+ api "code.gitea.io/gitea/modules/structs"
+ "code.gitea.io/gitea/modules/util"
+)
+
+// ToGitRef converts a git.Reference to a api.Reference
+func ToGitRef(repo *repo_model.Repository, ref *git.Reference) *api.Reference {
+ return &api.Reference{
+ Ref: ref.Name,
+ URL: repo.APIURL() + "/git/" + util.PathEscapeSegments(ref.Name),
+ Object: &api.GitObject{
+ SHA: ref.Object.String(),
+ Type: ref.Type,
+ URL: repo.APIURL() + "/git/" + url.PathEscape(ref.Type) + "s/" + url.PathEscape(ref.Object.String()),
+ },
+ }
+}
diff --git a/services/convert/pull.go b/services/convert/pull.go
index 7eebe20426..771336e446 100644
--- a/services/convert/pull.go
+++ b/services/convert/pull.go
@@ -74,6 +74,9 @@ func ToAPIPullRequest(ctx context.Context, pr *issues_model.PullRequest, doer *u
Updated: pr.Issue.UpdatedUnix.AsTimePtr(),
PinOrder: apiIssue.PinOrder,
+ HasConflicts: pr.IsFilesConflicted(), // DCS Customizations
+ ConflictedFiles: pr.ConflictedFiles, // DCS Customizations
+
AllowMaintainerEdit: pr.AllowMaintainerEdit,
Base: &api.PRBranchInfo{
diff --git a/services/convert/repository.go b/services/convert/repository.go
index 71038cd062..c673cb079e 100644
--- a/services/convert/repository.go
+++ b/services/convert/repository.go
@@ -159,14 +159,9 @@ func innerToRepo(ctx context.Context, repo *repo_model.Repository, permissionInR
}
}
- var language string
- if repo.PrimaryLanguage != nil {
- language = repo.PrimaryLanguage.Language
- }
-
repoAPIURL := repo.APIURL()
- return &api.Repository{
+ return ToRepoDCS(ctx, repo, &api.Repository{
ID: repo.ID,
Owner: ToUserWithAccessMode(ctx, repo.Owner, permissionInRepo.AccessMode),
Name: repo.Name,
@@ -186,7 +181,6 @@ func innerToRepo(ctx context.Context, repo *repo_model.Repository, permissionInR
CloneURL: cloneLink.HTTPS,
OriginalURL: repo.SanitizedOriginalURL(),
Website: repo.Website,
- Language: language,
LanguagesURL: repoAPIURL + "/languages",
Stars: repo.NumStars,
Forks: repo.NumForks,
@@ -223,7 +217,7 @@ func innerToRepo(ctx context.Context, repo *repo_model.Repository, permissionInR
MirrorInterval: mirrorInterval,
MirrorUpdated: mirrorUpdated,
RepoTransfer: transfer,
- }
+ })
}
// ToRepoTransfer convert a models.RepoTransfer to a structs.RepeTransfer
diff --git a/services/convert/repository_dcs.go b/services/convert/repository_dcs.go
new file mode 100644
index 0000000000..b6ef7c4899
--- /dev/null
+++ b/services/convert/repository_dcs.go
@@ -0,0 +1,35 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package convert
+
+import (
+ "context"
+
+ repo_model "code.gitea.io/gitea/models/repo"
+ api "code.gitea.io/gitea/modules/structs"
+)
+
+// ToRepoDCS adds Door43 metadata properties to the API Repo object
+func ToRepoDCS(ctx context.Context, repo *repo_model.Repository, apiRepo *api.Repository) *api.Repository {
+ if err := repo.LoadLatestDMs(ctx); err != nil {
+ return apiRepo
+ }
+ dm := repo.RepoDM
+ apiRepo.Title = dm.Title
+ apiRepo.Subject = dm.Subject
+ apiRepo.Language = dm.Language
+ apiRepo.LanguageDir = dm.LanguageDirection
+ apiRepo.LanguageIsGL = dm.LanguageIsGL
+ apiRepo.CheckingLevel = dm.CheckingLevel
+ apiRepo.ContentFormat = dm.ContentFormat
+ apiRepo.MetadataType = dm.MetadataType
+ apiRepo.MetadataVersion = dm.MetadataVersion
+ apiRepo.Ingredients = dm.Ingredients
+ apiRepo.CatalogStages = &api.CatalogStages{
+ Production: ToCatalogStage(ctx, repo.LatestProdDM),
+ PreProduction: ToCatalogStage(ctx, repo.LatestPreprodDM),
+ Latest: ToCatalogStage(ctx, repo.DefaultBranchDM),
+ }
+ return apiRepo
+}
diff --git a/services/convert/user.go b/services/convert/user.go
index 3521dd2f90..b0cbed6266 100644
--- a/services/convert/user.go
+++ b/services/convert/user.go
@@ -47,7 +47,7 @@ func ToUserWithAccessMode(ctx context.Context, user *user_model.User, accessMode
// toUser convert user_model.User to api.User
// signed shall only be set if requester is logged in. authed shall only be set if user is site admin or user himself
func toUser(ctx context.Context, user *user_model.User, signed, authed bool) *api.User {
- result := &api.User{
+ result := toUserDCS(ctx, user, &api.User{
ID: user.ID,
UserName: user.Name,
FullName: user.FullName,
@@ -62,7 +62,7 @@ func toUser(ctx context.Context, user *user_model.User, signed, authed bool) *ap
Followers: user.NumFollowers,
Following: user.NumFollowing,
StarredRepos: user.NumStars,
- }
+ })
result.Visibility = user.Visibility.String()
diff --git a/services/convert/user_dcs.go b/services/convert/user_dcs.go
new file mode 100644
index 0000000000..291d5fbf66
--- /dev/null
+++ b/services/convert/user_dcs.go
@@ -0,0 +1,21 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package convert
+
+import (
+ "context"
+
+ "code.gitea.io/gitea/models"
+ user_model "code.gitea.io/gitea/models/user"
+ api "code.gitea.io/gitea/modules/structs"
+)
+
+func toUserDCS(ctx context.Context, user *user_model.User, apiUser *api.User) *api.User {
+ if user != nil && apiUser != nil {
+ apiUser.RepoLanguages = models.GetRepoLanguages(ctx, user)
+ apiUser.RepoSubjects = models.GetRepoSubjects(ctx, user)
+ apiUser.RepoMetadataTypes = models.GetRepoMetadataTypes(ctx, user)
+ }
+ return apiUser
+}
diff --git a/services/cron/tasks_basic.go b/services/cron/tasks_basic.go
index 3869382d22..bb27639201 100644
--- a/services/cron/tasks_basic.go
+++ b/services/cron/tasks_basic.go
@@ -180,6 +180,10 @@ func initBasicTasks() {
registerArchiveCleanup()
registerSyncExternalUsers()
registerDeletedBranchesCleanup()
+ /*** DCS Customizations ***/
+ registerUpdateDoor43MetadataTask()
+ registerLoadMetadataSchemasTask()
+ /*** END DCS Customizations ***/
if !setting.Repository.DisableMigrations {
registerUpdateMigrationPosterID()
}
diff --git a/services/cron/tasks_dcs.go b/services/cron/tasks_dcs.go
new file mode 100644
index 0000000000..f26e5f2b42
--- /dev/null
+++ b/services/cron/tasks_dcs.go
@@ -0,0 +1,31 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package cron
+
+import (
+ "context"
+
+ user_model "code.gitea.io/gitea/models/user"
+ metadata_service "code.gitea.io/gitea/services/door43metadata"
+)
+
+func registerUpdateDoor43MetadataTask() {
+ RegisterTaskFatal("update_metadata", &BaseConfig{
+ Enabled: true,
+ RunAtStart: false,
+ Schedule: "@every 72h",
+ }, func(ctx context.Context, _ *user_model.User, _ Config) error {
+ return metadata_service.UpdateDoor43Metadata(ctx)
+ })
+}
+
+func registerLoadMetadataSchemasTask() {
+ RegisterTaskFatal("load_schemas", &BaseConfig{
+ Enabled: true,
+ RunAtStart: true,
+ Schedule: "@every 72h",
+ }, func(ctx context.Context, _ *user_model.User, _ Config) error {
+ return metadata_service.LoadMetadataSchemas(ctx)
+ })
+}
diff --git a/services/door43metadata/door43metadata.go b/services/door43metadata/door43metadata.go
new file mode 100644
index 0000000000..df16cdcbc8
--- /dev/null
+++ b/services/door43metadata/door43metadata.go
@@ -0,0 +1,821 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package door43metadata
+
+import (
+ "bytes"
+ "context"
+ "fmt"
+ "io"
+ "net/http"
+ "regexp"
+ "strconv"
+ "strings"
+ "time"
+
+ "code.gitea.io/gitea/models/db"
+ "code.gitea.io/gitea/models/door43metadata"
+ repo_model "code.gitea.io/gitea/models/repo"
+ "code.gitea.io/gitea/models/system"
+ "code.gitea.io/gitea/modules/charset"
+ "code.gitea.io/gitea/modules/dcs"
+ "code.gitea.io/gitea/modules/git"
+ "code.gitea.io/gitea/modules/json"
+ "code.gitea.io/gitea/modules/log"
+ "code.gitea.io/gitea/modules/setting"
+ "code.gitea.io/gitea/modules/storage"
+ "code.gitea.io/gitea/modules/structs"
+ "code.gitea.io/gitea/modules/timeutil"
+ "code.gitea.io/gitea/modules/util"
+ "code.gitea.io/gitea/services/convert"
+
+ "github.com/google/uuid"
+ "xorm.io/builder"
+)
+
+func processDoor43MetadataForRepoRefs(ctx context.Context, repo *repo_model.Repository) error {
+ refs, err := repo_model.GetRepoReleaseTagsForMetadata(ctx, repo.ID)
+ if err != nil {
+ log.Error("GetRepoReleaseTagsForMetadata Error %s: %v", repo.FullName(), err)
+ }
+
+ gitRepo, err := git.OpenRepository(ctx, repo.RepoPath())
+ if err != nil {
+ log.Error("git.OpenRepository Error %s: %v", repo.FullName(), err)
+ }
+ if gitRepo != nil {
+ defer gitRepo.Close()
+ branchNames, _, err := gitRepo.GetBranchNames(0, 0)
+ if err != nil {
+ log.Error("git.GetBranchNames Error %s: %v", repo.FullName(), err)
+ } else {
+ refs = append(refs, branchNames...)
+ }
+ }
+
+ for _, ref := range refs {
+ if err := processDoor43MetadataForRepoRef(ctx, repo, ref); err != nil {
+ log.Info("Failed to process metadata for repo %s, ref %s: %v", repo.FullName(), ref, err)
+ if err = system.CreateRepositoryNotice("Failed to process metadata for repository (%s) ref (%s): %v", repo.FullName(), ref, err); err != nil {
+ log.Error("processDoor43MetadataForRepoRef: %v", err)
+ }
+ }
+ }
+ return nil
+}
+
+func handleLatestStageDM(ctx context.Context, repo *repo_model.Repository, stage door43metadata.Stage, earliestDate *timeutil.TimeStamp) (*repo_model.Door43Metadata, error) {
+ _, err := db.GetEngine(ctx).
+ Where(builder.Eq{"repo_id": repo.ID}).
+ And(builder.Eq{"stage": stage}).
+ Cols("is_latest_for_stage").
+ Update(&repo_model.Door43Metadata{IsLatestForStage: false})
+ if err != nil {
+ return nil, err
+ }
+
+ var dm *repo_model.Door43Metadata
+ if stage == door43metadata.StageLatest {
+ dm, err = repo_model.GetDoor43MetadataByRepoIDAndRef(ctx, repo.ID, repo.DefaultBranch)
+ } else {
+ dm, err = repo_model.GetMostRecentDoor43MetadataByStage(ctx, repo.ID, stage)
+ }
+ if err != nil && !repo_model.IsErrDoor43MetadataNotExist(err) {
+ return nil, err
+ }
+ if dm != nil && (earliestDate == nil || dm.ReleaseDateUnix > *earliestDate) {
+ dm.Stage = stage
+ dm.IsLatestForStage = true
+ err = repo_model.UpdateDoor43MetadataCols(ctx, dm, "stage", "is_latest_for_stage")
+ if err != nil {
+ return nil, err
+ }
+ }
+
+ return dm, nil
+}
+
+func handleRepoDM(ctx context.Context, repo *repo_model.Repository) error {
+ if repo.DefaultBranchDM != nil {
+ repo.RepoDM = repo.DefaultBranchDM
+ } else if repo.LatestProdDM != nil {
+ repo.RepoDM = repo.LatestProdDM
+ } else if repo.LatestPreprodDM != nil {
+ repo.RepoDM = repo.LatestPreprodDM
+ } else {
+ repo.RepoDM, _ = repo_model.GetMostRecentDoor43MetadataByStage(ctx, repo.ID, door43metadata.StageBranch)
+ }
+
+ if repo.RepoDM == nil || !repo.RepoDM.IsRepoMetadata {
+ _, err := db.GetEngine(ctx).
+ Where(builder.Eq{"repo_id": repo.ID}).
+ Cols("is_repo_metadata").
+ Update(&repo_model.Door43Metadata{IsRepoMetadata: false})
+ if err != nil {
+ log.Error("handleRepoDM: failed to update all Door43Metadatas [%s]: %v", repo.FullName(), err)
+ }
+ }
+
+ if repo.RepoDM != nil && !repo.RepoDM.IsRepoMetadata {
+ repo.RepoDM.IsRepoMetadata = true
+ err := repo_model.UpdateDoor43MetadataCols(ctx, repo.RepoDM, "is_repo_metadata")
+ if err != nil {
+ log.Error("handleRepoDM: failed to update Door43Metadata [%s, %d]: %v", repo.FullName(), repo.RepoDM.ID, err)
+ }
+ }
+
+ return nil
+}
+
+// processDoor43MetadataForRepoLatestDMs determines the latest DMs for a repo
+func processDoor43MetadataForRepoLatestDMs(ctx context.Context, repo *repo_model.Repository) error {
+ // Handle Stage Latest
+ dm, err := handleLatestStageDM(ctx, repo, door43metadata.StageLatest, nil)
+ if err != nil {
+ log.Error("handleLatestStageDM for default branch [%s, %s]: %v", repo.FullName(), repo.DefaultBranch, err)
+ }
+ repo.DefaultBranchDM = dm
+
+ // Handle Stage Prod
+ dm, err = handleLatestStageDM(ctx, repo, door43metadata.StageProd, nil)
+ if err != nil {
+ log.Error("handleLatestStageDM for prod [%s]: %v", repo.FullName(), err)
+ }
+ repo.LatestProdDM = dm
+
+ // Handle Stage Preprod
+ var earliestDate *timeutil.TimeStamp
+ if repo.LatestProdDM != nil {
+ earliestDate = &repo.LatestProdDM.ReleaseDateUnix
+ }
+ dm, err = handleLatestStageDM(ctx, repo, door43metadata.StagePreProd, earliestDate)
+ if err != nil {
+ log.Error("handleLatestStageDM for preprod [%s]: %v", repo.FullName(), err)
+ }
+ repo.LatestPreprodDM = dm
+
+ err = handleRepoDM(ctx, repo)
+ if err != nil {
+ log.Error("handleRepoDM [%s]: %v", repo.FullName(), err)
+ }
+
+ return nil
+}
+
+// ProcessDoor43MetadataForRepo handles the metadata for a given repo for all its releases
+func ProcessDoor43MetadataForRepo(ctx context.Context, repo *repo_model.Repository, ref string) error {
+ if ctx == nil || repo == nil {
+ return fmt.Errorf("no repository provided")
+ }
+
+ if repo.IsArchived || repo.IsPrivate {
+ _, err := repo_model.DeleteAllDoor43MetadatasByRepoID(ctx, repo.ID)
+ if err != nil {
+ log.Error("DeleteAllDoor43MetadatasByRepoID: %v", err)
+ }
+ return err // No need to process any thing else below
+ }
+
+ if ref == "" {
+ log.Debug(">>>>>> PROCESSING REFS: %s", repo.FullName())
+ if err := processDoor43MetadataForRepoRefs(ctx, repo); err != nil {
+ // log error but keep on going
+ log.Error("processDoor43MetadataForRepoRefs %s Error: %v", repo.FullName(), err)
+ }
+ } else {
+ if err := processDoor43MetadataForRepoRef(ctx, repo, ref); err != nil {
+ // log error but keep on going
+ log.Error("processDoor43MetadataForRepoRefs %s Error: %v", repo.FullName(), err)
+ }
+ }
+
+ return processDoor43MetadataForRepoLatestDMs(ctx, repo)
+}
+
+func GetBookAlignmentCount(bookPath string, commit *git.Commit) (int, error) {
+ blob, err := commit.GetBlobByPath(bookPath)
+ if err != nil {
+ if !git.IsErrNotExist(err) {
+ log.Error("GetBlobByPath(%s) Error: %v\n", bookPath, err)
+ }
+ return 0, err
+ }
+ dataRc, err := blob.DataAsync()
+ if err != nil {
+ log.Error("blob.DataAsync() Error: %v\n", err)
+ return 0, err
+ }
+ defer dataRc.Close()
+
+ buf := make([]byte, 1024)
+ n, _ := util.ReadAtMost(dataRc, buf)
+ buf = buf[:n]
+
+ rd := charset.ToUTF8WithFallbackReader(io.MultiReader(bytes.NewReader(buf), dataRc))
+ buf, err = io.ReadAll(rd)
+ if err != nil {
+ log.Error("io.ReadAll Error: %v", err)
+ return 0, err
+ }
+ matches := regexp.MustCompile(`\\zaln-s`).FindAllStringIndex(string(buf), -1)
+ return len(matches), nil
+}
+
+// GetBooks get the books of the manifest
+func GetBooks(manifest *map[string]interface{}) []string {
+ var books []string
+ if len((*manifest)["projects"].([]interface{})) > 0 {
+ for _, prod := range (*manifest)["projects"].([]interface{}) {
+ books = append(books, prod.(map[string]interface{})["identifier"].(string))
+ }
+ }
+ return books
+}
+
+func GetDoor43MetadataFromRCManifest(dm *repo_model.Door43Metadata, manifest *map[string]interface{}, repo *repo_model.Repository, commit *git.Commit) error {
+ var metadataType string
+ var metadataVersion string
+ var subject string
+ var resource string
+ var title string
+ var language string
+ var languageTitle string
+ var languageDirection string
+ var languageIsGL bool
+ var format string
+ var contentFormat string
+ var checkingLevel int
+ var ingredients []*structs.Ingredient
+
+ re := regexp.MustCompile("^([^0-9]+)(.*)$")
+ matches := re.FindStringSubmatch((*manifest)["dublin_core"].(map[string]interface{})["conformsto"].(string))
+ if len(matches) == 3 {
+ metadataType = matches[1]
+ metadataVersion = matches[2]
+ } else {
+ // should never get here since schema validated
+ metadataType = "rc"
+ metadataVersion = "0.2"
+ }
+ subject = (*manifest)["dublin_core"].(map[string]interface{})["subject"].(string)
+ resource = (*manifest)["dublin_core"].(map[string]interface{})["identifier"].(string)
+ title = (*manifest)["dublin_core"].(map[string]interface{})["title"].(string)
+ language = (*manifest)["dublin_core"].(map[string]interface{})["language"].(map[string]interface{})["identifier"].(string)
+ languageTitle = (*manifest)["dublin_core"].(map[string]interface{})["language"].(map[string]interface{})["title"].(string)
+ format = (*manifest)["dublin_core"].(map[string]interface{})["format"].(string)
+ languageDirection = dcs.GetLanguageDirection(language)
+ languageIsGL = dcs.LanguageIsGL(language)
+ var bookPath string
+ for _, prod := range (*manifest)["projects"].([]interface{}) {
+ if prodMap, ok := prod.(map[string]interface{}); ok {
+ ingredient := convert.ToIngredient(prodMap)
+ book := ingredient.Identifier
+ ingredient.Sort = dcs.GetBookSort(book)
+ ingredient.Categories = dcs.GetBookCategories(book)
+ bookPath = ingredient.Path
+ if subject == "Aligned Bible" && strings.HasSuffix(ingredient.Path, ".usfm") {
+ count, _ := GetBookAlignmentCount(ingredient.Path, commit)
+ ingredient.AlignmentCount = &count
+ }
+ ingredients = append(ingredients, ingredient)
+ }
+ }
+ if subject == "Bible" || subject == "Aligned Bible" || subject == "Greek New Testament" || subject == "Hebrew Old Testament" {
+ contentFormat = "usfm"
+ } else if strings.HasPrefix(subject, "TSV ") {
+ if strings.HasPrefix(fmt.Sprintf("./%s_", resource), bookPath) {
+ contentFormat = "tsv7"
+ } else {
+ contentFormat = "tsv9"
+ }
+ } else if strings.Contains(format, "/") {
+ contentFormat = strings.Split(format, "/")[1]
+ } else if repo.PrimaryLanguage != nil {
+ contentFormat = strings.ToLower(repo.PrimaryLanguage.Language)
+ } else {
+ contentFormat = "markdown"
+ }
+ var ok bool
+ checkingLevel, ok = (*manifest)["checking"].(map[string]interface{})["checking_level"].(int)
+ if !ok {
+ cL, ok := (*manifest)["checking"].(map[string]interface{})["checking_level"].(string)
+ if !ok {
+ checkingLevel = 1
+ } else {
+ var err error
+ checkingLevel, err = strconv.Atoi(cL)
+ if err != nil {
+ checkingLevel = 1
+ }
+ }
+ }
+
+ dm.RepoID = repo.ID
+ dm.MetadataType = metadataType
+ dm.MetadataVersion = metadataVersion
+ dm.Subject = subject
+ dm.Title = title
+ dm.Resource = resource
+ dm.Language = language
+ dm.LanguageTitle = languageTitle
+ dm.LanguageDirection = languageDirection
+ dm.LanguageIsGL = languageIsGL
+ dm.ContentFormat = contentFormat
+ dm.CheckingLevel = checkingLevel
+ dm.Ingredients = ingredients
+ dm.Metadata = manifest
+
+ return nil
+}
+
+// GetDoor43MetadataFromSBMetadata creates a Door43Metadata object from the SBMetadata100 object
+func GetDoor43MetadataFromSBMetadata(dm *repo_model.Door43Metadata, sbMetadata *dcs.SBMetadata100, repo *repo_model.Repository, commit *git.Commit) error {
+ var metadataType string
+ var metadataVersion string
+ subject := "unknown"
+ var resource string
+ var title string
+ var language string
+ var languageTitle string
+ var languageDirection string
+ var languageIsGL bool
+ var contentFormat string
+ checkingLevel := 1
+ var ingredients []*structs.Ingredient
+
+ metadataType = "sb"
+ metadataVersion = sbMetadata.Meta.Version
+ title = sbMetadata.Identification.Name.En
+
+ switch sbMetadata.Type.FlavorType.Name {
+ case "scripture":
+ subject = "Bible"
+ resource = strings.ToLower(sbMetadata.Identification.Abbreviation.En)
+ contentFormat = "usfm"
+ if sbMetadata.LocalizedNames != nil {
+ for book, ln := range *sbMetadata.LocalizedNames {
+ bookPath := "./ingredients/" + book + ".usfm"
+ count, _ := GetBookAlignmentCount(bookPath, commit)
+ ingredients = append(ingredients, &structs.Ingredient{
+ Categories: dcs.GetBookCategories(book),
+ Identifier: book,
+ Title: ln.Short.En,
+ Path: bookPath,
+ Sort: dcs.GetBookSort(book),
+ AlignmentCount: &count,
+ })
+ }
+ }
+ case "gloss":
+ switch sbMetadata.Type.FlavorType.Flavor.Name {
+ case "textStories":
+ subject = "Open Bible Stories"
+ resource = "obs"
+ contentFormat = "markdown"
+ ingredients = append(ingredients, &structs.Ingredient{
+ Identifier: "obs",
+ Title: title,
+ Path: "./ingredients",
+ })
+ }
+ }
+
+ if len(sbMetadata.Languages) > 0 {
+ language = sbMetadata.Languages[0].Tag
+ languageTitle = dcs.GetLanguageTitle(language)
+ if languageTitle == "" {
+ languageTitle = sbMetadata.Languages[0].Name.En
+ }
+ languageDirection = dcs.GetLanguageDirection(language)
+ languageIsGL = dcs.LanguageIsGL(language)
+ }
+
+ dm.RepoID = repo.ID
+ dm.MetadataType = metadataType
+ dm.MetadataVersion = metadataVersion
+ dm.Subject = subject
+ dm.Title = title
+ dm.Resource = resource
+ dm.Language = language
+ dm.LanguageTitle = languageTitle
+ dm.LanguageDirection = languageDirection
+ dm.LanguageIsGL = languageIsGL
+ dm.ContentFormat = contentFormat
+ dm.CheckingLevel = checkingLevel
+ dm.Ingredients = ingredients
+ dm.Metadata = sbMetadata.Metadata
+
+ return nil
+}
+
+func GetRCDoor43Metadata(dm *repo_model.Door43Metadata, repo *repo_model.Repository, commit *git.Commit) error {
+ var manifest *map[string]interface{}
+
+ blob, err := commit.GetBlobByPath("manifest.yaml")
+ if err != nil {
+ return err
+ }
+ if blob == nil {
+ return nil
+ }
+ manifest, err = dcs.ReadYAMLFromBlob(blob)
+ if err != nil {
+ return err
+ }
+ validationResult, err := dcs.ValidateMapByRC02Schema(manifest)
+ if err != nil {
+ return err
+ }
+ if validationResult != nil {
+ log.Info("%s: manifest.yaml is not valid. see errors:", repo.FullName())
+ log.Info(dcs.ConvertValidationErrorToString(validationResult))
+ return validationResult
+ }
+ log.Info("%s: manifest.yaml is valid.", repo.FullName())
+ return GetDoor43MetadataFromRCManifest(dm, manifest, repo, commit)
+}
+
+func GetTcOrTsDoor43Metadata(dm *repo_model.Door43Metadata, repo *repo_model.Repository, commit *git.Commit) error {
+ blob, err := commit.GetBlobByPath("manifest.json")
+ if err != nil || blob == nil {
+ return err
+ }
+
+ log.Info("%s/%s: manifest.json exists so might be a tC or tS repo", repo.FullName(), commit.ID)
+ var bookPath string
+ var contentFormat string
+ var count int
+ var versification string
+
+ t, err := dcs.GetTcTsManifestFromBlob(blob)
+ if err != nil || t == nil {
+ return err
+ }
+ if t.MetadataType == "ts" {
+ bookPath = "."
+ contentFormat = "text"
+ if t.Project.ID != "obs" {
+ versification = "ufw"
+ }
+ } else {
+ bookPath = "./" + repo.Name + ".usfm"
+ count, _ = GetBookAlignmentCount(bookPath, commit)
+ contentFormat = "usfm"
+ versification = "ufw"
+ }
+
+ if !dcs.IsValidBook(t.Project.ID) {
+ return fmt.Errorf("%s does not have a valid book in its manifest.json", repo.FullName())
+ }
+
+ // Get the manifest again in map[string]interface{} format for the DM object
+ manifest, err := dcs.ReadJSONFromBlob(blob)
+ if err != nil {
+ return err
+ }
+
+ dm.RepoID = repo.ID
+ dm.Repo = repo
+ dm.MetadataType = t.MetadataType
+ dm.MetadataVersion = t.MetadataVersion
+ dm.Subject = t.Subject
+ dm.Title = t.Title
+ dm.Resource = strings.ToLower(t.Resource.ID)
+ dm.Language = t.TargetLanguage.ID
+ dm.LanguageTitle = t.TargetLanguage.Name
+ dm.LanguageDirection = t.TargetLanguage.Direction
+ dm.LanguageIsGL = dcs.LanguageIsGL(t.TargetLanguage.ID)
+ dm.ContentFormat = contentFormat
+ dm.CheckingLevel = 1
+ dm.Ingredients = []*structs.Ingredient{{
+ Categories: dcs.GetBookCategories(t.Project.ID),
+ Identifier: t.Project.ID,
+ Title: t.Project.Name,
+ Path: bookPath,
+ Sort: dcs.GetBookSort(t.Project.ID),
+ Versification: versification,
+ AlignmentCount: &count,
+ }}
+ dm.Metadata = manifest
+
+ return nil
+}
+
+func GetSBDoor43Metadata(dm *repo_model.Door43Metadata, repo *repo_model.Repository, commit *git.Commit) error {
+ var metadata *map[string]interface{}
+
+ blob, err := commit.GetBlobByPath("metadata.json")
+ if err != nil {
+ return err
+ }
+ if blob == nil {
+ return nil
+ }
+ sbMetadata, err := dcs.GetSBDataFromBlob(blob)
+ if err != nil {
+ return err
+ }
+ metadata, err = dcs.ReadJSONFromBlob(blob)
+ if err != nil {
+ return err
+ }
+ validationResult, err := dcs.ValidateMapBySB100Schema(metadata)
+ if err != nil {
+ return err
+ }
+ if validationResult != nil {
+ log.Info("%s: metadata.json's 'data' is not valid. see errors:", repo.FullName())
+ log.Info(dcs.ConvertValidationErrorToString(validationResult))
+ return validationResult
+ }
+ log.Info("%s: metadata.json's 'data' is valid.", repo.FullName())
+
+ return GetDoor43MetadataFromSBMetadata(dm, sbMetadata, repo, commit)
+}
+
+func processDoor43MetadataForRepoRef(ctx context.Context, repo *repo_model.Repository, ref string) (err error) {
+ if repo == nil {
+ return fmt.Errorf("no repository provided")
+ }
+ if ref == "" {
+ return fmt.Errorf("no ref profided")
+ }
+
+ err = repo.LoadLatestDMs(ctx)
+ if err != nil {
+ return err
+ }
+
+ var dm *repo_model.Door43Metadata
+ dm, err = repo_model.GetDoor43MetadataByRepoIDAndRef(ctx, repo.ID, ref)
+ if err != nil && !repo_model.IsErrDoor43MetadataNotExist(err) {
+ return err
+ }
+ if dm == nil {
+ dm = &repo_model.Door43Metadata{
+ RepoID: repo.ID,
+ Ref: ref,
+ }
+ }
+ dm.Repo = repo
+
+ gitRepo, err := git.OpenRepository(ctx, repo.RepoPath())
+ if err != nil {
+ log.Error("OpenRepository Error: %v\n", err)
+ return err
+ }
+ defer gitRepo.Close()
+
+ var commit *git.Commit
+ var commitID string
+ var stage door43metadata.Stage
+ var releaseDateUnix timeutil.TimeStamp
+ var releaseID int64
+
+ release, err := repo_model.GetRelease(ctx, repo.ID, ref)
+ if err != nil && !repo_model.IsErrReleaseNotExist(err) {
+ return err
+ }
+ if release != nil {
+ // We don't support releases that are just tags or are drafts
+ if release.IsTag || release.IsDraft {
+ return fmt.Errorf("ref for repo %s [%d] must be a branch or a (pre-)release: %s", repo.FullName(), repo.ID, ref)
+ }
+ if !release.IsCatalogVersion() {
+ return fmt.Errorf("release tag for repo %s [%d] must start with v and a digit or be a year: %s", repo.FullName(), repo.ID, release.TagName)
+ }
+ dm.RefType = "tag"
+ dm.Release = release
+ if release.IsPrerelease {
+ stage = door43metadata.StagePreProd
+ } else {
+ stage = door43metadata.StageProd
+ }
+ commit, err = gitRepo.GetTagCommit(ref)
+ if err != nil {
+ log.Error("GetTagCommit [%s/%s]: %v\n", repo.FullName(), ref, err)
+ return err
+ }
+ commitID = commit.ID.String()
+ releaseDateUnix = release.CreatedUnix
+ releaseID = release.ID
+ } else {
+ if branch, err := gitRepo.GetBranch(ref); err != nil && !git.IsErrBranchNotExist(err) {
+ return err
+ } else if branch == nil {
+ return fmt.Errorf("ref for repo %s [%d] does not exist: %s", repo.FullName(), repo.ID, ref)
+ }
+ if ref == repo.DefaultBranch {
+ stage = door43metadata.StageLatest
+ } else {
+ stage = door43metadata.StageBranch
+ }
+ dm.IsLatestForStage = true
+ dm.RefType = "branch"
+ commit, err = gitRepo.GetBranchCommit(ref)
+ if err != nil {
+ log.Error("GetBranchCommit: %v\n", err)
+ return err
+ }
+ commitID = commit.ID.String()
+ releaseDateUnix = timeutil.TimeStamp(commit.Author.When.Unix())
+ }
+
+ // Check for SB (Scripture Burrito)
+ err = GetSBDoor43Metadata(dm, repo, commit)
+ if err != nil {
+ if !git.IsErrNotExist(err) {
+ log.Info("processDoor43MetadataForRef: ERROR! Unable to populate SB for %s/%s from TS or TC metadata.json: %v\n", repo.FullName(), ref, err)
+ return err
+ }
+ }
+
+ // Check for TC or TS
+ if err != nil {
+ err = GetTcOrTsDoor43Metadata(dm, repo, commit)
+ if err != nil {
+ if !git.IsErrNotExist(err) {
+ log.Info("processDoor43MetadataForRef: ERROR! Unable to populate DM for %s/%s from TS or TC manifest.json: %v\n", repo.FullName(), ref, err)
+ return err
+ }
+ }
+ }
+
+ // Check for RC
+ if err != nil {
+ err = GetRCDoor43Metadata(dm, repo, commit)
+ if err != nil {
+ if !git.IsErrNotExist(err) {
+ log.Info("processDoor43MetadataForRef: ERROR! Unable to populate DM for %s/%s from RC manifest.yaml: %v\n", repo.FullName(), ref, err)
+ return err
+ }
+ log.Info("processDoor43MetadataForRef: %s/%s is not a SB, TC, TS nor RC repo. Not adding to door43_metadata\n", repo.FullName(), ref)
+ return nil // nothing to process, not a SB, TC, TS nor RC repo
+ }
+ }
+
+ dm.CommitSHA = commitID
+ dm.ReleaseID = releaseID
+ dm.Release = release
+ dm.ReleaseDateUnix = releaseDateUnix
+ dm.Stage = stage
+
+ if dm.ID > 0 {
+ err = repo_model.UpdateDoor43Metadata(ctx, dm)
+ if err != nil {
+ return err
+ }
+ } else {
+ err = repo_model.InsertDoor43Metadata(ctx, dm)
+ if err != nil {
+ return err
+ }
+ }
+
+ return nil
+}
+
+// UpdateDoor43Metadata generates door43_metadata table entries for valid repos/releases that don't have them
+func UpdateDoor43Metadata(ctx context.Context) error {
+ log.Trace("Doing: UpdateDoor43Metadata")
+
+ repos, err := repo_model.GetReposForMetadata(ctx)
+ if err != nil {
+ log.Error("GetReposForMetadata: %v", err)
+ }
+
+ for _, repo := range repos {
+ if err := ProcessDoor43MetadataForRepo(ctx, repo, ""); err != nil {
+ log.Info("Failed to process metadata for repo (%v): %v", repo, err)
+ if err = system.CreateRepositoryNotice("Failed to process metadata for repository (%s): %v", repo.FullName(), err); err != nil {
+ log.Error("ProcessDoor43MetadataForRepo: %v", err)
+ }
+ }
+ }
+ log.Trace("Finished: UpdateDoor43Metadata")
+ return nil
+}
+
+func DeleteDoor43MetadataByRepoRef(ctx context.Context, repo *repo_model.Repository, ref string) error {
+ err := repo_model.DeleteDoor43MetadataByRepoRef(ctx, repo, ref)
+ if err != nil {
+ return err
+ }
+
+ return processDoor43MetadataForRepoLatestDMs(ctx, repo)
+}
+
+func UnpackJSONAttachments(ctx context.Context, release *repo_model.Release) {
+ if release == nil || len(release.Attachments) == 0 {
+ return
+ }
+ jsonFileNameSuffix := regexp.MustCompile(`(file|link)s*\.json$`)
+ for _, attachment := range release.Attachments {
+ if jsonFileNameSuffix.MatchString(attachment.Name) {
+ remoteAttachments, err := GetAttachmentsFromJSON(attachment)
+ if err != nil {
+ log.Error("GetAttachmentsFromJSON Error: %v", err)
+ continue
+ }
+ for _, remoteAttachment := range remoteAttachments {
+ remoteAttachment.ReleaseID = attachment.ReleaseID
+ remoteAttachment.RepoID = attachment.RepoID
+ remoteAttachment.UploaderID = attachment.UploaderID
+ foundExisting := false
+ for _, a := range release.Attachments {
+ if a.Name == remoteAttachment.Name {
+ if remoteAttachment.Size > 0 {
+ a.Size = remoteAttachment.Size
+ }
+ if remoteAttachment.BrowserDownloadURL != "" {
+ a.BrowserDownloadURL = remoteAttachment.BrowserDownloadURL
+ }
+ a.BrowserDownloadURL = remoteAttachment.BrowserDownloadURL
+ if err := repo_model.UpdateAttachment(ctx, a); err != nil {
+ log.Error("UpdateAttachment [%d]: %v", a.ID, err)
+ continue
+ }
+ foundExisting = true
+ break
+ }
+ }
+ if foundExisting {
+ continue
+ }
+ // No existing attachment was found with the same name, so we insert a new one
+ remoteAttachment.UUID = uuid.New().String()
+ if _, err = db.GetEngine(db.DefaultContext).Insert(remoteAttachment); err != nil {
+ log.Error("insert attachment [%d]: %v", remoteAttachment.ID, err)
+ continue
+ }
+ }
+ if err := repo_model.DeleteAttachment(ctx, attachment, true); err != nil {
+ log.Error("delete attachment [%d]: %v", attachment.ID, err)
+ continue
+ }
+ continue
+ }
+ }
+}
+
+// GetAttachmentsFromJSON gets the attachments from uploaded
+func GetAttachmentsFromJSON(attachment *repo_model.Attachment) ([]*repo_model.Attachment, error) {
+ var url string
+ if setting.Attachment.Storage.MinioConfig.ServeDirect {
+ // If we have a signed url (S3, object storage), redirect to this directly.
+ urlObj, err := storage.Attachments.URL(attachment.RelativePath(), attachment.Name)
+
+ if urlObj != nil && err == nil {
+ url = urlObj.String()
+ }
+ } else {
+ url = attachment.DownloadURL()
+ }
+ client := http.Client{
+ Timeout: time.Second * 2, // Timeout after 2 seconds
+ }
+ req, err := http.NewRequest(http.MethodGet, url, nil)
+ if err != nil {
+ return nil, fmt.Errorf("http.NewRequest Error: %v", err)
+ }
+ req.Header.Set("User-Agent", "dcs")
+ res, err := client.Do(req)
+ if err != nil {
+ return nil, fmt.Errorf("client.Do Error: %v", err)
+ }
+ if res.StatusCode != 200 {
+ return nil, fmt.Errorf("client.Do Error: `%s` returned StatusCode [%d]", attachment.DownloadURL(), res.StatusCode)
+ }
+ if res.Body != nil {
+ defer res.Body.Close()
+ }
+
+ body, err := io.ReadAll(res.Body)
+ if err != nil {
+ return nil, fmt.Errorf("io.ReadAll Error: %v", err)
+ }
+ attachments := []*repo_model.Attachment{}
+ if err1 := json.Unmarshal(body, &attachments); err1 != nil {
+ // We couldn't unmarshal an array of attachments, so lets see if it is just a single attachment
+ attachment := &repo_model.Attachment{}
+ if err2 := json.Unmarshal(body, attachment); err2 != nil {
+ return nil, fmt.Errorf("json.Unmarshal Error: %v", err1)
+ }
+ attachments = append(attachments, attachment)
+ }
+ return attachments, nil
+}
+
+// LoadMetadataSchemas loads the Metadata Schemas from the web and local file if not available online
+func LoadMetadataSchemas(ctx context.Context) error {
+ log.Trace("Doing: LoadMetadataSchemas")
+ if _, err := dcs.GetSB100Schema(true); err != nil {
+ log.Error("Error loading SB 100 Schema: %v", err)
+ }
+ if _, err := dcs.GetRC02Schema(true); err != nil {
+ log.Error("Error loading RC 0.2 Schema: %v", err)
+ }
+ log.Trace("Finished: LoadMetadataSchemas")
+ return nil
+}
diff --git a/services/door43metadata/door43metadata_notifier.go b/services/door43metadata/door43metadata_notifier.go
new file mode 100644
index 0000000000..982fda991b
--- /dev/null
+++ b/services/door43metadata/door43metadata_notifier.go
@@ -0,0 +1,144 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package door43metadata
+
+import (
+ "context"
+
+ repo_model "code.gitea.io/gitea/models/repo"
+ user_model "code.gitea.io/gitea/models/user"
+ "code.gitea.io/gitea/modules/git"
+ "code.gitea.io/gitea/modules/log"
+ "code.gitea.io/gitea/modules/repository"
+ notify_service "code.gitea.io/gitea/services/notify"
+)
+
+type metadataNotifier struct {
+ notify_service.NullNotifier
+}
+
+var _ notify_service.Notifier = &metadataNotifier{}
+
+func Init() error {
+ notify_service.RegisterNotifier(NewNotifier())
+
+ return nil
+}
+
+// NewNotifier create a new metadataNotifier notifier
+func NewNotifier() notify_service.Notifier {
+ return &metadataNotifier{}
+}
+
+func (m *metadataNotifier) CreateRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository) {
+ if err := ProcessDoor43MetadataForRepo(ctx, repo, ""); err != nil {
+ log.Error("CreateRepository: ProcessDoor43MetadataForRepo failed [%s]: %v", repo.FullName(), err)
+ }
+}
+
+func (m *metadataNotifier) SyncCreateRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository) {
+ if err := ProcessDoor43MetadataForRepo(ctx, repo, ""); err != nil {
+ log.Error("SyncCreateRepository: ProcessDoor43MetadataForRepo failed [%s]: %v", repo.FullName(), err)
+ }
+}
+
+func (m *metadataNotifier) NewRelease(ctx context.Context, rel *repo_model.Release) {
+ if rel != nil && !rel.IsTag {
+ if err := ProcessDoor43MetadataForRepo(ctx, rel.Repo, rel.TagName); err != nil {
+ log.Error("NewRelease: ProcessDoor43MetadataForRepo failed [%s, %s]: %v", rel.Repo.FullName(), rel.TagName, err)
+ }
+
+ // A separate job that handles files.json or links.json files (can be singular file.json and link.json too) as attachments
+ UnpackJSONAttachments(ctx, rel)
+ }
+}
+
+func (m *metadataNotifier) UpdateRelease(ctx context.Context, doer *user_model.User, rel *repo_model.Release) {
+ if rel != nil && !rel.IsTag {
+ if err := ProcessDoor43MetadataForRepo(ctx, rel.Repo, rel.TagName); err != nil {
+ log.Error("UpdateRelease: ProcessDoor43MetadataForRepo failed [%s, %s]: %v", rel.Repo.FullName(), rel.TagName, err)
+ }
+
+ // A separate job that handles files.json or links.json files (can be singular file.json and link.json too) as attachments
+ UnpackJSONAttachments(ctx, rel)
+ }
+}
+
+func (m *metadataNotifier) DeleteRelease(ctx context.Context, doer *user_model.User, rel *repo_model.Release) {
+ if err := DeleteDoor43MetadataByRepoRef(ctx, rel.Repo, rel.TagName); err != nil {
+ log.Error("DeleteRelease: DeleteDoor43MetadataByRepoRef failed [%s, %s]: %v", rel.Repo.FullName(), rel.TagName, err)
+ }
+}
+
+func (m *metadataNotifier) PushCommits(ctx context.Context, pusher *user_model.User, repo *repo_model.Repository, opts *repository.PushUpdateOptions, commits *repository.PushCommits) {
+ if opts.RefFullName.IsBranch() {
+ ref := opts.RefFullName.BranchName()
+ if err := ProcessDoor43MetadataForRepo(ctx, repo, ref); err != nil {
+ log.Error("PushCommits: ProcessDoor43MetadataForRepo failed [%s, %s]: %v", repo.FullName(), ref, err)
+ }
+ }
+}
+
+func (m *metadataNotifier) SyncPushCommits(ctx context.Context, pusher *user_model.User, repo *repo_model.Repository, opts *repository.PushUpdateOptions, commits *repository.PushCommits) {
+ if opts.RefFullName.IsBranch() {
+ ref := opts.RefFullName.BranchName()
+ if err := ProcessDoor43MetadataForRepo(ctx, repo, ref); err != nil {
+ log.Error("SyncPushCommits: ProcessDoor43MetadataForRepo failed [%s, %s]: %v", repo.FullName(), ref, err)
+ }
+ }
+}
+
+func (m *metadataNotifier) DeleteRepository(ctx context.Context, doer *user_model.User, repo *repo_model.Repository) {
+ if _, err := repo_model.DeleteAllDoor43MetadatasByRepoID(ctx, repo.ID); err != nil {
+ log.Error("DeleteRepository: DeleteAllDoor43MetadatasByRepoID failed [%s]: %v", repo.FullName(), err)
+ }
+}
+
+func (m *metadataNotifier) SyncDeleteRepository(ctx context.Context, doer *user_model.User, repo *repo_model.Repository) {
+ if _, err := repo_model.DeleteAllDoor43MetadatasByRepoID(ctx, repo.ID); err != nil {
+ log.Error("SyncDeleteRepository: DeleteAllDoor43MetadatasByRepoID failed [%s]: %v", repo.FullName(), err)
+ }
+}
+
+func (m *metadataNotifier) MigrateRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository) {
+ if err := ProcessDoor43MetadataForRepo(ctx, repo, ""); err != nil {
+ log.Error("MigrateRepository: ProcessDoor43MetadataForRepo failed [%s]: %v", repo.FullName(), err)
+ }
+}
+
+func (m *metadataNotifier) TransferRepository(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, newOwnerName string) {
+ // Shouldn't really need if the repo is transfered as it keeps the same IDs, releases, etc, but just in case
+ if err := ProcessDoor43MetadataForRepo(ctx, repo, ""); err != nil {
+ log.Error("TransferRepository: ProcessDoor43MetadataForRepo failed [%s]: %v", repo.FullName(), err)
+ }
+}
+
+func (m *metadataNotifier) ForkRepository(ctx context.Context, doer *user_model.User, oldRepo, repo *repo_model.Repository) {
+ if err := ProcessDoor43MetadataForRepo(ctx, repo, ""); err != nil {
+ log.Error("ForkRepository: ProcessDoor43MetadataForRepo failed [%s]: %v", repo.FullName(), err)
+ }
+}
+
+func (m *metadataNotifier) RenameRepository(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, oldName string) {
+ // Shouldn't really need if the repo is renamed as it keeps the same IDs, releases, etc, but just in case
+ if err := ProcessDoor43MetadataForRepo(ctx, repo, ""); err != nil {
+ log.Error("RenameRepository: ProcessDoor43MetadataForRepo failed [%s]: %v", repo.FullName(), err)
+ }
+}
+
+func (m *metadataNotifier) DeleteRef(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, refFullName git.RefName) {
+ if refFullName.IsBranch() {
+ ref := refFullName.ShortName()
+ if err := DeleteDoor43MetadataByRepoRef(ctx, repo, ref); err != nil {
+ log.Error("DeleteRef: DeleteDoor43MetadataByRepoRef failed [%s, %s]: %v", repo.FullName(), ref, err)
+ }
+ }
+}
+
+func (m *metadataNotifier) ChangeDefaultBranch(ctx context.Context, repo *repo_model.Repository) {
+ if err := ProcessDoor43MetadataForRepo(ctx, repo, repo.DefaultBranch); err != nil {
+ log.Error("ChangeDefaultBranch: ProcessDoor43MetadataForRef failed [%s, %s]: %v", repo.FullName(), repo.DefaultBranch)
+ return
+ }
+}
diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go
index 5df7ec8fd6..ac4003a404 100644
--- a/services/forms/repo_form.go
+++ b/services/forms/repo_form.go
@@ -903,3 +903,28 @@ func (f *DeadlineForm) Validate(req *http.Request, errs binding.Errors) binding.
ctx := context.GetValidateContext(req)
return middleware.Validate(errs, ctx.Data, f, ctx.Locale)
}
+
+// DOOR43 CUSTOMIZATIONS
+
+// NewDoor43MetadataForm form for creating release
+type NewDoor43MetadataForm struct {
+ TagName string `form:"tag_name" binding:"MaxSize(255)"`
+ Metadata string `form:"metadata"`
+}
+
+// Validate validates the fields
+func (f *NewDoor43MetadataForm) Validate(req *http.Request, errs binding.Errors) binding.Errors {
+ ctx := context.GetWebContext(req)
+ return middleware.Validate(errs, ctx.Data, f, ctx.Locale)
+}
+
+// EditDoor43MetadataForm form for changing release
+type EditDoor43MetadataForm struct {
+ Metadata []byte `form:"metadata"`
+}
+
+// Validate validates the fields
+func (f *EditDoor43MetadataForm) Validate(req *http.Request, errs binding.Errors) binding.Errors {
+ ctx := context.GetWebContext(req)
+ return middleware.Validate(errs, ctx.Data, f, ctx.Locale)
+}
diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go
index 8bf6cba844..a0dc6a5ae9 100644
--- a/services/gitdiff/gitdiff.go
+++ b/services/gitdiff/gitdiff.go
@@ -370,6 +370,7 @@ type DiffFile struct {
IsViewed bool // User specific
HasChangedSinceLastReview bool // User specific
Language string
+ Entry *git.TreeEntry // DCS Customizations
Mode string
OldMode string
}
diff --git a/services/gitref/gitref.go b/services/gitref/gitref.go
new file mode 100644
index 0000000000..bdab06dba1
--- /dev/null
+++ b/services/gitref/gitref.go
@@ -0,0 +1,124 @@
+// Copyright 2019 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package gitref
+
+import (
+ "context"
+ "fmt"
+ "strings"
+
+ git_model "code.gitea.io/gitea/models/git"
+ gitea_context "code.gitea.io/gitea/modules/context"
+ "code.gitea.io/gitea/modules/git"
+)
+
+// GetReference gets the Reference object that a refName refers to
+func GetReference(gitRepo *git.Repository, refName string) (*git.Reference, error) {
+ refs, err := gitRepo.GetRefsFiltered(refName)
+ if err != nil {
+ return nil, err
+ }
+ var ref *git.Reference
+ for _, ref = range refs {
+ if ref.Name == refName {
+ return ref, nil
+ }
+ }
+ return nil, git.ErrRefNotFound{RefName: refName}
+}
+
+// UpdateReferenceWithChecks creates or updates a reference, checking for format, permissions and special cases
+func UpdateReferenceWithChecks(ctx *gitea_context.APIContext, refName, commitID string) (*git.Reference, error) {
+ err := CheckReferenceEditability(ctx, refName, commitID, ctx.Repo.Repository.ID, ctx.Doer.ID)
+ if err != nil {
+ return nil, err
+ }
+
+ if err := ctx.Repo.GitRepo.SetReference(refName, commitID); err != nil {
+ message := err.Error()
+ prefix := fmt.Sprintf("exit status 128 - fatal: update_ref failed for ref '%s': ", refName)
+ if strings.HasPrefix(message, prefix) {
+ return nil, fmt.Errorf(strings.TrimRight(strings.TrimPrefix(message, prefix), "\n"))
+ }
+ return nil, err
+ }
+
+ return ctx.Repo.GitRepo.GetReference(refName)
+}
+
+// RemoveReferenceWithChecks deletes a reference, checking for format, permission and special cases
+func RemoveReferenceWithChecks(ctx *gitea_context.APIContext, refName string) error {
+ err := CheckReferenceEditability(ctx, refName, "", ctx.Repo.Repository.ID, ctx.Doer.ID)
+ if err != nil {
+ return err
+ }
+
+ return ctx.Repo.GitRepo.RemoveReference(refName)
+}
+
+func CheckReferenceEditability(ctx context.Context, refName, commitID string, repoID, userID int64) error {
+ refParts := strings.Split(refName, "/")
+
+ // Must have at least 3 parts, e.g. refs/heads/new-branch
+ if len(refParts) <= 2 {
+ return git.ErrInvalidRefName{
+ RefName: refName,
+ Reason: "reference name must contain at least three slash-separted components",
+ }
+ }
+
+ refPrefix := refParts[0]
+ refType := refParts[2]
+ refRest := strings.Join(refParts[2:], "/")
+
+ // Must start with 'refs/'
+ if refPrefix != "refs" {
+ return git.ErrInvalidRefName{
+ RefName: refName,
+ Reason: "reference must start with 'refs/'",
+ }
+ }
+
+ // 'refs/pull/*' is not allowed
+ if refType == "pull" {
+ return git.ErrInvalidRefName{
+ RefName: refName,
+ Reason: "refs/pull/* is read-only",
+ }
+ }
+
+ if refType == "tags" {
+ // If the 2nd part is "tags" then we need ot make sure the user is allowed to
+ // modify this tag (not protected or is admin)
+ if protectedTags, err := git_model.GetProtectedTags(ctx, repoID); err == nil {
+ isAllowed, err := git_model.IsUserAllowedToControlTag(ctx, protectedTags, refRest, userID)
+ if err != nil {
+ return err
+ }
+ if !isAllowed {
+ return git.ErrProtectedRefName{
+ RefName: refName,
+ Message: "you're not authorized to change a protected tag",
+ }
+ }
+ }
+ }
+
+ if refType == "heads" {
+ // If the 2nd part is "heas" then we need to make sure the user is allowed to
+ // modify this branch (not protected or is admin)
+ isProtected, err := git_model.IsBranchProtected(ctx, repoID, refRest)
+ if err != nil {
+ return err
+ }
+ if !isProtected {
+ return git.ErrProtectedRefName{
+ RefName: refName,
+ Message: "changes must be made through a pull request",
+ }
+ }
+ }
+
+ return nil
+}
diff --git a/services/gitref/gitref_test.go b/services/gitref/gitref_test.go
new file mode 100644
index 0000000000..4ddee012eb
--- /dev/null
+++ b/services/gitref/gitref_test.go
@@ -0,0 +1,39 @@
+// Copyright 2022 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package gitref
+
+import (
+ "path/filepath"
+ "testing"
+
+ repo_model "code.gitea.io/gitea/models/repo"
+ "code.gitea.io/gitea/models/unittest"
+ user_model "code.gitea.io/gitea/models/user"
+ "code.gitea.io/gitea/modules/git"
+
+ "github.com/stretchr/testify/assert"
+)
+
+func TestMain(m *testing.M) {
+ unittest.MainTest(m, &unittest.TestOptions{
+ GiteaRootPath: filepath.Join("..", ".."),
+ })
+}
+
+func TestGitRef_Get(t *testing.T) {
+ assert.NoError(t, unittest.PrepareTestDatabase())
+
+ user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+ repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
+ repoPath := repo_model.RepoPath(user.Name, repo.Name)
+
+ gitRepo, err := git.OpenRepository(git.DefaultContext, repoPath)
+ assert.NoError(t, err)
+ defer gitRepo.Close()
+
+ ref, err := GetReference(gitRepo, "refs/heads/master")
+ assert.NoError(t, err)
+
+ assert.NotNil(t, ref)
+}
diff --git a/services/release/release_test.go b/services/release/release_test.go
index 4b57262981..b4f11b70ca 100644
--- a/services/release/release_test.go
+++ b/services/release/release_test.go
@@ -83,7 +83,7 @@ func TestRelease_Create(t *testing.T) {
PublisherID: user.ID,
Publisher: user,
TagName: "v0.1.3",
- Target: "65f1bf2",
+ Target: repo.DefaultBranch,
Title: "v0.1.3 is released",
Note: "v0.1.3 is released",
IsDraft: true,
@@ -172,7 +172,7 @@ func TestRelease_Update(t *testing.T) {
PublisherID: user.ID,
Publisher: user,
TagName: "v1.2.1",
- Target: "65f1bf2",
+ Target: "master",
Title: "v1.2.1 is draft",
Note: "v1.2.1 is draft",
IsDraft: true,
@@ -315,7 +315,7 @@ func TestRelease_createTag(t *testing.T) {
PublisherID: user.ID,
Publisher: user,
TagName: "v2.2.1",
- Target: "65f1bf2",
+ Target: "master",
Title: "v2.2.1 is draft",
Note: "v2.2.1 is draft",
IsDraft: true,
diff --git a/services/repository/create.go b/services/repository/create.go
index b6b6454c44..525e975097 100644
--- a/services/repository/create.go
+++ b/services/repository/create.go
@@ -124,7 +124,7 @@ func prepareRepoCommit(ctx context.Context, repo *repo_model.Repository, tmpDir,
return fmt.Errorf("getLicense[%s]: %w", opts.License, err)
}
- if err = os.WriteFile(filepath.Join(tmpDir, "LICENSE"), data, 0o644); err != nil {
+ if err = os.WriteFile(filepath.Join(tmpDir, "LICENSE.md"), data, 0o644); err != nil { // DCS Customizations - adds .md
return fmt.Errorf("write LICENSE: %w", err)
}
}
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl
index 65d9c370f3..c80521d87f 100644
--- a/templates/admin/dashboard.tmpl
+++ b/templates/admin/dashboard.tmpl
@@ -63,6 +63,14 @@
{{end}}
-
+
\ No newline at end of file
diff --git a/templates/home.tmpl b/templates/home.tmpl
index 78364431e9..e36aa1fd40 100644
--- a/templates/home.tmpl
+++ b/templates/home.tmpl
@@ -2,49 +2,36 @@
{{svg "octicon-comment-discussion"}} Communication
+
If you have questions, you can post them on the #helpdesk channel in Slack (see below) or email help@door43.org.
+
The Door43 community uses Slack to communicate. When you join Team43 on Slack, you can collaborate with other translators, share your ideas, and find help for your translation, checking, publishing, and technology needs.
-
+ 
+ 
+ 
@@ -33,14 +33,14 @@
+ 
- 
+ 
{{.GetMetadataTypeTitle}} ({{.MetadataType}} {{.MetadataVersion}})