Skip to content

Commit e6a43ff

Browse files
authored
Minor project tidy for stray WordPressData files (#24629)
* Move `RemotePost+Metadata` extension to WordPressData folder * Move extensions from `PostRepository+Helpers.swift` to WordPressData * Move `WordPressOrgRestApi+WordPress.swift` file to WordPressData
1 parent 6dbbecd commit e6a43ff

File tree

5 files changed

+22
-52
lines changed

5 files changed

+22
-52
lines changed

WordPress/Classes/Services/PostRepository+Helpers.swift renamed to Sources/WordPressData/Swift/RemotePostCreateParameters+Helpers.swift

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -52,24 +52,3 @@ private func makeTags(from tags: String) -> [String] {
5252
.map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
5353
.filter { !$0.isEmpty }
5454
}
55-
56-
public extension RemotePostUpdateParameters {
57-
58-
var isEmpty: Bool {
59-
self == RemotePostUpdateParameters()
60-
}
61-
62-
/// Returns a diff between the original and the latest revision with the
63-
/// changes applied on top.
64-
static func changes(from original: AbstractPost, to latest: AbstractPost, with changes: RemotePostUpdateParameters? = nil) -> RemotePostUpdateParameters {
65-
guard original !== latest else {
66-
return changes ?? RemotePostUpdateParameters()
67-
}
68-
let parametersOriginal = RemotePostCreateParameters(post: original)
69-
var parametersLatest = RemotePostCreateParameters(post: latest)
70-
if let changes {
71-
parametersLatest.apply(changes)
72-
}
73-
return parametersLatest.changes(from: parametersOriginal)
74-
}
75-
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import WordPressKit
2+
3+
public extension RemotePostUpdateParameters {
4+
5+
var isEmpty: Bool {
6+
self == RemotePostUpdateParameters()
7+
}
8+
9+
/// Returns a diff between the original and the latest revision with the
10+
/// changes applied on top.
11+
static func changes(from original: AbstractPost, to latest: AbstractPost, with changes: RemotePostUpdateParameters? = nil) -> RemotePostUpdateParameters {
12+
guard original !== latest else {
13+
return changes ?? RemotePostUpdateParameters()
14+
}
15+
let parametersOriginal = RemotePostCreateParameters(post: original)
16+
var parametersLatest = RemotePostCreateParameters(post: latest)
17+
if let changes {
18+
parametersLatest.apply(changes)
19+
}
20+
return parametersLatest.changes(from: parametersOriginal)
21+
}
22+
}

WordPress/WordPress.xcodeproj/project.pbxproj

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,7 +1092,6 @@
10921092
0C5C46F42D98343300F2CD55 /* Exceptions for "Classes" folder in "Keystone" target */ = {
10931093
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
10941094
membershipExceptions = (
1095-
"Services/PostRepository+Helpers.swift",
10961095
"System/ApiCredentials+BuildSecrets.swift",
10971096
System/main.swift,
10981097
"System/WordPress-Bridging-Header.h",
@@ -1156,33 +1155,6 @@
11561155
);
11571156
target = E16AB92914D978240047A2E5 /* WordPressTest */;
11581157
};
1159-
3F0F25872D9BD88C00CD05D6 /* Exceptions for "Classes" folder in "WordPressData" target */ = {
1160-
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
1161-
membershipExceptions = (
1162-
"Networking/WordPressOrgRestApi+WordPress.swift",
1163-
"RemotePost+Metadata.swift",
1164-
"Services/PostRepository+Helpers.swift",
1165-
);
1166-
target = 3F7AE0B42D9B30A100AB4892 /* WordPressData */;
1167-
};
1168-
3F164FCF2D9E49A8008BC606 /* Exceptions for "Classes" folder in "WordPress" target */ = {
1169-
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
1170-
membershipExceptions = (
1171-
"Networking/WordPressOrgRestApi+WordPress.swift",
1172-
"RemotePost+Metadata.swift",
1173-
"Services/PostRepository+Helpers.swift",
1174-
);
1175-
target = 1D6058900D05DD3D006BFB54 /* WordPress */;
1176-
};
1177-
3F164FD02D9E49A8008BC606 /* Exceptions for "Classes" folder in "Jetpack" target */ = {
1178-
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
1179-
membershipExceptions = (
1180-
"Networking/WordPressOrgRestApi+WordPress.swift",
1181-
"RemotePost+Metadata.swift",
1182-
"Services/PostRepository+Helpers.swift",
1183-
);
1184-
target = FABB1F8F2602FC2C00C8785C /* Jetpack */;
1185-
};
11861158
3F1A64F82DA7ABC300786B92 /* Exceptions for "Classes" folder in "Reader" target */ = {
11871159
isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
11881160
membershipExceptions = (
@@ -1366,19 +1338,16 @@
13661338
24CE57C42CD3375200C7B37D /* Classes */ = {
13671339
isa = PBXFileSystemSynchronizedRootGroup;
13681340
exceptions = (
1369-
3F164FCF2D9E49A8008BC606 /* Exceptions for "Classes" folder in "WordPress" target */,
13701341
4AC9F8152DE528180095EA51 /* Exceptions for "Classes" folder in "WordPressShareExtension" target */,
13711342
4ABC59762DE52AA2005A6B84 /* Exceptions for "Classes" folder in "WordPressDraftActionExtension" target */,
13721343
4ABCAB382DE5333C005A6B84 /* Exceptions for "Classes" folder in "WordPressNotificationServiceExtension" target */,
1373-
3F164FD02D9E49A8008BC606 /* Exceptions for "Classes" folder in "Jetpack" target */,
13741344
4ABC59822DE52D2A005A6B84 /* Exceptions for "Classes" folder in "JetpackShareExtension" target */,
13751345
4ABC59802DE52D23005A6B84 /* Exceptions for "Classes" folder in "JetpackDraftActionExtension" target */,
13761346
4ABCAB302DE5309F005A6B84 /* Exceptions for "Classes" folder in "JetpackNotificationServiceExtension" target */,
13771347
4AC9CF442DE5228C0095EA51 /* Exceptions for "Classes" folder in "JetpackStatsWidgets" target */,
13781348
4ABCAB352DE531B6005A6B84 /* Exceptions for "Classes" folder in "JetpackIntents" target */,
13791349
3F1A64F82DA7ABC300786B92 /* Exceptions for "Classes" folder in "Reader" target */,
13801350
0C5C46F42D98343300F2CD55 /* Exceptions for "Classes" folder in "Keystone" target */,
1381-
3F0F25872D9BD88C00CD05D6 /* Exceptions for "Classes" folder in "WordPressData" target */,
13821351
);
13831352
path = Classes;
13841353
sourceTree = "<group>";

0 commit comments

Comments
 (0)