Skip to content

Commit 3ca6799

Browse files
ming1016ming1016
committed
RSS clean
1 parent 1b11410 commit 3ca6799

16 files changed

+0
-1557
lines changed

‎SwiftPamphletApp.xcodeproj/project.pbxproj

-76
Original file line numberDiff line numberDiff line change
@@ -188,19 +188,11 @@
188188
0896FB9027BA39B100676B7F /* PlayButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0896FB8F27BA39B100676B7F /* PlayButtonView.swift */; };
189189
0896FB9227BA486900676B7F /* 145.md in Resources */ = {isa = PBXBuildFile; fileRef = 0896FB9127BA486900676B7F /* 145.md */; };
190190
08A4FDC227B25A140068E5BC /* 141.md in Resources */ = {isa = PBXBuildFile; fileRef = 08A4FDC127B25A140068E5BC /* 141.md */; };
191-
08AEAEDB277EA5C300B969E2 /* RSSModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08AEAEDA277EA5C300B969E2 /* RSSModel.swift */; };
192191
08AEAEDD277EA64900B969E2 /* DBDevNoti.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08AEAEDC277EA64900B969E2 /* DBDevNoti.swift */; };
193192
08AEAEE1277EA70500B969E2 /* DBRepoStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08AEAEE0277EA70500B969E2 /* DBRepoStore.swift */; };
194-
08AEAEE3277EA8F900B969E2 /* DBRSSFeed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08AEAEE2277EA8F900B969E2 /* DBRSSFeed.swift */; };
195-
08AEAEE5277EB36700B969E2 /* DBRSSItems.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08AEAEE4277EB36700B969E2 /* DBRSSItems.swift */; };
196-
08AEAEE9277EDD9000B969E2 /* rssfeed.json in Resources */ = {isa = PBXBuildFile; fileRef = 08AEAEE8277EDD9000B969E2 /* rssfeed.json */; };
197-
08AEAEEB277EED9F00B969E2 /* RSSVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08AEAEEA277EED9F00B969E2 /* RSSVM.swift */; };
198-
08AEAEED277F014500B969E2 /* RSSListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08AEAEEC277F014500B969E2 /* RSSListView.swift */; };
199-
08AEAEEF277F070700B969E2 /* RSSItemsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08AEAEEE277F070700B969E2 /* RSSItemsView.swift */; };
200193
08AEAEF1277F09D000B969E2 /* IntroView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08AEAEF0277F09D000B969E2 /* IntroView.swift */; };
201194
08AEAEF3277F09FA00B969E2 /* NavView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08AEAEF2277F09FA00B969E2 /* NavView.swift */; };
202195
08AEAEF5277F0A1E00B969E2 /* SPSidebar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08AEAEF4277F0A1E00B969E2 /* SPSidebar.swift */; };
203-
08AEAEF7277F389300B969E2 /* RSSItemContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08AEAEF6277F389300B969E2 /* RSSItemContentView.swift */; };
204196
08AEAEFA277F3C7400B969E2 /* css.html in Resources */ = {isa = PBXBuildFile; fileRef = 08AEAEF9277F3C7400B969E2 /* css.html */; };
205197
08B4C9392770B26700742084 /* CCYRSSReq.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08B4C9382770B26700742084 /* CCYRSSReq.swift */; };
206198
08B4C93C2774786800742084 /* archiveRepos.json in Resources */ = {isa = PBXBuildFile; fileRef = 08B4C93B2774786800742084 /* archiveRepos.json */; };
@@ -256,9 +248,6 @@
256248
08C3BBA427CF1B7B00ACF0FE /* PlayPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08C3BBA327CF1B7B00ACF0FE /* PlayPickerView.swift */; };
257249
08C411F227951152006FC340 /* PlayFoundation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08C411F127951152006FC340 /* PlayFoundation.swift */; };
258250
08C411F427951181006FC340 /* PlaySyntax.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08C411F327951181006FC340 /* PlaySyntax.swift */; };
259-
08CD61F827758AF0008C0935 /* ParseStandXMLTags.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08CD61F527758AF0008C0935 /* ParseStandXMLTags.swift */; };
260-
08CD61F927758AF0008C0935 /* ParseStandXMLTagTokens.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08CD61F627758AF0008C0935 /* ParseStandXMLTagTokens.swift */; };
261-
08CD61FA27758AF0008C0935 /* ParseStandXML.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08CD61F727758AF0008C0935 /* ParseStandXML.swift */; };
262251
08CD61FE27758B8A008C0935 /* Lexer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08CD61FC27758B8A008C0935 /* Lexer.swift */; };
263252
08CD61FF27758B8A008C0935 /* Token.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08CD61FD27758B8A008C0935 /* Token.swift */; };
264253
08D107BD278826BB007B7009 /* HTMLEntities in Frameworks */ = {isa = PBXBuildFile; productRef = 08D107BC278826BB007B7009 /* HTMLEntities */; };
@@ -451,19 +440,11 @@
451440
0896FB8F27BA39B100676B7F /* PlayButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayButtonView.swift; sourceTree = "<group>"; };
452441
0896FB9127BA486900676B7F /* 145.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = 145.md; sourceTree = "<group>"; };
453442
08A4FDC127B25A140068E5BC /* 141.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = 141.md; sourceTree = "<group>"; };
454-
08AEAEDA277EA5C300B969E2 /* RSSModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RSSModel.swift; sourceTree = "<group>"; };
455443
08AEAEDC277EA64900B969E2 /* DBDevNoti.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DBDevNoti.swift; sourceTree = "<group>"; };
456444
08AEAEE0277EA70500B969E2 /* DBRepoStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DBRepoStore.swift; sourceTree = "<group>"; };
457-
08AEAEE2277EA8F900B969E2 /* DBRSSFeed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DBRSSFeed.swift; sourceTree = "<group>"; };
458-
08AEAEE4277EB36700B969E2 /* DBRSSItems.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DBRSSItems.swift; sourceTree = "<group>"; };
459-
08AEAEE8277EDD9000B969E2 /* rssfeed.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = rssfeed.json; sourceTree = "<group>"; };
460-
08AEAEEA277EED9F00B969E2 /* RSSVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RSSVM.swift; sourceTree = "<group>"; };
461-
08AEAEEC277F014500B969E2 /* RSSListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RSSListView.swift; sourceTree = "<group>"; };
462-
08AEAEEE277F070700B969E2 /* RSSItemsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RSSItemsView.swift; sourceTree = "<group>"; };
463445
08AEAEF0277F09D000B969E2 /* IntroView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntroView.swift; sourceTree = "<group>"; };
464446
08AEAEF2277F09FA00B969E2 /* NavView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavView.swift; sourceTree = "<group>"; };
465447
08AEAEF4277F0A1E00B969E2 /* SPSidebar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPSidebar.swift; sourceTree = "<group>"; };
466-
08AEAEF6277F389300B969E2 /* RSSItemContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RSSItemContentView.swift; sourceTree = "<group>"; };
467448
08AEAEF9277F3C7400B969E2 /* css.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = css.html; sourceTree = "<group>"; };
468449
08B4C9382770B26700742084 /* CCYRSSReq.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CCYRSSReq.swift; sourceTree = "<group>"; };
469450
08B4C93B2774786800742084 /* archiveRepos.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = archiveRepos.json; sourceTree = "<group>"; };
@@ -516,9 +497,6 @@
516497
08C3BBA327CF1B7B00ACF0FE /* PlayPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayPickerView.swift; sourceTree = "<group>"; };
517498
08C411F127951152006FC340 /* PlayFoundation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayFoundation.swift; sourceTree = "<group>"; };
518499
08C411F327951181006FC340 /* PlaySyntax.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlaySyntax.swift; sourceTree = "<group>"; };
519-
08CD61F527758AF0008C0935 /* ParseStandXMLTags.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParseStandXMLTags.swift; sourceTree = "<group>"; };
520-
08CD61F627758AF0008C0935 /* ParseStandXMLTagTokens.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParseStandXMLTagTokens.swift; sourceTree = "<group>"; };
521-
08CD61F727758AF0008C0935 /* ParseStandXML.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParseStandXML.swift; sourceTree = "<group>"; };
522500
08CD61FC27758B8A008C0935 /* Lexer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Lexer.swift; sourceTree = "<group>"; };
523501
08CD61FD27758B8A008C0935 /* Token.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Token.swift; sourceTree = "<group>"; };
524502
08F4BE5F28609D8600733F12 /* PlayCharts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayCharts.swift; sourceTree = "<group>"; };
@@ -1078,7 +1056,6 @@
10781056
08BE637A27CDD9E7002BC6A8 /* DataSorting */,
10791057
086A5F472744EF0800FECE02 /* Resource */,
10801058
086A5F252744ECD700FECE02 /* GitHubAPI */,
1081-
08CD61F327758855008C0935 /* RSSReader */,
10821059
084417732B99B8EA0049297D /* HomeUI */,
10831060
083554E227572BB60095E0EE /* AppVM.swift */,
10841061
086A5F432744EE2800FECE02 /* SwiftPamphletAppConfig.swift */,
@@ -1204,7 +1181,6 @@
12041181
children = (
12051182
086A5F692755F3BE00FECE02 /* repos.json */,
12061183
086A5F4C2744EF3B00FECE02 /* developers.json */,
1207-
08AEAEE8277EDD9000B969E2 /* rssfeed.json */,
12081184
);
12091185
path = News;
12101186
sourceTree = "<group>";
@@ -1239,25 +1215,6 @@
12391215
path = Style;
12401216
sourceTree = "<group>";
12411217
};
1242-
08B1EF0827892C6D003E1FA5 /* DB */ = {
1243-
isa = PBXGroup;
1244-
children = (
1245-
08AEAEE2277EA8F900B969E2 /* DBRSSFeed.swift */,
1246-
08AEAEE4277EB36700B969E2 /* DBRSSItems.swift */,
1247-
);
1248-
path = DB;
1249-
sourceTree = "<group>";
1250-
};
1251-
08B1EF0927892C82003E1FA5 /* View */ = {
1252-
isa = PBXGroup;
1253-
children = (
1254-
08AEAEEC277F014500B969E2 /* RSSListView.swift */,
1255-
08AEAEEE277F070700B969E2 /* RSSItemsView.swift */,
1256-
08AEAEF6277F389300B969E2 /* RSSItemContentView.swift */,
1257-
);
1258-
path = View;
1259-
sourceTree = "<group>";
1260-
};
12611218
08B4C93A277477E100742084 /* Archive */ = {
12621219
isa = PBXGroup;
12631220
children = (
@@ -1325,28 +1282,6 @@
13251282
path = Play;
13261283
sourceTree = "<group>";
13271284
};
1328-
08CD61F327758855008C0935 /* RSSReader */ = {
1329-
isa = PBXGroup;
1330-
children = (
1331-
08B1EF0927892C82003E1FA5 /* View */,
1332-
08B1EF0827892C6D003E1FA5 /* DB */,
1333-
08AEAEDA277EA5C300B969E2 /* RSSModel.swift */,
1334-
08AEAEEA277EED9F00B969E2 /* RSSVM.swift */,
1335-
08CD61F42775886B008C0935 /* Parser */,
1336-
);
1337-
path = RSSReader;
1338-
sourceTree = "<group>";
1339-
};
1340-
08CD61F42775886B008C0935 /* Parser */ = {
1341-
isa = PBXGroup;
1342-
children = (
1343-
08CD61F727758AF0008C0935 /* ParseStandXML.swift */,
1344-
08CD61F527758AF0008C0935 /* ParseStandXMLTags.swift */,
1345-
08CD61F627758AF0008C0935 /* ParseStandXMLTagTokens.swift */,
1346-
);
1347-
path = Parser;
1348-
sourceTree = "<group>";
1349-
};
13501285
08CD61FB27758B22008C0935 /* Core */ = {
13511286
isa = PBXGroup;
13521287
children = (
@@ -1518,7 +1453,6 @@
15181453
08026C442869B24F00792EF1 /* 177.md in Resources */,
15191454
08A4FDC227B25A140068E5BC /* 141.md in Resources */,
15201455
08448FC3279EC4D600B61353 /* 27.md in Resources */,
1521-
08AEAEE9277EDD9000B969E2 /* rssfeed.json in Resources */,
15221456
08BE635C27C65C7C002BC6A8 /* 154.md in Resources */,
15231457
0844901A279ECD4E00B61353 /* 64.md in Resources */,
15241458
08449024279ECE2200B61353 /* 69.md in Resources */,
@@ -1619,7 +1553,6 @@
16191553
08BE636227C878EC002BC6A8 /* PlayLazyVStackAndLazyHStackView.swift in Sources */,
16201554
08BE634627C48C5B002BC6A8 /* PlayToggleView.swift in Sources */,
16211555
08448F41279AC1A900B61353 /* PlayMacOS.swift in Sources */,
1622-
08AEAEF7277F389300B969E2 /* RSSItemContentView.swift in Sources */,
16231556
0896FB9027BA39B100676B7F /* PlayButtonView.swift in Sources */,
16241557
08BE635A27C6575C002BC6A8 /* PlayGroupBoxView.swift in Sources */,
16251558
08BF26D8276B5D7F0064DDAC /* ExploreRepoListView.swift in Sources */,
@@ -1638,18 +1571,14 @@
16381571
08CD61FE27758B8A008C0935 /* Lexer.swift in Sources */,
16391572
086A5F422744EDCE00FECE02 /* IssueVM.swift in Sources */,
16401573
08AEAEF3277F09FA00B969E2 /* NavView.swift in Sources */,
1641-
08AEAEE5277EB36700B969E2 /* DBRSSItems.swift in Sources */,
16421574
086A5F352744ED9600FECE02 /* IssueView.swift in Sources */,
16431575
08522BF027CF9FFA005FF059 /* PlayAnimation.swift in Sources */,
16441576
08AEAEDD277EA64900B969E2 /* DBDevNoti.swift in Sources */,
16451577
08BE635E27C72F50002BC6A8 /* PlayNavigationView.swift in Sources */,
16461578
08448F0D2799035600B61353 /* PlaySecurity.swift in Sources */,
16471579
086A5F442744EE2800FECE02 /* SwiftPamphletAppConfig.swift in Sources */,
1648-
08AEAEEF277F070700B969E2 /* RSSItemsView.swift in Sources */,
1649-
08AEAEED277F014500B969E2 /* RSSListView.swift in Sources */,
16501580
08C411F427951181006FC340 /* PlaySyntax.swift in Sources */,
16511581
083554E12756503B0095E0EE /* AnimateLayout.swift in Sources */,
1652-
08CD61F827758AF0008C0935 /* ParseStandXMLTags.swift in Sources */,
16531582
08BF26DA276B65160064DDAC /* CCYGitHubAPI.swift in Sources */,
16541583
08C411F227951152006FC340 /* PlayFoundation.swift in Sources */,
16551584
08448F0B2797F73200B61353 /* PlayArchitecture.swift in Sources */,
@@ -1658,7 +1587,6 @@
16581587
086A5F362744ED9600FECE02 /* RepoView.swift in Sources */,
16591588
086A5F302744ED8600FECE02 /* IssuesListFromCustomView.swift in Sources */,
16601589
08C3BB7E27CE3EBD00ACF0FE /* PlayTabView.swift in Sources */,
1661-
08CD61F927758AF0008C0935 /* ParseStandXMLTagTokens.swift in Sources */,
16621590
084417752B99B9060049297D /* HomeView.swift in Sources */,
16631591
08449034279F6D0D00B61353 /* RepoWebView.swift in Sources */,
16641592
08522BDC27CF5079005FF059 /* PlayStepperView.swift in Sources */,
@@ -1667,14 +1595,12 @@
16671595
08BE635227C4D2BC002BC6A8 /* PlayListView.swift in Sources */,
16681596
086A5F072744E88E00FECE02 /* SwiftPamphletAppApp.swift in Sources */,
16691597
08F4BE6228616DC100733F12 /* PlayWeatherKit.swift in Sources */,
1670-
08AEAEDB277EA5C300B969E2 /* RSSModel.swift in Sources */,
16711598
08BE637D27CDDA47002BC6A8 /* DataListView.swift in Sources */,
16721599
08AEAEF1277F09D000B969E2 /* IntroView.swift in Sources */,
16731600
086A5F412744EDCE00FECE02 /* UserVM.swift in Sources */,
16741601
08BE633527BF54A0002BC6A8 /* PlayTextEditorView.swift in Sources */,
16751602
08AEAEF5277F0A1E00B969E2 /* SPSidebar.swift in Sources */,
16761603
086A5F642754C14F00FECE02 /* PlayTextView.swift in Sources */,
1677-
08AEAEEB277EED9F00B969E2 /* RSSVM.swift in Sources */,
16781604
086A5F372744ED9600FECE02 /* UserView.swift in Sources */,
16791605
08BE635627C63CF6002BC6A8 /* PlayControlGroupView.swift in Sources */,
16801606
083554E327572BB60095E0EE /* AppVM.swift in Sources */,
@@ -1684,7 +1610,6 @@
16841610
086A5F672754C27900FECE02 /* DBHandler.swift in Sources */,
16851611
08BE637927CDCFD9002BC6A8 /* DataSortingListView.swift in Sources */,
16861612
08BE636E27C8D6FD002BC6A8 /* PlayLazyVGridAndLazyHGridView.swift in Sources */,
1687-
08AEAEE3277EA8F900B969E2 /* DBRSSFeed.swift in Sources */,
16881613
08522BE227CF52ED005FF059 /* PlayColor.swift in Sources */,
16891614
08BE636A27C8C409002BC6A8 /* PlayImageView.swift in Sources */,
16901615
08CD61FF27758B8A008C0935 /* Token.swift in Sources */,
@@ -1693,7 +1618,6 @@
16931618
08AEAEE1277EA70500B969E2 /* DBRepoStore.swift in Sources */,
16941619
08BE632E27BE3A95002BC6A8 /* PlayLabelView.swift in Sources */,
16951620
084E1A6527B51EDB0072BBB6 /* AutoTask.swift in Sources */,
1696-
08CD61FA27758AF0008C0935 /* ParseStandXML.swift in Sources */,
16971621
);
16981622
runOnlyForDeploymentPostprocessing = 0;
16991623
};

‎SwiftPamphletApp/AppVM.swift

-33
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ final class AppVM: ObservableObject {
1717
// 开发者动态
1818
@Published var devsNotis = [String: Int]()
1919
@Published var devsCountNotis = 0
20-
// 博客动态
21-
@Published var rssCountNotis = 0
2220

2321
// MARK: - 库存档
2422
@Published var archiveRepos = [SPReposModel]()
@@ -79,38 +77,7 @@ final class AppVM: ObservableObject {
7977
webLinkStr = s
8078
}
8179

82-
// MARK: - RSS 读取
83-
func rssFetch() {
84-
Task {
85-
do {
86-
let rssFeed = SPC.rssFeed() // 获取所有 rss 源的模型
87-
var i = 0
88-
let count = rssFeed.count
89-
let ics = ["🚶","🏃🏽","👩‍🦽","💃🏿","🐕","🤸🏻‍♀️","🤾🏾","🏂","🏊🏻","🚴🏼","🛩","🚠","🚕","🛴","🛸","🚁"]
90-
for r in rssFeed {
91-
i += 1
92-
let progressStr = "(\(i)/\(count))"
93-
await updateAlertMsg(msg: "\(progressStr) 正在同步 \(ics.randomElement() ?? "") \(r.title) ：\(r.des)")
94-
let str = try await RSSReq(r.feedLink)
95-
guard let str = str else {
96-
break
97-
}
98-
RSSVM.handleFetchFeed(str: str, rssModel: r)
99-
// 在 Main Actor 更新通知数
100-
await rssUpdateNotis()
101-
}
102-
} catch {}
103-
await updateAlertMsg(msg: "")
104-
}
105-
}
10680

107-
@MainActor
108-
func rssUpdateNotis() {
109-
do {
110-
rssCountNotis = try RSSItemsDataHelper.findAllUnreadCount()
111-
showAppBadgeLabel()
112-
} catch {}
113-
}
11481

11582
@MainActor
11683
func updateAlertMsg(msg: String) {

‎SwiftPamphletApp/GitHubAPI/DB/DBHandler.swift

-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ struct DB {
3636
do {
3737
try DevsNotiDataHelper.createTable()
3838
try RepoStoreDataHelper.createTable()
39-
try RSSFeedDataHelper.createTable()
40-
try RSSItemsDataHelper.createTable()
4139
} catch {
4240
throw DBError.connectionErr
4341
}

0 commit comments

Comments
 (0)