diff options
Diffstat (limited to 'rust')
| -rw-r--r-- | rust/fatcat-api-spec/README.md | 2 | ||||
| -rw-r--r-- | rust/fatcat-api-spec/api.yaml | 3 | ||||
| -rw-r--r-- | rust/fatcat-api-spec/api/swagger.yaml | 9 | ||||
| -rw-r--r-- | rust/fatcat-api-spec/src/models.rs | 5 | ||||
| -rw-r--r-- | rust/src/database_models.rs | 2 | ||||
| -rw-r--r-- | rust/src/database_schema.rs | 1 | ||||
| -rw-r--r-- | rust/src/entity_crud.rs | 2 | 
7 files changed, 1 insertions, 23 deletions
| diff --git a/rust/fatcat-api-spec/README.md b/rust/fatcat-api-spec/README.md index 60ead2e5..0e78b5ef 100644 --- a/rust/fatcat-api-spec/README.md +++ b/rust/fatcat-api-spec/README.md @@ -13,7 +13,7 @@ To see how to make this your own, look here:  [README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)  - API version: 0.2.0 -- Build date: 2019-05-09T06:57:24.103Z +- Build date: 2019-05-10T06:21:30.192Z  This autogenerated project defines an API crate `fatcat` which contains:  * An `Api` trait defining the API in Rust. diff --git a/rust/fatcat-api-spec/api.yaml b/rust/fatcat-api-spec/api.yaml index 6fd73deb..9f4de5a5 100644 --- a/rust/fatcat-api-spec/api.yaml +++ b/rust/fatcat-api-spec/api.yaml @@ -289,9 +289,6 @@ definitions:                <<: *FATCATSHA1              sha256:                <<: *FATCATSHA256 -            extra: -              type: object -              additionalProperties: {}        archive_urls:          type: array          items: diff --git a/rust/fatcat-api-spec/api/swagger.yaml b/rust/fatcat-api-spec/api/swagger.yaml index c73c5c07..8e6514eb 100644 --- a/rust/fatcat-api-spec/api/swagger.yaml +++ b/rust/fatcat-api-spec/api/swagger.yaml @@ -7794,7 +7794,6 @@ definitions:          status_code: 200          size_bytes: 1235          sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" -        extra: "{}"          mimetype: "text/html"          url: "http://www.asheesh.org:80/APUS/ch1/node15.html"          timestamp: "2016-09-19T17:20:24Z" @@ -7803,7 +7802,6 @@ definitions:          status_code: 200          size_bytes: 1235          sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" -        extra: "{}"          mimetype: "text/html"          url: "http://www.asheesh.org:80/APUS/ch1/node15.html"          timestamp: "2016-09-19T17:20:24Z" @@ -7990,7 +7988,6 @@ definitions:            status_code: 200            size_bytes: 1235            sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" -          extra: "{}"            mimetype: "text/html"            url: "http://www.asheesh.org:80/APUS/ch1/node15.html"            timestamp: "2016-09-19T17:20:24Z" @@ -7999,7 +7996,6 @@ definitions:            status_code: 200            size_bytes: 1235            sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" -          extra: "{}"            mimetype: "text/html"            url: "http://www.asheesh.org:80/APUS/ch1/node15.html"            timestamp: "2016-09-19T17:20:24Z" @@ -8025,7 +8021,6 @@ definitions:            status_code: 200            size_bytes: 1235            sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" -          extra: "{}"            mimetype: "text/html"            url: "http://www.asheesh.org:80/APUS/ch1/node15.html"            timestamp: "2016-09-19T17:20:24Z" @@ -8034,7 +8029,6 @@ definitions:            status_code: 200            size_bytes: 1235            sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" -          extra: "{}"            mimetype: "text/html"            url: "http://www.asheesh.org:80/APUS/ch1/node15.html"            timestamp: "2016-09-19T17:20:24Z" @@ -9322,15 +9316,12 @@ definitions:          minLength: 64          maxLength: 64          pattern: "[a-f0-9]{64}" -      extra: -        type: "object"      example:        sha1: "e9dd75237c94b209dc3ccd52722de6931a310ba3"        surt: "org,asheesh)/apus/ch1/node15.html"        status_code: 200        size_bytes: 1235        sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" -      extra: "{}"        mimetype: "text/html"        url: "http://www.asheesh.org:80/APUS/ch1/node15.html"        timestamp: "2016-09-19T17:20:24Z" diff --git a/rust/fatcat-api-spec/src/models.rs b/rust/fatcat-api-spec/src/models.rs index cd418d99..f4ac0e3e 100644 --- a/rust/fatcat-api-spec/src/models.rs +++ b/rust/fatcat-api-spec/src/models.rs @@ -1193,10 +1193,6 @@ pub struct WebcaptureEntityCdx {      #[serde(rename = "sha256")]      #[serde(skip_serializing_if = "Option::is_none")]      pub sha256: Option<String>, - -    #[serde(rename = "extra")] -    #[serde(skip_serializing_if = "Option::is_none")] -    pub extra: Option<serde_json::Value>,  }  impl WebcaptureEntityCdx { @@ -1210,7 +1206,6 @@ impl WebcaptureEntityCdx {              size_bytes: None,              sha1: sha1,              sha256: None, -            extra: None,          }      }  } diff --git a/rust/src/database_models.rs b/rust/src/database_models.rs index e7918ec5..e37a6f18 100644 --- a/rust/src/database_models.rs +++ b/rust/src/database_models.rs @@ -312,7 +312,6 @@ pub struct WebcaptureRevCdxRow {      pub sha1: String,      pub sha256: Option<String>,      pub size_bytes: Option<i64>, -    pub extra_json: Option<serde_json::Value>,  }  #[derive(Debug, Queryable, Associations, AsChangeset, Insertable)] @@ -327,7 +326,6 @@ pub struct WebcaptureRevCdxNewRow {      pub sha1: String,      pub sha256: Option<String>,      pub size_bytes: Option<i64>, -    pub extra_json: Option<serde_json::Value>,  }  #[derive(Debug, Queryable, Identifiable, Associations, AsChangeset)] diff --git a/rust/src/database_schema.rs b/rust/src/database_schema.rs index ce4f5c49..b7dee298 100644 --- a/rust/src/database_schema.rs +++ b/rust/src/database_schema.rs @@ -380,7 +380,6 @@ table! {          sha1 -> Text,          sha256 -> Nullable<Text>,          size_bytes -> Nullable<Int8>, -        extra_json -> Nullable<Jsonb>,      }  } diff --git a/rust/src/entity_crud.rs b/rust/src/entity_crud.rs index 314aa043..4a7cdee0 100644 --- a/rust/src/entity_crud.rs +++ b/rust/src/entity_crud.rs @@ -1444,7 +1444,6 @@ impl EntityCrud for WebcaptureEntity {                  size_bytes: c.size_bytes,                  sha1: c.sha1,                  sha256: c.sha256, -                extra: c.extra_json,              })              .collect(); @@ -1534,7 +1533,6 @@ impl EntityCrud for WebcaptureEntity {                              size_bytes: c.size_bytes,                              sha1: c.sha1.clone(),                              sha256: c.sha256.clone(), -                            extra_json: c.extra.clone(),                          })                          .collect();                      webcapture_cdx_rows.extend(these_cdx_rows); | 
