Skip to content

Commit 659ee4c

Browse files
committed
refactor(core): name cloud connection placements
1 parent a115933 commit 659ee4c

2 files changed

Lines changed: 19 additions & 37 deletions

File tree

‎.github/workflows/macos-core-verify.yml‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,6 @@ on:
66
permissions:
77
contents: read
88
jobs:
9-
verify:
10-
runs-on: macos-15
11-
timeout-minutes: 90
12-
env:
13-
RUSTFLAGS: -D warnings
14-
CARGO_BUILD_JOBS: 2
15-
CARGO_INCREMENTAL: 0
16-
steps:
17-
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
18-
with:
19-
persist-credentials: false
20-
- uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8
21-
with:
22-
toolchain: "1.98"
23-
- uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0
24-
with:
25-
key: macos-core-lane
26-
- name: Swift library and tests
27-
run: |
28-
apple/scripts/build-core.sh both
29-
.claude/skills/fix-issue/scripts/verify.sh --root "$PWD" --no-wait package TableProFFI
30-
apple/scripts/probes/check-library-name-order.sh
31-
du -h apple/Packages/TableProFFI/Build/lib/libtablepro_ffi.a
32-
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9
33-
if: always()
34-
with:
35-
name: macos-core-swift-verification
36-
path: |
37-
.analysis/feat-macos-core-library/logs
389
rust:
3910
runs-on: ubuntu-24.04
4011
timeout-minutes: 60
@@ -52,6 +23,7 @@ jobs:
5223
- uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0
5324
with:
5425
key: macos-core-lane-rust
26+
cache-on-failure: true
5527
- name: Rust tests and lint
5628
run: |
5729
cargo test --locked -p tablepro-storage

‎core/crates/storage/src/cloudkit/mod.rs‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,19 @@ pub struct CloudPull {
6767
pub favorites_order: Option<Vec<Uuid>>,
6868
}
6969

70+
struct ConnectionPlace {
71+
record_key: Option<(i64, String)>,
72+
order: u32,
73+
id: Uuid,
74+
}
75+
7076
// Unknown groups stay in the record cache for a newer reader to understand.
7177
pub fn layout(list: &ConnectionList, records: &CloudRecords, favorites_order: &[Uuid]) -> ConnectionList {
7278
let groups = read_groups(&records.groups);
7379
let known: HashSet<Uuid> = groups.iter().map(|group| group.id).collect();
7480
let recorded = by_id(&records.connections, |record| &record.connection_id);
7581

76-
let mut places: HashMap<Option<Uuid>, Vec<(Option<(i64, String)>, u32, Uuid)>> = HashMap::new();
82+
let mut places: HashMap<Option<Uuid>, Vec<ConnectionPlace>> = HashMap::new();
7783
let mut favorites: HashSet<Uuid> = HashSet::new();
7884
for saved in list.connections.iter() {
7985
let record = recorded.get(&saved.id);
@@ -86,7 +92,11 @@ pub fn layout(list: &ConnectionList, records: &CloudRecords, favorites_order: &[
8692
let name = record.name.clone().unwrap_or_else(|| saved.name.clone());
8793
(sort_key(record.sort_order), name)
8894
});
89-
places.entry(group).or_default().push((key, saved.order, saved.id));
95+
places.entry(group).or_default().push(ConnectionPlace {
96+
record_key: key,
97+
order: saved.order,
98+
id: saved.id,
99+
});
90100
let is_favorite = record.map_or_else(|| list.is_favorite(saved.id), |record| favorite(record.is_favorite));
91101
if is_favorite {
92102
favorites.insert(saved.id);
@@ -95,14 +105,14 @@ pub fn layout(list: &ConnectionList, records: &CloudRecords, favorites_order: &[
95105

96106
let mut placed: HashMap<Uuid, (Option<Uuid>, u32)> = HashMap::new();
97107
for (group, mut members) in places {
98-
members.sort_by(|left, right| match (&left.0, &right.0) {
99-
(Some(l), Some(r)) => reads_before((l.0, &l.1, left.2), (r.0, &r.1, right.2)),
108+
members.sort_by(|left, right| match (&left.record_key, &right.record_key) {
109+
(Some(l), Some(r)) => reads_before((l.0, &l.1, left.id), (r.0, &r.1, right.id)),
100110
(Some(_), None) => std::cmp::Ordering::Less,
101111
(None, Some(_)) => std::cmp::Ordering::Greater,
102-
(None, None) => (left.1, left.2).cmp(&(right.1, right.2)),
112+
(None, None) => (left.order, left.id).cmp(&(right.order, right.id)),
103113
});
104-
for ((_, _, id), rank) in members.into_iter().zip(0_u32..) {
105-
placed.insert(id, (group, rank));
114+
for (member, rank) in members.into_iter().zip(0_u32..) {
115+
placed.insert(member.id, (group, rank));
106116
}
107117
}
108118
let connections: Vec<SavedConnection> = list
@@ -160,7 +170,7 @@ fn changed<R: PartialEq>(base: &HashMap<Uuid, &R>, id: &str, record: &R) -> bool
160170
.is_none_or(|held| *held != record)
161171
}
162172

163-
fn by_id<'a, R>(records: &'a [R], id: impl Fn(&R) -> &String) -> HashMap<Uuid, &'a R> {
173+
fn by_id<R>(records: &[R], id: impl Fn(&R) -> &String) -> HashMap<Uuid, &R> {
164174
let mut found = HashMap::with_capacity(records.len());
165175
for record in records {
166176
if let Some(parsed) = record_id(id(record)) {

0 commit comments

Comments
 (0)