@@ -13,16 +13,16 @@ use crate::worker::cloudfront::CloudFront;
13
13
use cargo_registry_index:: Repository ;
14
14
15
15
pub enum Job {
16
+ AddCrate ( AddCrateJob ) ,
16
17
DailyDbMaintenance ,
17
18
DumpDb ( DumpDbJob ) ,
18
- AddCrate ( AddCrateJob ) ,
19
+ NormalizeIndex ( NormalizeIndexJob ) ,
20
+ RenderAndUploadReadme ( RenderAndUploadReadmeJob ) ,
19
21
SquashIndex ,
20
- UpdateCrateIndex ( UpdateCrateIndexJob ) ,
21
22
SyncToGitIndex ( SyncToIndexJob ) ,
22
23
SyncToSparseIndex ( SyncToIndexJob ) ,
23
24
SyncYanked ( SyncYankedJob ) ,
24
- NormalizeIndex ( NormalizeIndexJob ) ,
25
- RenderAndUploadReadme ( RenderAndUploadReadmeJob ) ,
25
+ UpdateCrateIndex ( UpdateCrateIndexJob ) ,
26
26
UpdateDownloads ,
27
27
}
28
28
@@ -41,16 +41,16 @@ pub(crate) struct PerformState<'a> {
41
41
}
42
42
43
43
impl Job {
44
+ const ADD_CRATE : & str = "add_crate" ;
44
45
const DAILY_DB_MAINTENANCE : & str = "daily_db_maintenance" ;
45
46
const DUMP_DB : & str = "dump_db" ;
46
- const ADD_CRATE : & str = "add_crate" ;
47
- const SQUASH_INDEX : & str = "squash_index" ;
48
- const UPDATE_CRATE_INDEX : & str = "update_crate_index" ;
49
- const SYNC_YANKED : & str = "sync_yanked" ;
50
47
const NORMALIZE_INDEX : & str = "normalize_index" ;
51
48
const RENDER_AND_UPLOAD_README : & str = "render_and_upload_readme" ;
49
+ const SQUASH_INDEX : & str = "squash_index" ;
52
50
const SYNC_TO_GIT_INDEX : & str = "sync_to_git_index" ;
53
51
const SYNC_TO_SPARSE_INDEX : & str = "sync_to_sparse_index" ;
52
+ const SYNC_YANKED : & str = "sync_yanked" ;
53
+ const UPDATE_CRATE_INDEX : & str = "update_crate_index" ;
54
54
const UPDATE_DOWNLOADS : & str = "update_downloads" ;
55
55
56
56
pub fn enqueue_sync_to_index < T : ToString > (
@@ -143,32 +143,32 @@ impl Job {
143
143
144
144
fn as_type_str ( & self ) -> & ' static str {
145
145
match self {
146
+ Job :: AddCrate ( _) => Self :: ADD_CRATE ,
146
147
Job :: DailyDbMaintenance => Self :: DAILY_DB_MAINTENANCE ,
147
148
Job :: DumpDb ( _) => Self :: DUMP_DB ,
148
- Job :: AddCrate ( _) => Self :: ADD_CRATE ,
149
- Job :: SquashIndex => Self :: SQUASH_INDEX ,
150
- Job :: UpdateCrateIndex ( _) => Self :: UPDATE_CRATE_INDEX ,
151
- Job :: SyncYanked ( _) => Self :: SYNC_YANKED ,
152
149
Job :: NormalizeIndex ( _) => Self :: NORMALIZE_INDEX ,
153
150
Job :: RenderAndUploadReadme ( _) => Self :: RENDER_AND_UPLOAD_README ,
151
+ Job :: SquashIndex => Self :: SQUASH_INDEX ,
154
152
Job :: SyncToGitIndex ( _) => Self :: SYNC_TO_GIT_INDEX ,
155
153
Job :: SyncToSparseIndex ( _) => Self :: SYNC_TO_SPARSE_INDEX ,
154
+ Job :: SyncYanked ( _) => Self :: SYNC_YANKED ,
155
+ Job :: UpdateCrateIndex ( _) => Self :: UPDATE_CRATE_INDEX ,
156
156
Job :: UpdateDownloads => Self :: UPDATE_DOWNLOADS ,
157
157
}
158
158
}
159
159
160
160
fn to_value ( & self ) -> serde_json:: Result < serde_json:: Value > {
161
161
match self {
162
+ Job :: AddCrate ( inner) => serde_json:: to_value ( inner) ,
162
163
Job :: DailyDbMaintenance => Ok ( serde_json:: Value :: Null ) ,
163
164
Job :: DumpDb ( inner) => serde_json:: to_value ( inner) ,
164
- Job :: AddCrate ( inner) => serde_json:: to_value ( inner) ,
165
- Job :: SquashIndex => Ok ( serde_json:: Value :: Null ) ,
166
- Job :: UpdateCrateIndex ( inner) => serde_json:: to_value ( inner) ,
167
- Job :: SyncYanked ( inner) => serde_json:: to_value ( inner) ,
168
165
Job :: NormalizeIndex ( inner) => serde_json:: to_value ( inner) ,
169
166
Job :: RenderAndUploadReadme ( inner) => serde_json:: to_value ( inner) ,
167
+ Job :: SquashIndex => Ok ( serde_json:: Value :: Null ) ,
170
168
Job :: SyncToGitIndex ( inner) => serde_json:: to_value ( inner) ,
171
169
Job :: SyncToSparseIndex ( inner) => serde_json:: to_value ( inner) ,
170
+ Job :: SyncYanked ( inner) => serde_json:: to_value ( inner) ,
171
+ Job :: UpdateCrateIndex ( inner) => serde_json:: to_value ( inner) ,
172
172
Job :: UpdateDownloads => Ok ( serde_json:: Value :: Null ) ,
173
173
}
174
174
}
@@ -189,16 +189,16 @@ impl Job {
189
189
) -> Result < Self , PerformError > {
190
190
use serde_json:: from_value;
191
191
Ok ( match job_type {
192
+ Self :: ADD_CRATE => Job :: AddCrate ( from_value ( value) ?) ,
192
193
Self :: DAILY_DB_MAINTENANCE => Job :: DailyDbMaintenance ,
193
194
Self :: DUMP_DB => Job :: DumpDb ( from_value ( value) ?) ,
194
- Self :: ADD_CRATE => Job :: AddCrate ( from_value ( value) ?) ,
195
- Self :: SQUASH_INDEX => Job :: SquashIndex ,
196
- Self :: UPDATE_CRATE_INDEX => Job :: UpdateCrateIndex ( from_value ( value) ?) ,
197
- Self :: SYNC_YANKED => Job :: SyncYanked ( from_value ( value) ?) ,
198
195
Self :: NORMALIZE_INDEX => Job :: NormalizeIndex ( from_value ( value) ?) ,
199
196
Self :: RENDER_AND_UPLOAD_README => Job :: RenderAndUploadReadme ( from_value ( value) ?) ,
197
+ Self :: SQUASH_INDEX => Job :: SquashIndex ,
200
198
Self :: SYNC_TO_GIT_INDEX => Job :: SyncToGitIndex ( from_value ( value) ?) ,
201
199
Self :: SYNC_TO_SPARSE_INDEX => Job :: SyncToSparseIndex ( from_value ( value) ?) ,
200
+ Self :: SYNC_YANKED => Job :: SyncYanked ( from_value ( value) ?) ,
201
+ Self :: UPDATE_CRATE_INDEX => Job :: UpdateCrateIndex ( from_value ( value) ?) ,
202
202
Self :: UPDATE_DOWNLOADS => Job :: UpdateDownloads ,
203
203
job_type => Err ( PerformError :: from ( format ! ( "Unknown job type {job_type}" ) ) ) ?,
204
204
} )
0 commit comments