Compare commits
38 commits
next
...
0.3.3-poin
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7ee8e6cef9 | ||
|
|
d15b0e0735 | ||
|
|
e0b069c0a4 | ||
|
|
72e96d44dd | ||
|
|
92a8566b14 | ||
|
|
d7d01465d8 | ||
|
|
9b12671a97 | ||
|
|
6679229118 | ||
|
|
9cfb12cb14 | ||
|
|
eb326f3354 | ||
|
|
ce0c624cdc | ||
|
|
42ff275935 | ||
|
|
33c9a4ead2 | ||
|
|
95ea2be722 | ||
|
|
cfa120ec04 | ||
|
|
2cee7bc848 | ||
|
|
56bb3a9c61 | ||
|
|
a9a64a86e1 | ||
|
|
7c86204a32 | ||
|
|
d3fc9cff8c | ||
|
|
44e4f74258 | ||
|
|
159f648762 | ||
|
|
5007abb49d | ||
|
|
a7f4616d9b | ||
|
|
70638c2335 | ||
|
|
ef690b2da2 | ||
|
|
0c0b0a252a | ||
|
|
def3ca69a1 | ||
|
|
b451cf64b1 | ||
|
|
04b2185956 | ||
|
|
6f2d9a9b10 | ||
|
|
efecfa3236 | ||
|
|
9ea7ab7b11 | ||
|
|
f39b660fe7 | ||
|
|
fbc9188535 | ||
|
|
b7c9c75e3b | ||
|
|
d3ee5c5bc9 | ||
|
|
6cc9221fe4 |
67 changed files with 3244 additions and 465 deletions
4
.github/workflows/nightly.yml
vendored
4
.github/workflows/nightly.yml
vendored
|
|
@ -2,11 +2,11 @@ name: Build and upload nightly ipa
|
|||
|
||||
on:
|
||||
push:
|
||||
branches: [none]
|
||||
branches: [default]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: macos-latest
|
||||
runs-on: macos-12
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Setup Xcode
|
||||
|
|
|
|||
|
|
@ -7,21 +7,45 @@
|
|||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
0C0D50E1288DF7700035ECC8 /* TorrentSource+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0D50DF288DF7700035ECC8 /* TorrentSource+CoreDataClass.swift */; };
|
||||
0C0D50E2288DF7700035ECC8 /* TorrentSource+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0D50E0288DF7700035ECC8 /* TorrentSource+CoreDataProperties.swift */; };
|
||||
0C0D50E5288DFE7F0035ECC8 /* SourceModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0D50E4288DFE7F0035ECC8 /* SourceModels.swift */; };
|
||||
0C0D50E7288DFF850035ECC8 /* SourceListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0D50E6288DFF850035ECC8 /* SourceListView.swift */; };
|
||||
0C0D50E7288DFF850035ECC8 /* SourcesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0D50E6288DFF850035ECC8 /* SourcesView.swift */; };
|
||||
0C32FB532890D19D002BD219 /* AboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C32FB522890D19D002BD219 /* AboutView.swift */; };
|
||||
0C32FB552890D1BF002BD219 /* UIApplication.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C32FB542890D1BF002BD219 /* UIApplication.swift */; };
|
||||
0C32FB572890D1F2002BD219 /* ListRowViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C32FB562890D1F2002BD219 /* ListRowViews.swift */; };
|
||||
0C4CFC462897030D00AD9FAD /* Regex in Frameworks */ = {isa = PBXBuildFile; productRef = 0C4CFC452897030D00AD9FAD /* Regex */; };
|
||||
0C4CFC4D28970C8B00AD9FAD /* SourceComplexQuery+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C4CFC4728970C8B00AD9FAD /* SourceComplexQuery+CoreDataClass.swift */; };
|
||||
0C4CFC4E28970C8B00AD9FAD /* SourceComplexQuery+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C4CFC4828970C8B00AD9FAD /* SourceComplexQuery+CoreDataProperties.swift */; };
|
||||
0C57D4CC289032ED008534E8 /* SearchResultRDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C57D4CB289032ED008534E8 /* SearchResultRDView.swift */; };
|
||||
0C60B1EF28A1A00000E3FD7E /* SearchProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C60B1EE28A1A00000E3FD7E /* SearchProgressView.swift */; };
|
||||
0C64A4B4288903680079976D /* Base32 in Frameworks */ = {isa = PBXBuildFile; productRef = 0C64A4B3288903680079976D /* Base32 */; };
|
||||
0C64A4B7288903880079976D /* KeychainSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 0C64A4B6288903880079976D /* KeychainSwift */; };
|
||||
0C90E32C2888E5D000C0BC89 /* ActivityView in Frameworks */ = {isa = PBXBuildFile; productRef = 0C90E32B2888E5D000C0BC89 /* ActivityView */; };
|
||||
0CA05457288EE58200850554 /* SettingsSourceUrlView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA05456288EE58200850554 /* SettingsSourceUrlView.swift */; };
|
||||
0C733287289C4C820058D1FE /* SourceSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C733286289C4C820058D1FE /* SourceSettingsView.swift */; };
|
||||
0C7376F028A97D1400D60918 /* SwiftUIX in Frameworks */ = {isa = PBXBuildFile; productRef = 0C7376EF28A97D1400D60918 /* SwiftUIX */; };
|
||||
0C750744289B003E004B3906 /* SourceRssParser+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C750742289B003E004B3906 /* SourceRssParser+CoreDataClass.swift */; };
|
||||
0C750745289B003E004B3906 /* SourceRssParser+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C750743289B003E004B3906 /* SourceRssParser+CoreDataProperties.swift */; };
|
||||
0C794B67289DACB600DD1CC8 /* SourceUpdateButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C794B66289DACB600DD1CC8 /* SourceUpdateButtonView.swift */; };
|
||||
0C794B69289DACC800DD1CC8 /* InstalledSourceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C794B68289DACC800DD1CC8 /* InstalledSourceView.swift */; };
|
||||
0C794B6B289DACF100DD1CC8 /* SourceCatalogView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C794B6A289DACF100DD1CC8 /* SourceCatalogView.swift */; };
|
||||
0C794B6D289EFA2E00DD1CC8 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0C794B6C289EFA2E00DD1CC8 /* LaunchScreen.storyboard */; };
|
||||
0C79DC072899AF3C003F1C5A /* SourceSeedLeech+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C79DC052899AF3C003F1C5A /* SourceSeedLeech+CoreDataClass.swift */; };
|
||||
0C79DC082899AF3C003F1C5A /* SourceSeedLeech+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C79DC062899AF3C003F1C5A /* SourceSeedLeech+CoreDataProperties.swift */; };
|
||||
0C7D11FC28AA01E900ED92DB /* DynamicAccentColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C7D11FB28AA01E900ED92DB /* DynamicAccentColor.swift */; };
|
||||
0C7D11FE28AA03FE00ED92DB /* View.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C7D11FD28AA03FE00ED92DB /* View.swift */; };
|
||||
0C84F4772895BE680074B7C9 /* FerriteDB.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 0C84F4752895BE680074B7C9 /* FerriteDB.xcdatamodeld */; };
|
||||
0C84F4822895BFED0074B7C9 /* Source+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C84F47A2895BFED0074B7C9 /* Source+CoreDataClass.swift */; };
|
||||
0C84F4832895BFED0074B7C9 /* Source+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C84F47B2895BFED0074B7C9 /* Source+CoreDataProperties.swift */; };
|
||||
0C84F4842895BFED0074B7C9 /* SourceHtmlParser+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C84F47C2895BFED0074B7C9 /* SourceHtmlParser+CoreDataClass.swift */; };
|
||||
0C84F4852895BFED0074B7C9 /* SourceHtmlParser+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C84F47D2895BFED0074B7C9 /* SourceHtmlParser+CoreDataProperties.swift */; };
|
||||
0C84F4862895BFED0074B7C9 /* SourceList+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C84F47E2895BFED0074B7C9 /* SourceList+CoreDataClass.swift */; };
|
||||
0C84F4872895BFED0074B7C9 /* SourceList+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C84F47F2895BFED0074B7C9 /* SourceList+CoreDataProperties.swift */; };
|
||||
0C95D8D828A55B03005E22B3 /* DefaultActionsPickerViews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C95D8D728A55B03005E22B3 /* DefaultActionsPickerViews.swift */; };
|
||||
0C95D8DA28A55BB6005E22B3 /* SettingsModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C95D8D928A55BB6005E22B3 /* SettingsModels.swift */; };
|
||||
0CA05457288EE58200850554 /* SettingsSourceListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA05456288EE58200850554 /* SettingsSourceListView.swift */; };
|
||||
0CA05459288EE9E600850554 /* SourceManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA05458288EE9E600850554 /* SourceManager.swift */; };
|
||||
0CA0545B288EEA4E00850554 /* SourceListEditorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA0545A288EEA4E00850554 /* SourceListEditorView.swift */; };
|
||||
0CA148D6288903F000DE2211 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA148BB288903F000DE2211 /* SettingsView.swift */; };
|
||||
0CA148D7288903F000DE2211 /* LoginWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA148BC288903F000DE2211 /* LoginWebView.swift */; };
|
||||
0CA148D8288903F000DE2211 /* MagnetChoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA148BD288903F000DE2211 /* MagnetChoiceView.swift */; };
|
||||
0CA148D9288903F000DE2211 /* CardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA148BE288903F000DE2211 /* CardView.swift */; };
|
||||
0CA148DB288903F000DE2211 /* NavView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA148C1288903F000DE2211 /* NavView.swift */; };
|
||||
0CA148DC288903F000DE2211 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0CA148C2288903F000DE2211 /* Assets.xcassets */; };
|
||||
0CA148DD288903F000DE2211 /* ScrapingViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CA148C3288903F000DE2211 /* ScrapingViewModel.swift */; };
|
||||
|
|
@ -41,26 +65,48 @@
|
|||
0CAF1C7B286F5C8600296F86 /* SwiftSoup in Frameworks */ = {isa = PBXBuildFile; productRef = 0CAF1C7A286F5C8600296F86 /* SwiftSoup */; };
|
||||
0CBC76FD288D914F0054BE44 /* BatchChoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CBC76FC288D914F0054BE44 /* BatchChoiceView.swift */; };
|
||||
0CBC76FF288DAAD00054BE44 /* NavigationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CBC76FE288DAAD00054BE44 /* NavigationViewModel.swift */; };
|
||||
0CBC7702288DE4400054BE44 /* FerriteDB.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 0CBC7700288DE4400054BE44 /* FerriteDB.xcdatamodeld */; };
|
||||
0CBC7705288DE7F40054BE44 /* PersistenceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CBC7704288DE7F40054BE44 /* PersistenceController.swift */; };
|
||||
0CE37ABA288E4AE900428C2D /* TorrentSourceUrl+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE37AB8288E4AE900428C2D /* TorrentSourceUrl+CoreDataClass.swift */; };
|
||||
0CE37ABB288E4AE900428C2D /* TorrentSourceUrl+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE37AB9288E4AE900428C2D /* TorrentSourceUrl+CoreDataProperties.swift */; };
|
||||
0CF501F2289AE06A0099C785 /* SourceTracker+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CF501F0289AE06A0099C785 /* SourceTracker+CoreDataClass.swift */; };
|
||||
0CF501F3289AE06A0099C785 /* SourceTracker+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CF501F1289AE06A0099C785 /* SourceTracker+CoreDataProperties.swift */; };
|
||||
0CFEFCFD288A006200B3F490 /* GroupBoxStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CFEFCFC288A006200B3F490 /* GroupBoxStyle.swift */; };
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
/* Begin PBXFileReference section */
|
||||
0C0D50DF288DF7700035ECC8 /* TorrentSource+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TorrentSource+CoreDataClass.swift"; sourceTree = "<group>"; };
|
||||
0C0D50E0288DF7700035ECC8 /* TorrentSource+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TorrentSource+CoreDataProperties.swift"; sourceTree = "<group>"; };
|
||||
0C0D50E4288DFE7F0035ECC8 /* SourceModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceModels.swift; sourceTree = "<group>"; };
|
||||
0C0D50E6288DFF850035ECC8 /* SourceListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceListView.swift; sourceTree = "<group>"; };
|
||||
0C0D50E6288DFF850035ECC8 /* SourcesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourcesView.swift; sourceTree = "<group>"; };
|
||||
0C32FB522890D19D002BD219 /* AboutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutView.swift; sourceTree = "<group>"; };
|
||||
0C32FB542890D1BF002BD219 /* UIApplication.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIApplication.swift; sourceTree = "<group>"; };
|
||||
0C32FB562890D1F2002BD219 /* ListRowViews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListRowViews.swift; sourceTree = "<group>"; };
|
||||
0C4CFC4728970C8B00AD9FAD /* SourceComplexQuery+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceComplexQuery+CoreDataClass.swift"; sourceTree = "<group>"; };
|
||||
0C4CFC4828970C8B00AD9FAD /* SourceComplexQuery+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceComplexQuery+CoreDataProperties.swift"; sourceTree = "<group>"; };
|
||||
0C57D4CB289032ED008534E8 /* SearchResultRDView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultRDView.swift; sourceTree = "<group>"; };
|
||||
0CA05456288EE58200850554 /* SettingsSourceUrlView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsSourceUrlView.swift; sourceTree = "<group>"; };
|
||||
0C60B1EE28A1A00000E3FD7E /* SearchProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchProgressView.swift; sourceTree = "<group>"; };
|
||||
0C733286289C4C820058D1FE /* SourceSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceSettingsView.swift; sourceTree = "<group>"; };
|
||||
0C750742289B003E004B3906 /* SourceRssParser+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceRssParser+CoreDataClass.swift"; sourceTree = "<group>"; };
|
||||
0C750743289B003E004B3906 /* SourceRssParser+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceRssParser+CoreDataProperties.swift"; sourceTree = "<group>"; };
|
||||
0C794B66289DACB600DD1CC8 /* SourceUpdateButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceUpdateButtonView.swift; sourceTree = "<group>"; };
|
||||
0C794B68289DACC800DD1CC8 /* InstalledSourceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstalledSourceView.swift; sourceTree = "<group>"; };
|
||||
0C794B6A289DACF100DD1CC8 /* SourceCatalogView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceCatalogView.swift; sourceTree = "<group>"; };
|
||||
0C794B6C289EFA2E00DD1CC8 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
|
||||
0C79DC052899AF3C003F1C5A /* SourceSeedLeech+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceSeedLeech+CoreDataClass.swift"; sourceTree = "<group>"; };
|
||||
0C79DC062899AF3C003F1C5A /* SourceSeedLeech+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceSeedLeech+CoreDataProperties.swift"; sourceTree = "<group>"; };
|
||||
0C7D11FB28AA01E900ED92DB /* DynamicAccentColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DynamicAccentColor.swift; sourceTree = "<group>"; };
|
||||
0C7D11FD28AA03FE00ED92DB /* View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = View.swift; sourceTree = "<group>"; };
|
||||
0C84F4762895BE680074B7C9 /* FerriteDB.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = FerriteDB.xcdatamodel; sourceTree = "<group>"; };
|
||||
0C84F47A2895BFED0074B7C9 /* Source+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Source+CoreDataClass.swift"; sourceTree = "<group>"; };
|
||||
0C84F47B2895BFED0074B7C9 /* Source+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Source+CoreDataProperties.swift"; sourceTree = "<group>"; };
|
||||
0C84F47C2895BFED0074B7C9 /* SourceHtmlParser+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceHtmlParser+CoreDataClass.swift"; sourceTree = "<group>"; };
|
||||
0C84F47D2895BFED0074B7C9 /* SourceHtmlParser+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceHtmlParser+CoreDataProperties.swift"; sourceTree = "<group>"; };
|
||||
0C84F47E2895BFED0074B7C9 /* SourceList+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceList+CoreDataClass.swift"; sourceTree = "<group>"; };
|
||||
0C84F47F2895BFED0074B7C9 /* SourceList+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceList+CoreDataProperties.swift"; sourceTree = "<group>"; };
|
||||
0C95D8D728A55B03005E22B3 /* DefaultActionsPickerViews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultActionsPickerViews.swift; sourceTree = "<group>"; };
|
||||
0C95D8D928A55BB6005E22B3 /* SettingsModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsModels.swift; sourceTree = "<group>"; };
|
||||
0CA05456288EE58200850554 /* SettingsSourceListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsSourceListView.swift; sourceTree = "<group>"; };
|
||||
0CA05458288EE9E600850554 /* SourceManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceManager.swift; sourceTree = "<group>"; };
|
||||
0CA0545A288EEA4E00850554 /* SourceListEditorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceListEditorView.swift; sourceTree = "<group>"; };
|
||||
0CA148BB288903F000DE2211 /* SettingsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
|
||||
0CA148BC288903F000DE2211 /* LoginWebView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginWebView.swift; sourceTree = "<group>"; };
|
||||
0CA148BD288903F000DE2211 /* MagnetChoiceView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MagnetChoiceView.swift; sourceTree = "<group>"; };
|
||||
0CA148BE288903F000DE2211 /* CardView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CardView.swift; sourceTree = "<group>"; };
|
||||
0CA148C1288903F000DE2211 /* NavView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavView.swift; sourceTree = "<group>"; };
|
||||
0CA148C2288903F000DE2211 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
|
||||
0CA148C3288903F000DE2211 /* ScrapingViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScrapingViewModel.swift; sourceTree = "<group>"; };
|
||||
|
|
@ -80,10 +126,10 @@
|
|||
0CAF1C68286F5C0E00296F86 /* Ferrite.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Ferrite.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
0CBC76FC288D914F0054BE44 /* BatchChoiceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BatchChoiceView.swift; sourceTree = "<group>"; };
|
||||
0CBC76FE288DAAD00054BE44 /* NavigationViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationViewModel.swift; sourceTree = "<group>"; };
|
||||
0CBC7701288DE4400054BE44 /* FerriteDB.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = FerriteDB.xcdatamodel; sourceTree = "<group>"; };
|
||||
0CBC7704288DE7F40054BE44 /* PersistenceController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistenceController.swift; sourceTree = "<group>"; };
|
||||
0CE37AB8288E4AE900428C2D /* TorrentSourceUrl+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TorrentSourceUrl+CoreDataClass.swift"; sourceTree = "<group>"; };
|
||||
0CE37AB9288E4AE900428C2D /* TorrentSourceUrl+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TorrentSourceUrl+CoreDataProperties.swift"; sourceTree = "<group>"; };
|
||||
0CC6E4D428A45BA000AF2BCC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
|
||||
0CF501F0289AE06A0099C785 /* SourceTracker+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceTracker+CoreDataClass.swift"; sourceTree = "<group>"; };
|
||||
0CF501F1289AE06A0099C785 /* SourceTracker+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceTracker+CoreDataProperties.swift"; sourceTree = "<group>"; };
|
||||
0CFEFCFC288A006200B3F490 /* GroupBoxStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupBoxStyle.swift; sourceTree = "<group>"; };
|
||||
/* End PBXFileReference section */
|
||||
|
||||
|
|
@ -92,8 +138,9 @@
|
|||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
0C90E32C2888E5D000C0BC89 /* ActivityView in Frameworks */,
|
||||
0C64A4B4288903680079976D /* Base32 in Frameworks */,
|
||||
0C4CFC462897030D00AD9FAD /* Regex in Frameworks */,
|
||||
0C7376F028A97D1400D60918 /* SwiftUIX in Frameworks */,
|
||||
0C64A4B7288903880079976D /* KeychainSwift in Frameworks */,
|
||||
0CAF1C7B286F5C8600296F86 /* SwiftSoup in Frameworks */,
|
||||
);
|
||||
|
|
@ -105,10 +152,20 @@
|
|||
0C0D50DE288DF72D0035ECC8 /* Classes */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
0CE37AB8288E4AE900428C2D /* TorrentSourceUrl+CoreDataClass.swift */,
|
||||
0CE37AB9288E4AE900428C2D /* TorrentSourceUrl+CoreDataProperties.swift */,
|
||||
0C0D50DF288DF7700035ECC8 /* TorrentSource+CoreDataClass.swift */,
|
||||
0C0D50E0288DF7700035ECC8 /* TorrentSource+CoreDataProperties.swift */,
|
||||
0C750742289B003E004B3906 /* SourceRssParser+CoreDataClass.swift */,
|
||||
0C750743289B003E004B3906 /* SourceRssParser+CoreDataProperties.swift */,
|
||||
0CF501F0289AE06A0099C785 /* SourceTracker+CoreDataClass.swift */,
|
||||
0CF501F1289AE06A0099C785 /* SourceTracker+CoreDataProperties.swift */,
|
||||
0C79DC052899AF3C003F1C5A /* SourceSeedLeech+CoreDataClass.swift */,
|
||||
0C79DC062899AF3C003F1C5A /* SourceSeedLeech+CoreDataProperties.swift */,
|
||||
0C4CFC4728970C8B00AD9FAD /* SourceComplexQuery+CoreDataClass.swift */,
|
||||
0C4CFC4828970C8B00AD9FAD /* SourceComplexQuery+CoreDataProperties.swift */,
|
||||
0C84F47A2895BFED0074B7C9 /* Source+CoreDataClass.swift */,
|
||||
0C84F47B2895BFED0074B7C9 /* Source+CoreDataProperties.swift */,
|
||||
0C84F47C2895BFED0074B7C9 /* SourceHtmlParser+CoreDataClass.swift */,
|
||||
0C84F47D2895BFED0074B7C9 /* SourceHtmlParser+CoreDataProperties.swift */,
|
||||
0C84F47E2895BFED0074B7C9 /* SourceList+CoreDataClass.swift */,
|
||||
0C84F47F2895BFED0074B7C9 /* SourceList+CoreDataProperties.swift */,
|
||||
);
|
||||
path = Classes;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -118,15 +175,28 @@
|
|||
children = (
|
||||
0CA148C4288903F000DE2211 /* RealDebridModels.swift */,
|
||||
0C0D50E4288DFE7F0035ECC8 /* SourceModels.swift */,
|
||||
0C95D8D928A55BB6005E22B3 /* SettingsModels.swift */,
|
||||
);
|
||||
path = Models;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
0C794B65289DAC9F00DD1CC8 /* SourceViews */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
0C733286289C4C820058D1FE /* SourceSettingsView.swift */,
|
||||
0C794B66289DACB600DD1CC8 /* SourceUpdateButtonView.swift */,
|
||||
0C794B68289DACC800DD1CC8 /* InstalledSourceView.swift */,
|
||||
0C794B6A289DACF100DD1CC8 /* SourceCatalogView.swift */,
|
||||
);
|
||||
path = SourceViews;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
0CA0545C288F7CB200850554 /* SettingsViews */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
0CA05456288EE58200850554 /* SettingsSourceUrlView.swift */,
|
||||
0CA05456288EE58200850554 /* SettingsSourceListView.swift */,
|
||||
0CA0545A288EEA4E00850554 /* SourceListEditorView.swift */,
|
||||
0C95D8D728A55B03005E22B3 /* DefaultActionsPickerViews.swift */,
|
||||
);
|
||||
path = SettingsViews;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -134,6 +204,7 @@
|
|||
0CA148BA288903F000DE2211 /* Ferrite */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
0CC6E4D428A45BA000AF2BCC /* Info.plist */,
|
||||
0CBC7703288DE7E90054BE44 /* DataManagement */,
|
||||
0CA148F12889066000DE2211 /* API */,
|
||||
0C0D50E3288DFE6E0035ECC8 /* Models */,
|
||||
|
|
@ -142,6 +213,7 @@
|
|||
0CA148C8288903F000DE2211 /* Extensions */,
|
||||
0CA148C5288903F000DE2211 /* Preview Content */,
|
||||
0CA148C7288903F000DE2211 /* FerriteApp.swift */,
|
||||
0C794B6C289EFA2E00DD1CC8 /* LaunchScreen.storyboard */,
|
||||
0CA148C2288903F000DE2211 /* Assets.xcassets */,
|
||||
);
|
||||
path = Ferrite;
|
||||
|
|
@ -152,6 +224,8 @@
|
|||
children = (
|
||||
0CA148C1288903F000DE2211 /* NavView.swift */,
|
||||
0CFEFCFC288A006200B3F490 /* GroupBoxStyle.swift */,
|
||||
0C32FB562890D1F2002BD219 /* ListRowViews.swift */,
|
||||
0C7D11FB28AA01E900ED92DB /* DynamicAccentColor.swift */,
|
||||
);
|
||||
path = CommonViews;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -170,6 +244,8 @@
|
|||
0CA148C9288903F000DE2211 /* Collection.swift */,
|
||||
0CA148CA288903F000DE2211 /* Data.swift */,
|
||||
0CA148CB288903F000DE2211 /* Task.swift */,
|
||||
0C32FB542890D1BF002BD219 /* UIApplication.swift */,
|
||||
0C7D11FD28AA03FE00ED92DB /* View.swift */,
|
||||
);
|
||||
path = Extensions;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -177,6 +253,7 @@
|
|||
0CA148EE2889061200DE2211 /* Views */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
0C794B65289DAC9F00DD1CC8 /* SourceViews */,
|
||||
0CA148F02889062700DE2211 /* RepresentableViews */,
|
||||
0CA148C0288903F000DE2211 /* CommonViews */,
|
||||
0CA0545C288F7CB200850554 /* SettingsViews */,
|
||||
|
|
@ -185,11 +262,12 @@
|
|||
0CA148D4288903F000DE2211 /* ContentView.swift */,
|
||||
0CA148D1288903F000DE2211 /* MainView.swift */,
|
||||
0CA148BB288903F000DE2211 /* SettingsView.swift */,
|
||||
0CA148BE288903F000DE2211 /* CardView.swift */,
|
||||
0CA148BC288903F000DE2211 /* LoginWebView.swift */,
|
||||
0CBC76FC288D914F0054BE44 /* BatchChoiceView.swift */,
|
||||
0CA148BD288903F000DE2211 /* MagnetChoiceView.swift */,
|
||||
0C0D50E6288DFF850035ECC8 /* SourceListView.swift */,
|
||||
0C0D50E6288DFF850035ECC8 /* SourcesView.swift */,
|
||||
0C32FB522890D19D002BD219 /* AboutView.swift */,
|
||||
0C60B1EE28A1A00000E3FD7E /* SearchProgressView.swift */,
|
||||
);
|
||||
path = Views;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -243,7 +321,7 @@
|
|||
children = (
|
||||
0C0D50DE288DF72D0035ECC8 /* Classes */,
|
||||
0CBC7704288DE7F40054BE44 /* PersistenceController.swift */,
|
||||
0CBC7700288DE4400054BE44 /* FerriteDB.xcdatamodeld */,
|
||||
0C84F4752895BE680074B7C9 /* FerriteDB.xcdatamodeld */,
|
||||
);
|
||||
path = DataManagement;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -266,9 +344,10 @@
|
|||
name = Ferrite;
|
||||
packageProductDependencies = (
|
||||
0CAF1C7A286F5C8600296F86 /* SwiftSoup */,
|
||||
0C90E32B2888E5D000C0BC89 /* ActivityView */,
|
||||
0C64A4B3288903680079976D /* Base32 */,
|
||||
0C64A4B6288903880079976D /* KeychainSwift */,
|
||||
0C4CFC452897030D00AD9FAD /* Regex */,
|
||||
0C7376EF28A97D1400D60918 /* SwiftUIX */,
|
||||
);
|
||||
productName = Torrenter;
|
||||
productReference = 0CAF1C68286F5C0E00296F86 /* Ferrite.app */;
|
||||
|
|
@ -300,9 +379,10 @@
|
|||
mainGroup = 0CAF1C5F286F5C0D00296F86;
|
||||
packageReferences = (
|
||||
0CAF1C79286F5C8600296F86 /* XCRemoteSwiftPackageReference "SwiftSoup" */,
|
||||
0C90E32A2888E5D000C0BC89 /* XCRemoteSwiftPackageReference "ActivityView" */,
|
||||
0C64A4B2288903680079976D /* XCRemoteSwiftPackageReference "Base32" */,
|
||||
0C64A4B5288903880079976D /* XCRemoteSwiftPackageReference "keychain-swift" */,
|
||||
0C4CFC442897030D00AD9FAD /* XCRemoteSwiftPackageReference "Regex" */,
|
||||
0C7376EE28A97D1400D60918 /* XCRemoteSwiftPackageReference "SwiftUIX" */,
|
||||
);
|
||||
productRefGroup = 0CAF1C69286F5C0E00296F86 /* Products */;
|
||||
projectDirPath = "";
|
||||
|
|
@ -318,6 +398,7 @@
|
|||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
0C794B6D289EFA2E00DD1CC8 /* LaunchScreen.storyboard in Resources */,
|
||||
0CA148DF288903F000DE2211 /* Preview Assets.xcassets in Resources */,
|
||||
0CA148DC288903F000DE2211 /* Assets.xcassets in Resources */,
|
||||
);
|
||||
|
|
@ -330,38 +411,59 @@
|
|||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
0CE37ABB288E4AE900428C2D /* TorrentSourceUrl+CoreDataProperties.swift in Sources */,
|
||||
0C0D50E5288DFE7F0035ECC8 /* SourceModels.swift in Sources */,
|
||||
0C60B1EF28A1A00000E3FD7E /* SearchProgressView.swift in Sources */,
|
||||
0C32FB532890D19D002BD219 /* AboutView.swift in Sources */,
|
||||
0C84F4832895BFED0074B7C9 /* Source+CoreDataProperties.swift in Sources */,
|
||||
0CA148DB288903F000DE2211 /* NavView.swift in Sources */,
|
||||
0C750745289B003E004B3906 /* SourceRssParser+CoreDataProperties.swift in Sources */,
|
||||
0CBC7705288DE7F40054BE44 /* PersistenceController.swift in Sources */,
|
||||
0CA0545B288EEA4E00850554 /* SourceListEditorView.swift in Sources */,
|
||||
0C84F4872895BFED0074B7C9 /* SourceList+CoreDataProperties.swift in Sources */,
|
||||
0C794B6B289DACF100DD1CC8 /* SourceCatalogView.swift in Sources */,
|
||||
0CA148E9288903F000DE2211 /* MainView.swift in Sources */,
|
||||
0CBC76FD288D914F0054BE44 /* BatchChoiceView.swift in Sources */,
|
||||
0C0D50E7288DFF850035ECC8 /* SourceListView.swift in Sources */,
|
||||
0CF501F2289AE06A0099C785 /* SourceTracker+CoreDataClass.swift in Sources */,
|
||||
0C32FB552890D1BF002BD219 /* UIApplication.swift in Sources */,
|
||||
0C7D11FE28AA03FE00ED92DB /* View.swift in Sources */,
|
||||
0C0D50E7288DFF850035ECC8 /* SourcesView.swift in Sources */,
|
||||
0CA148EC288903F000DE2211 /* ContentView.swift in Sources */,
|
||||
0C95D8D828A55B03005E22B3 /* DefaultActionsPickerViews.swift in Sources */,
|
||||
0CA148E1288903F000DE2211 /* Collection.swift in Sources */,
|
||||
0C750744289B003E004B3906 /* SourceRssParser+CoreDataClass.swift in Sources */,
|
||||
0C794B69289DACC800DD1CC8 /* InstalledSourceView.swift in Sources */,
|
||||
0C79DC082899AF3C003F1C5A /* SourceSeedLeech+CoreDataProperties.swift in Sources */,
|
||||
0CA148DD288903F000DE2211 /* ScrapingViewModel.swift in Sources */,
|
||||
0CA148D8288903F000DE2211 /* MagnetChoiceView.swift in Sources */,
|
||||
0C84F4862895BFED0074B7C9 /* SourceList+CoreDataClass.swift in Sources */,
|
||||
0C95D8DA28A55BB6005E22B3 /* SettingsModels.swift in Sources */,
|
||||
0CA148E3288903F000DE2211 /* Task.swift in Sources */,
|
||||
0CA148E7288903F000DE2211 /* ToastViewModel.swift in Sources */,
|
||||
0CFEFCFD288A006200B3F490 /* GroupBoxStyle.swift in Sources */,
|
||||
0CE37ABA288E4AE900428C2D /* TorrentSourceUrl+CoreDataClass.swift in Sources */,
|
||||
0C79DC072899AF3C003F1C5A /* SourceSeedLeech+CoreDataClass.swift in Sources */,
|
||||
0C794B67289DACB600DD1CC8 /* SourceUpdateButtonView.swift in Sources */,
|
||||
0CA148E6288903F000DE2211 /* WebView.swift in Sources */,
|
||||
0C4CFC4E28970C8B00AD9FAD /* SourceComplexQuery+CoreDataProperties.swift in Sources */,
|
||||
0CA148E2288903F000DE2211 /* Data.swift in Sources */,
|
||||
0C0D50E1288DF7700035ECC8 /* TorrentSource+CoreDataClass.swift in Sources */,
|
||||
0C57D4CC289032ED008534E8 /* SearchResultRDView.swift in Sources */,
|
||||
0C7D11FC28AA01E900ED92DB /* DynamicAccentColor.swift in Sources */,
|
||||
0CA05459288EE9E600850554 /* SourceManager.swift in Sources */,
|
||||
0CA05457288EE58200850554 /* SettingsSourceUrlView.swift in Sources */,
|
||||
0C84F4772895BE680074B7C9 /* FerriteDB.xcdatamodeld in Sources */,
|
||||
0C733287289C4C820058D1FE /* SourceSettingsView.swift in Sources */,
|
||||
0CA05457288EE58200850554 /* SettingsSourceListView.swift in Sources */,
|
||||
0CF501F3289AE06A0099C785 /* SourceTracker+CoreDataProperties.swift in Sources */,
|
||||
0CA148DE288903F000DE2211 /* RealDebridModels.swift in Sources */,
|
||||
0CBC76FF288DAAD00054BE44 /* NavigationViewModel.swift in Sources */,
|
||||
0C4CFC4D28970C8B00AD9FAD /* SourceComplexQuery+CoreDataClass.swift in Sources */,
|
||||
0CA148E8288903F000DE2211 /* RealDebridWrapper.swift in Sources */,
|
||||
0CA148D6288903F000DE2211 /* SettingsView.swift in Sources */,
|
||||
0CA148E5288903F000DE2211 /* DebridManager.swift in Sources */,
|
||||
0CBC7702288DE4400054BE44 /* FerriteDB.xcdatamodeld in Sources */,
|
||||
0CA148D9288903F000DE2211 /* CardView.swift in Sources */,
|
||||
0C84F4842895BFED0074B7C9 /* SourceHtmlParser+CoreDataClass.swift in Sources */,
|
||||
0C32FB572890D1F2002BD219 /* ListRowViews.swift in Sources */,
|
||||
0C84F4822895BFED0074B7C9 /* Source+CoreDataClass.swift in Sources */,
|
||||
0C84F4852895BFED0074B7C9 /* SourceHtmlParser+CoreDataProperties.swift in Sources */,
|
||||
0CA148EB288903F000DE2211 /* SearchResultsView.swift in Sources */,
|
||||
0CA148D7288903F000DE2211 /* LoginWebView.swift in Sources */,
|
||||
0C0D50E2288DF7700035ECC8 /* TorrentSource+CoreDataProperties.swift in Sources */,
|
||||
0CA148E0288903F000DE2211 /* FerriteApp.swift in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
|
|
@ -419,7 +521,7 @@
|
|||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
|
||||
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
|
||||
MTL_FAST_MATH = YES;
|
||||
ONLY_ACTIVE_ARCH = YES;
|
||||
|
|
@ -473,7 +575,7 @@
|
|||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
|
||||
MTL_ENABLE_DEBUG_INFO = NO;
|
||||
MTL_FAST_MATH = YES;
|
||||
SDKROOT = iphoneos;
|
||||
|
|
@ -489,23 +591,25 @@
|
|||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 3;
|
||||
CURRENT_PROJECT_VERSION = 8;
|
||||
DEVELOPMENT_ASSET_PATHS = "\"Ferrite/Preview Content\"";
|
||||
DEVELOPMENT_TEAM = 8A74DBQ6S3;
|
||||
ENABLE_PREVIEWS = YES;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = Ferrite/Info.plist;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = Ferrite;
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.entertainment";
|
||||
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
|
||||
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
|
||||
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
|
||||
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
|
||||
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
|
||||
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 0.1.0;
|
||||
MARKETING_VERSION = 0.3.3;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = me.kingbri.Ferrite;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_EMIT_LOC_STRINGS = YES;
|
||||
|
|
@ -520,23 +624,25 @@
|
|||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||
CODE_SIGN_STYLE = Automatic;
|
||||
CURRENT_PROJECT_VERSION = 3;
|
||||
CURRENT_PROJECT_VERSION = 8;
|
||||
DEVELOPMENT_ASSET_PATHS = "\"Ferrite/Preview Content\"";
|
||||
DEVELOPMENT_TEAM = 8A74DBQ6S3;
|
||||
ENABLE_PREVIEWS = YES;
|
||||
GENERATE_INFOPLIST_FILE = YES;
|
||||
INFOPLIST_FILE = Ferrite/Info.plist;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = Ferrite;
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.entertainment";
|
||||
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
|
||||
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
|
||||
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
|
||||
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
|
||||
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
|
||||
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 0.1.0;
|
||||
MARKETING_VERSION = 0.3.3;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = me.kingbri.Ferrite;
|
||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||
SWIFT_EMIT_LOC_STRINGS = YES;
|
||||
|
|
@ -569,6 +675,14 @@
|
|||
/* End XCConfigurationList section */
|
||||
|
||||
/* Begin XCRemoteSwiftPackageReference section */
|
||||
0C4CFC442897030D00AD9FAD /* XCRemoteSwiftPackageReference "Regex" */ = {
|
||||
isa = XCRemoteSwiftPackageReference;
|
||||
repositoryURL = "https://github.com/sindresorhus/Regex";
|
||||
requirement = {
|
||||
branch = main;
|
||||
kind = branch;
|
||||
};
|
||||
};
|
||||
0C64A4B2288903680079976D /* XCRemoteSwiftPackageReference "Base32" */ = {
|
||||
isa = XCRemoteSwiftPackageReference;
|
||||
repositoryURL = "https://github.com/norio-nomura/Base32";
|
||||
|
|
@ -585,12 +699,12 @@
|
|||
kind = branch;
|
||||
};
|
||||
};
|
||||
0C90E32A2888E5D000C0BC89 /* XCRemoteSwiftPackageReference "ActivityView" */ = {
|
||||
0C7376EE28A97D1400D60918 /* XCRemoteSwiftPackageReference "SwiftUIX" */ = {
|
||||
isa = XCRemoteSwiftPackageReference;
|
||||
repositoryURL = "https://github.com/SwiftUI-Plus/ActivityView.git";
|
||||
repositoryURL = "https://github.com/SwiftUIX/SwiftUIX";
|
||||
requirement = {
|
||||
kind = upToNextMajorVersion;
|
||||
minimumVersion = 1.0.0;
|
||||
branch = master;
|
||||
kind = branch;
|
||||
};
|
||||
};
|
||||
0CAF1C79286F5C8600296F86 /* XCRemoteSwiftPackageReference "SwiftSoup" */ = {
|
||||
|
|
@ -604,6 +718,11 @@
|
|||
/* End XCRemoteSwiftPackageReference section */
|
||||
|
||||
/* Begin XCSwiftPackageProductDependency section */
|
||||
0C4CFC452897030D00AD9FAD /* Regex */ = {
|
||||
isa = XCSwiftPackageProductDependency;
|
||||
package = 0C4CFC442897030D00AD9FAD /* XCRemoteSwiftPackageReference "Regex" */;
|
||||
productName = Regex;
|
||||
};
|
||||
0C64A4B3288903680079976D /* Base32 */ = {
|
||||
isa = XCSwiftPackageProductDependency;
|
||||
package = 0C64A4B2288903680079976D /* XCRemoteSwiftPackageReference "Base32" */;
|
||||
|
|
@ -614,10 +733,10 @@
|
|||
package = 0C64A4B5288903880079976D /* XCRemoteSwiftPackageReference "keychain-swift" */;
|
||||
productName = KeychainSwift;
|
||||
};
|
||||
0C90E32B2888E5D000C0BC89 /* ActivityView */ = {
|
||||
0C7376EF28A97D1400D60918 /* SwiftUIX */ = {
|
||||
isa = XCSwiftPackageProductDependency;
|
||||
package = 0C90E32A2888E5D000C0BC89 /* XCRemoteSwiftPackageReference "ActivityView" */;
|
||||
productName = ActivityView;
|
||||
package = 0C7376EE28A97D1400D60918 /* XCRemoteSwiftPackageReference "SwiftUIX" */;
|
||||
productName = SwiftUIX;
|
||||
};
|
||||
0CAF1C7A286F5C8600296F86 /* SwiftSoup */ = {
|
||||
isa = XCSwiftPackageProductDependency;
|
||||
|
|
@ -627,12 +746,12 @@
|
|||
/* End XCSwiftPackageProductDependency section */
|
||||
|
||||
/* Begin XCVersionGroup section */
|
||||
0CBC7700288DE4400054BE44 /* FerriteDB.xcdatamodeld */ = {
|
||||
0C84F4752895BE680074B7C9 /* FerriteDB.xcdatamodeld */ = {
|
||||
isa = XCVersionGroup;
|
||||
children = (
|
||||
0CBC7701288DE4400054BE44 /* FerriteDB.xcdatamodel */,
|
||||
0C84F4762895BE680074B7C9 /* FerriteDB.xcdatamodel */,
|
||||
);
|
||||
currentVersion = 0CBC7701288DE4400054BE44 /* FerriteDB.xcdatamodel */;
|
||||
currentVersion = 0C84F4762895BE680074B7C9 /* FerriteDB.xcdatamodel */;
|
||||
path = FerriteDB.xcdatamodeld;
|
||||
sourceTree = "<group>";
|
||||
versionGroupType = wrapper.xcdatamodel;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"filename" : "Ferrite-lg.png",
|
||||
"idiom" : "universal",
|
||||
"platform" : "ios",
|
||||
"size" : "1024x1024"
|
||||
|
|
|
|||
BIN
Ferrite/Assets.xcassets/AppIcon.appiconset/Ferrite-lg.png
Normal file
BIN
Ferrite/Assets.xcassets/AppIcon.appiconset/Ferrite-lg.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 79 KiB |
21
Ferrite/Assets.xcassets/AppImages/AppImage.imageset/Contents.json
vendored
Normal file
21
Ferrite/Assets.xcassets/AppImages/AppImage.imageset/Contents.json
vendored
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "Ferrite-180.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
||||
BIN
Ferrite/Assets.xcassets/AppImages/AppImage.imageset/Ferrite-180.png
vendored
Normal file
BIN
Ferrite/Assets.xcassets/AppImages/AppImage.imageset/Ferrite-180.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 9.5 KiB |
21
Ferrite/Assets.xcassets/AppImages/AppImageRounded.imageset/Contents.json
vendored
Normal file
21
Ferrite/Assets.xcassets/AppImages/AppImageRounded.imageset/Contents.json
vendored
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"filename" : "Ferrite-180-rounded.png",
|
||||
"idiom" : "universal",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
||||
BIN
Ferrite/Assets.xcassets/AppImages/AppImageRounded.imageset/Ferrite-180-rounded.png
vendored
Normal file
BIN
Ferrite/Assets.xcassets/AppImages/AppImageRounded.imageset/Ferrite-180-rounded.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
6
Ferrite/Assets.xcassets/AppImages/Contents.json
Normal file
6
Ferrite/Assets.xcassets/AppImages/Contents.json
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
||||
13
Ferrite/DataManagement/Classes/Source+CoreDataClass.swift
Normal file
13
Ferrite/DataManagement/Classes/Source+CoreDataClass.swift
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
//
|
||||
// Source+CoreDataClass.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 7/30/22.
|
||||
//
|
||||
//
|
||||
|
||||
import CoreData
|
||||
import Foundation
|
||||
|
||||
@objc(Source)
|
||||
public class Source: NSManagedObject {}
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
//
|
||||
// Source+CoreDataProperties.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 8/3/22.
|
||||
//
|
||||
//
|
||||
|
||||
import CoreData
|
||||
import Foundation
|
||||
|
||||
public extension Source {
|
||||
@nonobjc class func fetchRequest() -> NSFetchRequest<Source> {
|
||||
NSFetchRequest<Source>(entityName: "Source")
|
||||
}
|
||||
|
||||
@NSManaged var id: UUID
|
||||
@NSManaged var baseUrl: String?
|
||||
@NSManaged var dynamicBaseUrl: Bool
|
||||
@NSManaged var enabled: Bool
|
||||
@NSManaged var name: String
|
||||
@NSManaged var author: String
|
||||
@NSManaged var listId: UUID?
|
||||
@NSManaged var preferredParser: Int16
|
||||
@NSManaged var version: Int16
|
||||
@NSManaged var htmlParser: SourceHtmlParser?
|
||||
@NSManaged var rssParser: SourceRssParser?
|
||||
@NSManaged var api: SourceApi?
|
||||
}
|
||||
|
||||
extension Source: Identifiable {}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
//
|
||||
// SourceComplexQuery+CoreDataClass.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 7/31/22.
|
||||
//
|
||||
//
|
||||
|
||||
import CoreData
|
||||
import Foundation
|
||||
|
||||
@objc(SourceComplexQuery)
|
||||
public class SourceComplexQuery: NSManagedObject {}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
//
|
||||
// SourceComplexQuery+CoreDataProperties.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 7/31/22.
|
||||
//
|
||||
//
|
||||
|
||||
import CoreData
|
||||
import Foundation
|
||||
|
||||
public extension SourceComplexQuery {
|
||||
@nonobjc class func fetchRequest() -> NSFetchRequest<SourceComplexQuery> {
|
||||
NSFetchRequest<SourceComplexQuery>(entityName: "SourceComplexQuery")
|
||||
}
|
||||
|
||||
@NSManaged var attribute: String
|
||||
@NSManaged var lookupAttribute: String?
|
||||
@NSManaged var query: String
|
||||
@NSManaged var regex: String?
|
||||
}
|
||||
|
||||
extension SourceComplexQuery: Identifiable {}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
//
|
||||
// SourceHtmlParser+CoreDataClass.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 7/30/22.
|
||||
//
|
||||
//
|
||||
|
||||
import CoreData
|
||||
import Foundation
|
||||
|
||||
@objc(SourceHtmlParser)
|
||||
public class SourceHtmlParser: NSManagedObject {}
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
//
|
||||
// SourceHtmlParser+CoreDataProperties.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 8/3/22.
|
||||
//
|
||||
//
|
||||
|
||||
import CoreData
|
||||
import Foundation
|
||||
|
||||
public extension SourceHtmlParser {
|
||||
@nonobjc class func fetchRequest() -> NSFetchRequest<SourceHtmlParser> {
|
||||
NSFetchRequest<SourceHtmlParser>(entityName: "SourceHtmlParser")
|
||||
}
|
||||
|
||||
@NSManaged var rows: String
|
||||
@NSManaged var searchUrl: String
|
||||
@NSManaged var magnetLink: SourceMagnetLink?
|
||||
@NSManaged var parentSource: Source?
|
||||
@NSManaged var seedLeech: SourceSeedLeech?
|
||||
@NSManaged var size: SourceSize?
|
||||
@NSManaged var title: SourceTitle?
|
||||
@NSManaged var magnetHash: SourceMagnetHash?
|
||||
@NSManaged var trackers: NSSet?
|
||||
}
|
||||
|
||||
// MARK: Generated accessors for trackers
|
||||
|
||||
public extension SourceHtmlParser {
|
||||
@objc(addTrackersObject:)
|
||||
@NSManaged func addToTrackers(_ value: SourceTracker)
|
||||
|
||||
@objc(removeTrackersObject:)
|
||||
@NSManaged func removeFromTrackers(_ value: SourceTracker)
|
||||
|
||||
@objc(addTrackers:)
|
||||
@NSManaged func addToTrackers(_ values: NSSet)
|
||||
|
||||
@objc(removeTrackers:)
|
||||
@NSManaged func removeFromTrackers(_ values: NSSet)
|
||||
}
|
||||
|
||||
extension SourceHtmlParser: Identifiable {}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
//
|
||||
// SourceList+CoreDataClass.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 7/30/22.
|
||||
//
|
||||
//
|
||||
|
||||
import CoreData
|
||||
import Foundation
|
||||
|
||||
@objc(SourceList)
|
||||
public class SourceList: NSManagedObject {}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
//
|
||||
// SourceList+CoreDataProperties.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 7/30/22.
|
||||
//
|
||||
//
|
||||
|
||||
import CoreData
|
||||
import Foundation
|
||||
|
||||
public extension SourceList {
|
||||
@nonobjc class func fetchRequest() -> NSFetchRequest<SourceList> {
|
||||
NSFetchRequest<SourceList>(entityName: "SourceList")
|
||||
}
|
||||
|
||||
@NSManaged var id: UUID
|
||||
@NSManaged var author: String
|
||||
@NSManaged var name: String
|
||||
@NSManaged var urlString: String
|
||||
}
|
||||
|
||||
extension SourceList: Identifiable {}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
//
|
||||
// SourceRssParser+CoreDataClass.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 8/3/22.
|
||||
//
|
||||
//
|
||||
|
||||
import CoreData
|
||||
import Foundation
|
||||
|
||||
@objc(SourceRssParser)
|
||||
public class SourceRssParser: NSManagedObject {}
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
//
|
||||
// SourceRssParser+CoreDataProperties.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 8/3/22.
|
||||
//
|
||||
//
|
||||
|
||||
import CoreData
|
||||
import Foundation
|
||||
|
||||
public extension SourceRssParser {
|
||||
@nonobjc class func fetchRequest() -> NSFetchRequest<SourceRssParser> {
|
||||
NSFetchRequest<SourceRssParser>(entityName: "SourceRssParser")
|
||||
}
|
||||
|
||||
@NSManaged var items: String
|
||||
@NSManaged var searchUrl: String
|
||||
@NSManaged var rssUrl: String?
|
||||
@NSManaged var parentSource: Source?
|
||||
@NSManaged var trackers: NSSet?
|
||||
@NSManaged var magnetLink: SourceMagnetLink?
|
||||
@NSManaged var size: SourceSize?
|
||||
@NSManaged var title: SourceTitle?
|
||||
@NSManaged var seedLeech: SourceSeedLeech?
|
||||
@NSManaged var magnetHash: SourceMagnetHash?
|
||||
|
||||
internal var trackerArray: [SourceTracker] {
|
||||
let trackerSet = trackers as? Set<SourceTracker> ?? []
|
||||
|
||||
return trackerSet.map { $0 }
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: Generated accessors for trackers
|
||||
|
||||
public extension SourceRssParser {
|
||||
@objc(addTrackersObject:)
|
||||
@NSManaged func addToTrackers(_ value: SourceTracker)
|
||||
|
||||
@objc(removeTrackersObject:)
|
||||
@NSManaged func removeFromTrackers(_ value: SourceTracker)
|
||||
|
||||
@objc(addTrackers:)
|
||||
@NSManaged func addToTrackers(_ values: NSSet)
|
||||
|
||||
@objc(removeTrackers:)
|
||||
@NSManaged func removeFromTrackers(_ values: NSSet)
|
||||
}
|
||||
|
||||
extension SourceRssParser: Identifiable {}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
//
|
||||
// SourceSeedLeech+CoreDataClass.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 8/2/22.
|
||||
//
|
||||
//
|
||||
|
||||
import CoreData
|
||||
import Foundation
|
||||
|
||||
@objc(SourceSeedLeech)
|
||||
public class SourceSeedLeech: NSManagedObject {}
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
//
|
||||
// SourceSeedLeech+CoreDataProperties.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 8/2/22.
|
||||
//
|
||||
//
|
||||
|
||||
import CoreData
|
||||
import Foundation
|
||||
|
||||
public extension SourceSeedLeech {
|
||||
@nonobjc class func fetchRequest() -> NSFetchRequest<SourceSeedLeech> {
|
||||
NSFetchRequest<SourceSeedLeech>(entityName: "SourceSeedLeech")
|
||||
}
|
||||
|
||||
@NSManaged var combined: String?
|
||||
@NSManaged var leecherRegex: String?
|
||||
@NSManaged var leechers: String?
|
||||
@NSManaged var seederRegex: String?
|
||||
@NSManaged var seeders: String?
|
||||
@NSManaged var attribute: String
|
||||
@NSManaged var lookupAttribute: String?
|
||||
@NSManaged var parentParser: SourceHtmlParser?
|
||||
}
|
||||
|
||||
extension SourceSeedLeech: Identifiable {}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
//
|
||||
// SourceTracker+CoreDataClass.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 8/3/22.
|
||||
//
|
||||
//
|
||||
|
||||
import CoreData
|
||||
import Foundation
|
||||
|
||||
@objc(SourceTracker)
|
||||
public class SourceTracker: NSManagedObject {}
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
//
|
||||
// SourceTracker+CoreDataProperties.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 8/3/22.
|
||||
//
|
||||
//
|
||||
|
||||
import CoreData
|
||||
import Foundation
|
||||
|
||||
public extension SourceTracker {
|
||||
@nonobjc class func fetchRequest() -> NSFetchRequest<SourceTracker> {
|
||||
NSFetchRequest<SourceTracker>(entityName: "SourceTracker")
|
||||
}
|
||||
|
||||
@NSManaged var urlString: String
|
||||
@NSManaged var parentRssParser: SourceRssParser?
|
||||
@NSManaged var parentHtmlParser: SourceHtmlParser?
|
||||
}
|
||||
|
||||
extension SourceTracker: Identifiable {}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
//
|
||||
// TorrentSource+CoreDataClass.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 7/24/22.
|
||||
//
|
||||
//
|
||||
|
||||
import CoreData
|
||||
import Foundation
|
||||
|
||||
@objc(TorrentSource)
|
||||
public class TorrentSource: NSManagedObject {}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
//
|
||||
// TorrentSource+CoreDataProperties.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 7/24/22.
|
||||
//
|
||||
//
|
||||
|
||||
import CoreData
|
||||
import Foundation
|
||||
|
||||
public extension TorrentSource {
|
||||
@nonobjc class func fetchRequest() -> NSFetchRequest<TorrentSource> {
|
||||
NSFetchRequest<TorrentSource>(entityName: "TorrentSource")
|
||||
}
|
||||
|
||||
@NSManaged var enabled: Bool
|
||||
@NSManaged var linkQuery: String
|
||||
@NSManaged var name: String?
|
||||
@NSManaged var rowQuery: String
|
||||
@NSManaged var sizeQuery: String?
|
||||
@NSManaged var titleQuery: String?
|
||||
@NSManaged var url: String
|
||||
}
|
||||
|
||||
extension TorrentSource: Identifiable {}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
//
|
||||
// TorrentSourceUrl+CoreDataClass.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 7/24/22.
|
||||
//
|
||||
//
|
||||
|
||||
import CoreData
|
||||
import Foundation
|
||||
|
||||
@objc(TorrentSourceUrl)
|
||||
public class TorrentSourceUrl: NSManagedObject {}
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
//
|
||||
// TorrentSourceUrl+CoreDataProperties.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 7/25/22.
|
||||
//
|
||||
//
|
||||
|
||||
import CoreData
|
||||
import Foundation
|
||||
|
||||
public extension TorrentSourceUrl {
|
||||
@nonobjc class func fetchRequest() -> NSFetchRequest<TorrentSourceUrl> {
|
||||
NSFetchRequest<TorrentSourceUrl>(entityName: "TorrentSourceUrl")
|
||||
}
|
||||
|
||||
@NSManaged var urlString: String
|
||||
@NSManaged var repoName: String?
|
||||
@NSManaged var repoAuthor: String?
|
||||
}
|
||||
|
||||
extension TorrentSourceUrl: Identifiable {}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>_XCCurrentVersionName</key>
|
||||
<string>FerriteDB.xcdatamodel</string>
|
||||
</dict>
|
||||
</plist>
|
||||
|
|
@ -1,17 +1,91 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="21256.2" systemVersion="21F79" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
|
||||
<entity name="TorrentSource" representedClassName="TorrentSource" syncable="YES">
|
||||
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="21277" systemVersion="21F79" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
|
||||
<entity name="Source" representedClassName="Source" syncable="YES">
|
||||
<attribute name="author" attributeType="String" defaultValueString=""/>
|
||||
<attribute name="baseUrl" optional="YES" attributeType="String"/>
|
||||
<attribute name="dynamicBaseUrl" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
|
||||
<attribute name="enabled" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
|
||||
<attribute name="linkQuery" attributeType="String"/>
|
||||
<attribute name="name" optional="YES" attributeType="String"/>
|
||||
<attribute name="rowQuery" attributeType="String"/>
|
||||
<attribute name="sizeQuery" optional="YES" attributeType="String"/>
|
||||
<attribute name="titleQuery" optional="YES" attributeType="String"/>
|
||||
<attribute name="url" attributeType="String"/>
|
||||
<attribute name="id" attributeType="UUID" usesScalarValueType="NO"/>
|
||||
<attribute name="listId" optional="YES" attributeType="UUID" usesScalarValueType="NO"/>
|
||||
<attribute name="name" attributeType="String" defaultValueString=""/>
|
||||
<attribute name="preferredParser" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
|
||||
<attribute name="version" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
|
||||
<relationship name="api" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceApi" inverseName="parentSource" inverseEntity="SourceApi"/>
|
||||
<relationship name="htmlParser" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceHtmlParser" inverseName="parentSource" inverseEntity="SourceHtmlParser"/>
|
||||
<relationship name="rssParser" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceRssParser" inverseName="parentSource" inverseEntity="SourceRssParser"/>
|
||||
</entity>
|
||||
<entity name="TorrentSourceUrl" representedClassName="TorrentSourceUrl" syncable="YES">
|
||||
<attribute name="repoAuthor" optional="YES" attributeType="String"/>
|
||||
<attribute name="repoName" optional="YES" attributeType="String"/>
|
||||
<attribute name="urlString" attributeType="String"/>
|
||||
<entity name="SourceApi" representedClassName="SourceApi" syncable="YES" codeGenerationType="class">
|
||||
<attribute name="clientId" optional="YES" attributeType="String"/>
|
||||
<attribute name="clientSecret" optional="YES" attributeType="String"/>
|
||||
<attribute name="dynamicClientId" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
|
||||
<relationship name="parentSource" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Source" inverseName="api" inverseEntity="Source"/>
|
||||
</entity>
|
||||
<entity name="SourceComplexQuery" representedClassName="SourceComplexQuery" isAbstract="YES" syncable="YES">
|
||||
<attribute name="attribute" attributeType="String" defaultValueString="text"/>
|
||||
<attribute name="lookupAttribute" optional="YES" attributeType="String"/>
|
||||
<attribute name="query" attributeType="String" defaultValueString=""/>
|
||||
<attribute name="regex" optional="YES" attributeType="String"/>
|
||||
</entity>
|
||||
<entity name="SourceHtmlParser" representedClassName="SourceHtmlParser" syncable="YES">
|
||||
<attribute name="rows" attributeType="String" defaultValueString=""/>
|
||||
<attribute name="searchUrl" attributeType="String" defaultValueString=""/>
|
||||
<relationship name="magnetHash" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceMagnetHash" inverseName="parentHtmlParser" inverseEntity="SourceMagnetHash"/>
|
||||
<relationship name="magnetLink" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceMagnetLink" inverseName="parentHtmlParser" inverseEntity="SourceMagnetLink"/>
|
||||
<relationship name="parentSource" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Source" inverseName="htmlParser" inverseEntity="Source"/>
|
||||
<relationship name="seedLeech" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceSeedLeech" inverseName="parentHtmlParser" inverseEntity="SourceSeedLeech"/>
|
||||
<relationship name="size" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceSize" inverseName="parentHtmlParser" inverseEntity="SourceSize"/>
|
||||
<relationship name="title" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceTitle" inverseName="parentHtmlParser" inverseEntity="SourceTitle"/>
|
||||
<relationship name="trackers" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="SourceTracker" inverseName="parentHtmlParser" inverseEntity="SourceTracker"/>
|
||||
</entity>
|
||||
<entity name="SourceList" representedClassName="SourceList" syncable="YES">
|
||||
<attribute name="author" attributeType="String" defaultValueString=""/>
|
||||
<attribute name="id" attributeType="UUID" usesScalarValueType="NO"/>
|
||||
<attribute name="name" attributeType="String" defaultValueString=""/>
|
||||
<attribute name="urlString" attributeType="String" defaultValueString=""/>
|
||||
</entity>
|
||||
<entity name="SourceMagnetHash" representedClassName="SourceMagnetHash" parentEntity="SourceComplexQuery" syncable="YES" codeGenerationType="class">
|
||||
<relationship name="parentHtmlParser" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceHtmlParser" inverseName="magnetHash" inverseEntity="SourceHtmlParser"/>
|
||||
<relationship name="parentRssParser" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceRssParser" inverseName="magnetHash" inverseEntity="SourceRssParser"/>
|
||||
</entity>
|
||||
<entity name="SourceMagnetLink" representedClassName="SourceMagnetLink" parentEntity="SourceComplexQuery" syncable="YES" codeGenerationType="class">
|
||||
<attribute name="externalLinkQuery" optional="YES" attributeType="String"/>
|
||||
<relationship name="parentHtmlParser" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceHtmlParser" inverseName="magnetLink" inverseEntity="SourceHtmlParser"/>
|
||||
<relationship name="parentRssParser" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceRssParser" inverseName="magnetLink" inverseEntity="SourceRssParser"/>
|
||||
</entity>
|
||||
<entity name="SourceRssParser" representedClassName="SourceRssParser" syncable="YES">
|
||||
<attribute name="items" attributeType="String" defaultValueString=""/>
|
||||
<attribute name="rssUrl" optional="YES" attributeType="String"/>
|
||||
<attribute name="searchUrl" attributeType="String" defaultValueString=""/>
|
||||
<relationship name="magnetHash" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceMagnetHash" inverseName="parentRssParser" inverseEntity="SourceMagnetHash"/>
|
||||
<relationship name="magnetLink" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceMagnetLink" inverseName="parentRssParser" inverseEntity="SourceMagnetLink"/>
|
||||
<relationship name="parentSource" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Source" inverseName="rssParser" inverseEntity="Source"/>
|
||||
<relationship name="seedLeech" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceSeedLeech" inverseName="parentRssParser" inverseEntity="SourceSeedLeech"/>
|
||||
<relationship name="size" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceSize" inverseName="parentRssParser" inverseEntity="SourceSize"/>
|
||||
<relationship name="title" optional="YES" maxCount="1" deletionRule="Cascade" destinationEntity="SourceTitle" inverseName="parentRssParser" inverseEntity="SourceTitle"/>
|
||||
<relationship name="trackers" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="SourceTracker" inverseName="parentRssParser" inverseEntity="SourceTracker"/>
|
||||
</entity>
|
||||
<entity name="SourceSeedLeech" representedClassName="SourceSeedLeech" syncable="YES">
|
||||
<attribute name="attribute" attributeType="String" defaultValueString=""/>
|
||||
<attribute name="combined" optional="YES" attributeType="String"/>
|
||||
<attribute name="leecherRegex" optional="YES" attributeType="String"/>
|
||||
<attribute name="leechers" optional="YES" attributeType="String"/>
|
||||
<attribute name="lookupAttribute" optional="YES" attributeType="String"/>
|
||||
<attribute name="seederRegex" optional="YES" attributeType="String"/>
|
||||
<attribute name="seeders" optional="YES" attributeType="String"/>
|
||||
<relationship name="parentHtmlParser" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceHtmlParser" inverseName="seedLeech" inverseEntity="SourceHtmlParser"/>
|
||||
<relationship name="parentRssParser" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceRssParser" inverseName="seedLeech" inverseEntity="SourceRssParser"/>
|
||||
</entity>
|
||||
<entity name="SourceSize" representedClassName="SourceSize" parentEntity="SourceComplexQuery" syncable="YES" codeGenerationType="class">
|
||||
<relationship name="parentHtmlParser" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceHtmlParser" inverseName="size" inverseEntity="SourceHtmlParser"/>
|
||||
<relationship name="parentRssParser" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceRssParser" inverseName="size" inverseEntity="SourceRssParser"/>
|
||||
</entity>
|
||||
<entity name="SourceTitle" representedClassName="SourceTitle" parentEntity="SourceComplexQuery" syncable="YES" codeGenerationType="class">
|
||||
<relationship name="parentHtmlParser" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceHtmlParser" inverseName="title" inverseEntity="SourceHtmlParser"/>
|
||||
<relationship name="parentRssParser" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceRssParser" inverseName="title" inverseEntity="SourceRssParser"/>
|
||||
</entity>
|
||||
<entity name="SourceTracker" representedClassName="SourceTracker" syncable="YES">
|
||||
<attribute name="urlString" attributeType="String" defaultValueString=""/>
|
||||
<relationship name="parentHtmlParser" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceHtmlParser" inverseName="trackers" inverseEntity="SourceHtmlParser"/>
|
||||
<relationship name="parentRssParser" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SourceRssParser" inverseName="trackers" inverseEntity="SourceRssParser"/>
|
||||
</entity>
|
||||
</model>
|
||||
|
|
@ -9,7 +9,7 @@ import CoreData
|
|||
|
||||
// No iCloud until finalized sources
|
||||
struct PersistenceController {
|
||||
static let shared = PersistenceController()
|
||||
static var shared = PersistenceController()
|
||||
|
||||
// Coredata storage
|
||||
let container: NSPersistentContainer
|
||||
|
|
@ -36,16 +36,20 @@ struct PersistenceController {
|
|||
container.viewContext.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy
|
||||
try? container.viewContext.setQueryGenerationFrom(.current)
|
||||
|
||||
container.loadPersistentStores { _, error in
|
||||
if let error = error {
|
||||
fatalError("CoreData init error: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
backgroundContext = container.newBackgroundContext()
|
||||
backgroundContext.automaticallyMergesChangesFromParent = true
|
||||
backgroundContext.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy
|
||||
try? backgroundContext.setQueryGenerationFrom(.current)
|
||||
|
||||
container.loadPersistentStores { _, error in
|
||||
if let error = error {
|
||||
fatalError("Error: \(error.localizedDescription)")
|
||||
}
|
||||
}
|
||||
container.viewContext.automaticallyMergesChangesFromParent = true
|
||||
container.viewContext.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy
|
||||
try? container.viewContext.setQueryGenerationFrom(.current)
|
||||
}
|
||||
|
||||
func save(_ context: NSManagedObjectContext? = nil) {
|
||||
|
|
|
|||
27
Ferrite/Extensions/UIApplication.swift
Normal file
27
Ferrite/Extensions/UIApplication.swift
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
//
|
||||
// UIApplication.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 7/26/22.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
// Extensions to get the version/build number for AboutView
|
||||
extension UIApplication {
|
||||
var appVersion: String {
|
||||
Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as! String
|
||||
}
|
||||
|
||||
var appBuild: String {
|
||||
Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as! String
|
||||
}
|
||||
|
||||
var buildType: String {
|
||||
#if DEBUG
|
||||
return "Debug"
|
||||
#else
|
||||
return "Release"
|
||||
#endif
|
||||
}
|
||||
}
|
||||
16
Ferrite/Extensions/View.swift
Normal file
16
Ferrite/Extensions/View.swift
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
//
|
||||
// View.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 8/15/22.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
extension View {
|
||||
// MARK: Modifiers
|
||||
|
||||
func dynamicAccentColor(_ color: Color) -> some View {
|
||||
modifier(DynamicAccentColor(color: color))
|
||||
}
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@ struct FerriteApp: App {
|
|||
@StateObject var scrapingModel: ScrapingViewModel = .init()
|
||||
@StateObject var toastModel: ToastViewModel = .init()
|
||||
@StateObject var debridManager: DebridManager = .init()
|
||||
@StateObject var navigationModel: NavigationViewModel = .init()
|
||||
@StateObject var navModel: NavigationViewModel = .init()
|
||||
@StateObject var sourceManager: SourceManager = .init()
|
||||
|
||||
var body: some Scene {
|
||||
|
|
@ -24,11 +24,12 @@ struct FerriteApp: App {
|
|||
scrapingModel.toastModel = toastModel
|
||||
debridManager.toastModel = toastModel
|
||||
sourceManager.toastModel = toastModel
|
||||
navModel.toastModel = toastModel
|
||||
}
|
||||
.environmentObject(debridManager)
|
||||
.environmentObject(scrapingModel)
|
||||
.environmentObject(toastModel)
|
||||
.environmentObject(navigationModel)
|
||||
.environmentObject(navModel)
|
||||
.environmentObject(sourceManager)
|
||||
.environment(\.managedObjectContext, persistenceController.container.viewContext)
|
||||
}
|
||||
|
|
|
|||
13
Ferrite/Info.plist
Normal file
13
Ferrite/Info.plist
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>NSAppTransportSecurity</key>
|
||||
<dict>
|
||||
<key>NSAllowsArbitraryLoads</key>
|
||||
<true/>
|
||||
</dict>
|
||||
<key>UILaunchScreen</key>
|
||||
<false/>
|
||||
</dict>
|
||||
</plist>
|
||||
64
Ferrite/LaunchScreen.storyboard
Normal file
64
Ferrite/LaunchScreen.storyboard
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21219" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
|
||||
<device id="retina6_1" orientation="portrait" appearance="light"/>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21200"/>
|
||||
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
|
||||
<capability name="System colors in document resources" minToolsVersion="11.0"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<scenes>
|
||||
<!--View Controller-->
|
||||
<scene sceneID="EHf-IW-A2E">
|
||||
<objects>
|
||||
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
|
||||
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
|
||||
<rect key="frame" x="0.0" y="876" width="414" height="0.0"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="AppImageRounded" translatesAutoresizingMaskIntoConstraints="NO" id="eI5-UQ-q7U">
|
||||
<rect key="frame" x="132" y="373" width="150" height="150"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="150" id="NSQ-Nx-Fht"/>
|
||||
<constraint firstAttribute="height" constant="150" id="m09-Jt-van"/>
|
||||
</constraints>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ferrite" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TiD-yU-GG4">
|
||||
<rect key="frame" x="149" y="538" width="116.5" height="48"/>
|
||||
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="40"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
</subviews>
|
||||
<viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
|
||||
<constraints>
|
||||
<constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
|
||||
<constraint firstItem="eI5-UQ-q7U" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="8Ge-dQ-rv3"/>
|
||||
<constraint firstItem="TiD-yU-GG4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="CAz-EE-nwF"/>
|
||||
<constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="20" symbolic="YES" id="SfN-ll-jLj"/>
|
||||
<constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/>
|
||||
<constraint firstItem="eI5-UQ-q7U" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="fQT-g2-stJ"/>
|
||||
<constraint firstItem="TiD-yU-GG4" firstAttribute="top" secondItem="eI5-UQ-q7U" secondAttribute="bottom" constant="15" id="owz-Jf-eR0"/>
|
||||
</constraints>
|
||||
</view>
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="53" y="375"/>
|
||||
</scene>
|
||||
</scenes>
|
||||
<resources>
|
||||
<image name="AppImageRounded" width="90" height="90"/>
|
||||
<systemColor name="systemBackgroundColor">
|
||||
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
</systemColor>
|
||||
</resources>
|
||||
</document>
|
||||
32
Ferrite/Models/SettingsModels.swift
Normal file
32
Ferrite/Models/SettingsModels.swift
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
//
|
||||
// SettingsModels.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 8/11/22.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
public enum DefaultMagnetActionType: Int {
|
||||
// Let the user choose
|
||||
case none = 0
|
||||
|
||||
// Open in actions come first
|
||||
case webtor = 1
|
||||
|
||||
// Sharing actions come last
|
||||
case shareMagnet = 2
|
||||
}
|
||||
|
||||
public enum DefaultDebridActionType: Int {
|
||||
// Let the user choose
|
||||
case none = 0
|
||||
|
||||
// Open in actions come first
|
||||
case outplayer = 1
|
||||
case vlc = 2
|
||||
case infuse = 3
|
||||
|
||||
// Sharing actions come last
|
||||
case shareDownload = 4
|
||||
}
|
||||
|
|
@ -7,23 +7,78 @@
|
|||
|
||||
import Foundation
|
||||
|
||||
public struct SourceJson: Codable {
|
||||
let repoName: String?
|
||||
let repoAuthor: String?
|
||||
let sources: [TorrentSourceJson]
|
||||
|
||||
enum CodingKeys: String, CodingKey {
|
||||
case repoName = "name"
|
||||
case repoAuthor = "author"
|
||||
case sources
|
||||
}
|
||||
public struct SourceListJson: Codable {
|
||||
let name: String
|
||||
let author: String
|
||||
var sources: [SourceJson]
|
||||
}
|
||||
|
||||
public struct TorrentSourceJson: Codable, Hashable {
|
||||
let name: String?
|
||||
let url: String
|
||||
let rowQuery: String
|
||||
let linkQuery: String
|
||||
let titleQuery: String?
|
||||
let sizeQuery: String?
|
||||
public struct SourceJson: Codable, Hashable {
|
||||
let name: String
|
||||
let version: Int16
|
||||
let baseUrl: String?
|
||||
var dynamicBaseUrl: Bool?
|
||||
var author: String?
|
||||
var listId: UUID?
|
||||
let api: SourceApiJson?
|
||||
let rssParser: SourceRssParserJson?
|
||||
let htmlParser: SourceHtmlParserJson?
|
||||
}
|
||||
|
||||
public enum SourcePreferredParser: Int16, CaseIterable {
|
||||
case none = 0
|
||||
case scraping = 1
|
||||
case rss = 2
|
||||
case siteApi = 3
|
||||
}
|
||||
|
||||
public struct SourceApiJson: Codable, Hashable {
|
||||
let clientId: String?
|
||||
var dynamicClientId: Bool?
|
||||
let usesSecret: Bool
|
||||
}
|
||||
|
||||
public struct SourceRssParserJson: Codable, Hashable {
|
||||
let rssUrl: String?
|
||||
let searchUrl: String
|
||||
let items: String
|
||||
let magnetHash: SouceComplexQueryJson?
|
||||
let magnetLink: SouceComplexQueryJson?
|
||||
let title: SouceComplexQueryJson?
|
||||
let size: SouceComplexQueryJson?
|
||||
let sl: SourceSLJson?
|
||||
let trackers: [String]?
|
||||
}
|
||||
|
||||
public struct SourceHtmlParserJson: Codable, Hashable {
|
||||
let searchUrl: String
|
||||
let rows: String
|
||||
let magnet: SourceMagnetJson
|
||||
let title: SouceComplexQueryJson?
|
||||
let size: SouceComplexQueryJson?
|
||||
let sl: SourceSLJson?
|
||||
}
|
||||
|
||||
public struct SouceComplexQueryJson: Codable, Hashable {
|
||||
let query: String
|
||||
let lookupAttribute: String?
|
||||
let attribute: String?
|
||||
let regex: String?
|
||||
}
|
||||
|
||||
public struct SourceMagnetJson: Codable, Hashable {
|
||||
let query: String
|
||||
let attribute: String
|
||||
let regex: String?
|
||||
let externalLinkQuery: String?
|
||||
}
|
||||
|
||||
public struct SourceSLJson: Codable, Hashable {
|
||||
let seeders: String?
|
||||
let leechers: String?
|
||||
let combined: String?
|
||||
let attribute: String?
|
||||
let lookupAttribute: String?
|
||||
let seederRegex: String?
|
||||
let leecherRegex: String?
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,10 +45,14 @@ public class DebridManager: ObservableObject {
|
|||
}
|
||||
} catch {
|
||||
Task { @MainActor in
|
||||
toastModel?.toastDescription = "RealDebrid hash error: \(error)"
|
||||
let error = error as NSError
|
||||
|
||||
if error.code != -999 {
|
||||
toastModel?.toastDescription = "RealDebrid hash error: \(error)"
|
||||
}
|
||||
}
|
||||
|
||||
print(error)
|
||||
print("RealDebrid hash error: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -120,9 +124,12 @@ public class DebridManager: ObservableObject {
|
|||
let torrentLink = try await realDebrid.torrentInfo(debridID: realDebridId, selectedIndex: iaFile == nil ? 0 : iaFile?.batchFileIndex)
|
||||
let downloadLink = try await realDebrid.unrestrictLink(debridDownloadLink: torrentLink)
|
||||
|
||||
Task { @MainActor in
|
||||
let downloadUrlTask = Task { @MainActor in
|
||||
realDebridDownloadUrl = downloadLink
|
||||
}
|
||||
|
||||
// Prevent a race condition when setting the published variable
|
||||
await downloadUrlTask.value
|
||||
} catch {
|
||||
Task { @MainActor in
|
||||
toastModel?.toastDescription = "RealDebrid download error: \(error)"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,17 @@
|
|||
|
||||
import SwiftUI
|
||||
|
||||
enum ViewTab {
|
||||
case search
|
||||
case sources
|
||||
case settings
|
||||
}
|
||||
|
||||
@MainActor
|
||||
class NavigationViewModel: ObservableObject {
|
||||
var toastModel: ToastViewModel?
|
||||
|
||||
// Used between SearchResultsView and MagnetChoiceView
|
||||
enum ChoiceSheetType: Identifiable {
|
||||
var id: Int {
|
||||
hashValue
|
||||
|
|
@ -17,5 +27,81 @@ class NavigationViewModel: ObservableObject {
|
|||
case batch
|
||||
}
|
||||
|
||||
@Published var isEditingSearch: Bool = false
|
||||
@Published var isSearching: Bool = false
|
||||
|
||||
@Published var hideNavigationBar = false
|
||||
|
||||
@Published var currentChoiceSheet: ChoiceSheetType?
|
||||
@Published var activityItems: [Any] = []
|
||||
@Published var showActivityView: Bool = false
|
||||
|
||||
@Published var selectedTab: ViewTab = .search
|
||||
@Published var showSearchProgress: Bool = false
|
||||
|
||||
// Used between SourceListView and SourceSettingsView
|
||||
@Published var showSourceSettings: Bool = false
|
||||
@Published var selectedSource: Source?
|
||||
|
||||
@Published var showSourceListEditor: Bool = false
|
||||
@Published var selectedSourceList: SourceList?
|
||||
|
||||
@AppStorage("Actions.DefaultDebrid") var defaultDebridAction: DefaultDebridActionType = .none
|
||||
@AppStorage("Actions.DefaultMagnet") var defaultMagnetAction: DefaultMagnetActionType = .none
|
||||
|
||||
public func runDebridAction(action: DefaultDebridActionType?, urlString: String) {
|
||||
let selectedAction = action ?? defaultDebridAction
|
||||
|
||||
switch selectedAction {
|
||||
case .none:
|
||||
currentChoiceSheet = .magnet
|
||||
case .outplayer:
|
||||
if let downloadUrl = URL(string: "outplayer://\(urlString)") {
|
||||
UIApplication.shared.open(downloadUrl)
|
||||
} else {
|
||||
toastModel?.toastDescription = "Could not create an Outplayer URL"
|
||||
}
|
||||
case .vlc:
|
||||
if let downloadUrl = URL(string: "vlc://\(urlString)") {
|
||||
UIApplication.shared.open(downloadUrl)
|
||||
} else {
|
||||
toastModel?.toastDescription = "Could not create a VLC URL"
|
||||
}
|
||||
case .infuse:
|
||||
if let downloadUrl = URL(string: "infuse://x-callback-url/play?url=\(urlString)") {
|
||||
UIApplication.shared.open(downloadUrl)
|
||||
} else {
|
||||
toastModel?.toastDescription = "Could not create a Infuse URL"
|
||||
}
|
||||
case .shareDownload:
|
||||
if let downloadUrl = URL(string: urlString), currentChoiceSheet == nil {
|
||||
activityItems = [downloadUrl]
|
||||
showActivityView.toggle()
|
||||
} else {
|
||||
toastModel?.toastDescription = "Could not create object for sharing"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public func runMagnetAction(action: DefaultMagnetActionType?, searchResult: SearchResult) {
|
||||
let selectedAction = action ?? defaultMagnetAction
|
||||
|
||||
switch selectedAction {
|
||||
case .none:
|
||||
currentChoiceSheet = .magnet
|
||||
case .webtor:
|
||||
if let url = URL(string: "https://webtor.io/#/show?magnet=\(searchResult.magnetLink)") {
|
||||
UIApplication.shared.open(url)
|
||||
} else {
|
||||
toastModel?.toastDescription = "Could not create a WebTor URL"
|
||||
}
|
||||
case .shareMagnet:
|
||||
if let magnetUrl = URL(string: searchResult.magnetLink), currentChoiceSheet == nil {
|
||||
activityItems = [magnetUrl]
|
||||
showActivityView.toggle()
|
||||
} else {
|
||||
toastModel?.toastDescription = "Could not create object for sharing"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
//
|
||||
|
||||
import Base32
|
||||
import Regex
|
||||
import SwiftSoup
|
||||
import SwiftUI
|
||||
|
||||
|
|
@ -15,6 +16,8 @@ public struct SearchResult: Hashable, Codable {
|
|||
let size: String
|
||||
let magnetLink: String
|
||||
let magnetHash: String?
|
||||
let seeders: String?
|
||||
let leechers: String?
|
||||
}
|
||||
|
||||
class ScrapingViewModel: ObservableObject {
|
||||
|
|
@ -22,46 +25,110 @@ class ScrapingViewModel: ObservableObject {
|
|||
|
||||
// Link the toast view model for single-directional communication
|
||||
var toastModel: ToastViewModel?
|
||||
let byteCountFormatter: ByteCountFormatter = .init()
|
||||
|
||||
@Published var runningSearchTask: Task<Void, Error>?
|
||||
@Published var searchResults: [SearchResult] = []
|
||||
@Published var debridHashes: [String] = []
|
||||
@Published var searchText: String = ""
|
||||
@Published var selectedSearchResult: SearchResult?
|
||||
@Published var filteredSource: TorrentSource?
|
||||
@Published var filteredSource: Source?
|
||||
@Published var currentSourceName: String?
|
||||
|
||||
@MainActor
|
||||
public func scanSources(sources: [TorrentSource]) async {
|
||||
public func scanSources(sources: [Source]) async {
|
||||
if sources.isEmpty {
|
||||
Task { @MainActor in
|
||||
toastModel?.toastType = .info
|
||||
toastModel?.toastDescription = "There are no sources to search!"
|
||||
}
|
||||
|
||||
print("Sources empty")
|
||||
return
|
||||
}
|
||||
|
||||
var tempResults: [SearchResult] = []
|
||||
|
||||
for source in sources {
|
||||
if source.enabled {
|
||||
guard let html = await fetchWebsiteHtml(source: source) else {
|
||||
currentSourceName = source.name
|
||||
|
||||
guard let baseUrl = source.baseUrl else {
|
||||
Task { @MainActor in
|
||||
toastModel?.toastDescription = "The base URL could not be found for source \(source.name)"
|
||||
}
|
||||
|
||||
print("The base URL could not be found for source \(source.name)")
|
||||
continue
|
||||
}
|
||||
|
||||
let sourceResults = await scrapeWebsite(source: source, html: html)
|
||||
tempResults += sourceResults
|
||||
// Default to HTML scraping
|
||||
let preferredParser = SourcePreferredParser(rawValue: source.preferredParser) ?? .none
|
||||
|
||||
switch preferredParser {
|
||||
case .scraping:
|
||||
if let htmlParser = source.htmlParser {
|
||||
guard let encodedQuery = searchText.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) else {
|
||||
toastModel?.toastDescription = "Could not process search query, invalid characters present."
|
||||
print("Could not process search query, invalid characters present")
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
let urlString = baseUrl + htmlParser.searchUrl.replacingOccurrences(of: "{query}", with: encodedQuery)
|
||||
|
||||
guard let html = await fetchWebsiteData(urlString: urlString) else {
|
||||
continue
|
||||
}
|
||||
|
||||
let sourceResults = await scrapeHtml(source: source, baseUrl: baseUrl, html: html)
|
||||
tempResults += sourceResults
|
||||
}
|
||||
case .rss:
|
||||
if let rssParser = source.rssParser {
|
||||
guard let encodedQuery = searchText.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) else {
|
||||
toastModel?.toastDescription = "Could not process search query, invalid characters present."
|
||||
print("Could not process search query, invalid characters present")
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
let replacedSearchUrl = rssParser.searchUrl
|
||||
.replacingOccurrences(of: "{apiKey}", with: source.api?.clientSecret ?? "")
|
||||
.replacingOccurrences(of: "{query}", with: encodedQuery)
|
||||
|
||||
// If there is an RSS base URL, use that instead
|
||||
var urlString: String
|
||||
if let rssUrl = rssParser.rssUrl {
|
||||
urlString = rssUrl + replacedSearchUrl
|
||||
} else {
|
||||
urlString = baseUrl + replacedSearchUrl
|
||||
}
|
||||
|
||||
guard let rss = await fetchWebsiteData(urlString: urlString) else {
|
||||
continue
|
||||
}
|
||||
|
||||
let sourceResults = scrapeRss(source: source, rss: rss)
|
||||
tempResults += sourceResults
|
||||
}
|
||||
case .siteApi, .none:
|
||||
continue
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// If the task is cancelled, return
|
||||
if let searchTask = runningSearchTask, searchTask.isCancelled {
|
||||
return
|
||||
}
|
||||
|
||||
searchResults = tempResults
|
||||
}
|
||||
|
||||
// Fetches the HTML body for the source website
|
||||
// Fetches the data for a URL
|
||||
@MainActor
|
||||
public func fetchWebsiteHtml(source: TorrentSource) async -> String? {
|
||||
guard let encodedQuery = searchText.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) else {
|
||||
toastModel?.toastDescription = "Could not process search query, invalid characters present."
|
||||
print("Could not process search query, invalid characters present")
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
guard let url = URL(string: source.url + encodedQuery) else {
|
||||
public func fetchWebsiteData(urlString: String) async -> String? {
|
||||
guard let url = URL(string: urlString) else {
|
||||
toastModel?.toastDescription = "Source doesn't contain a valid URL, contact the source dev!"
|
||||
print("Source doesn't contain a valid URL, contact the source dev!")
|
||||
|
||||
|
|
@ -73,75 +140,355 @@ class ScrapingViewModel: ObservableObject {
|
|||
let html = String(data: data, encoding: .ascii)
|
||||
return html
|
||||
} catch {
|
||||
toastModel?.toastDescription = "Error in fetching HTML \(error)"
|
||||
print("Error in fetching HTML \(error)")
|
||||
let error = error as NSError
|
||||
|
||||
switch error.code {
|
||||
case -999:
|
||||
toastModel?.toastType = .info
|
||||
toastModel?.toastDescription = "Search cancelled"
|
||||
default:
|
||||
toastModel?.toastDescription = "Error in fetching data \(error)"
|
||||
}
|
||||
|
||||
print("Error in fetching data \(error)")
|
||||
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
// Returns results to UI
|
||||
// Results must have a link and title, but other parameters aren't required
|
||||
// RSS feed scraper
|
||||
@MainActor
|
||||
public func scrapeWebsite(source: TorrentSource, html: String) async -> [SearchResult] {
|
||||
public func scrapeRss(source: Source, rss: String) -> [SearchResult] {
|
||||
var tempResults: [SearchResult] = []
|
||||
var hashes: [String] = []
|
||||
|
||||
guard let rssParser = source.rssParser else {
|
||||
return tempResults
|
||||
}
|
||||
|
||||
var items = Elements()
|
||||
|
||||
do {
|
||||
let document = try SwiftSoup.parse(rss, "", Parser.xmlParser())
|
||||
items = try document.getElementsByTag("item")
|
||||
} catch {
|
||||
toastModel?.toastDescription = "RSS scraping error, couldn't fetch items: \(error)"
|
||||
print("RSS scraping error, couldn't fetch items: \(error)")
|
||||
|
||||
return tempResults
|
||||
}
|
||||
|
||||
for item in items {
|
||||
// Parse magnet link or translate hash
|
||||
var magnetHash: String?
|
||||
if let magnetHashParser = rssParser.magnetHash {
|
||||
magnetHash = try? runRssComplexQuery(
|
||||
item: item,
|
||||
query: magnetHashParser.query,
|
||||
attribute: magnetHashParser.attribute,
|
||||
lookupAttribute: magnetHashParser.lookupAttribute,
|
||||
regexString: magnetHashParser.regex
|
||||
)
|
||||
}
|
||||
|
||||
var title: String?
|
||||
if let titleParser = rssParser.title {
|
||||
title = try? runRssComplexQuery(
|
||||
item: item,
|
||||
query: titleParser.query,
|
||||
attribute: titleParser.attribute,
|
||||
lookupAttribute: titleParser.lookupAttribute,
|
||||
regexString: titleParser.regex
|
||||
)
|
||||
}
|
||||
|
||||
var link: String?
|
||||
if let magnetLinkParser = rssParser.magnetLink {
|
||||
link = try? runRssComplexQuery(
|
||||
item: item,
|
||||
query: magnetLinkParser.query,
|
||||
attribute: magnetLinkParser.attribute,
|
||||
lookupAttribute: magnetLinkParser.lookupAttribute,
|
||||
regexString: magnetLinkParser.regex
|
||||
)
|
||||
} else if let magnetHash = magnetHash {
|
||||
link = generateMagnetLink(magnetHash: magnetHash, title: title, trackers: rssParser.trackerArray)
|
||||
} else {
|
||||
continue
|
||||
}
|
||||
|
||||
guard let href = link, href.starts(with: "magnet:") else {
|
||||
continue
|
||||
}
|
||||
|
||||
if magnetHash == nil {
|
||||
magnetHash = fetchMagnetHash(magnetLink: href)
|
||||
}
|
||||
|
||||
var size: String?
|
||||
if let sizeParser = rssParser.size {
|
||||
size = try? runRssComplexQuery(
|
||||
item: item,
|
||||
query: sizeParser.query,
|
||||
attribute: sizeParser.attribute,
|
||||
lookupAttribute: sizeParser.lookupAttribute,
|
||||
regexString: sizeParser.regex
|
||||
)
|
||||
}
|
||||
|
||||
if let sizeString = size, let sizeInt = Int64(sizeString) {
|
||||
size = byteCountFormatter.string(fromByteCount: sizeInt)
|
||||
}
|
||||
|
||||
var seeders: String?
|
||||
var leechers: String?
|
||||
if let seederLeecher = rssParser.seedLeech {
|
||||
if let seederQuery = seederLeecher.seeders {
|
||||
seeders = try? runRssComplexQuery(
|
||||
item: item,
|
||||
query: seederQuery,
|
||||
attribute: seederLeecher.attribute,
|
||||
lookupAttribute: seederLeecher.lookupAttribute,
|
||||
regexString: seederLeecher.seederRegex
|
||||
)
|
||||
}
|
||||
|
||||
if let leecherQuery = seederLeecher.leechers {
|
||||
leechers = try? runRssComplexQuery(
|
||||
item: item,
|
||||
query: leecherQuery,
|
||||
attribute: seederLeecher.attribute,
|
||||
lookupAttribute: seederLeecher.lookupAttribute,
|
||||
regexString: seederLeecher.leecherRegex
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
let result = SearchResult(
|
||||
title: title ?? "No title",
|
||||
source: source.name,
|
||||
size: size ?? "",
|
||||
magnetLink: href,
|
||||
magnetHash: magnetHash,
|
||||
seeders: seeders,
|
||||
leechers: leechers
|
||||
)
|
||||
|
||||
if !tempResults.contains(result) {
|
||||
tempResults.append(result)
|
||||
}
|
||||
}
|
||||
|
||||
return tempResults
|
||||
}
|
||||
|
||||
// HTML scraper
|
||||
@MainActor
|
||||
public func scrapeHtml(source: Source, baseUrl: String, html: String) async -> [SearchResult] {
|
||||
var tempResults: [SearchResult] = []
|
||||
|
||||
guard let htmlParser = source.htmlParser else {
|
||||
return tempResults
|
||||
}
|
||||
|
||||
var rows = Elements()
|
||||
|
||||
do {
|
||||
let document = try SwiftSoup.parse(html)
|
||||
rows = try document.select(htmlParser.rows)
|
||||
} catch {
|
||||
toastModel?.toastDescription = "Scraping error, couldn't fetch rows: \(error)"
|
||||
print("Scraping error, couldn't fetch rows: \(error)")
|
||||
|
||||
let rows = try document.select(source.rowQuery)
|
||||
return tempResults
|
||||
}
|
||||
|
||||
for row in rows {
|
||||
guard let link = try row.select(source.linkQuery).first() else {
|
||||
// If there's an error, continue instead of returning with nothing
|
||||
for row in rows {
|
||||
do {
|
||||
// Fetches the magnet link
|
||||
// If the magnet is located on an external page, fetch the external page and grab the magnet link
|
||||
// External page fetching affects source performance
|
||||
guard let magnetParser = htmlParser.magnetLink else {
|
||||
continue
|
||||
}
|
||||
|
||||
let href = try link.attr("href")
|
||||
var href: String
|
||||
if let externalMagnetQuery = magnetParser.externalLinkQuery, !externalMagnetQuery.isEmpty {
|
||||
guard let externalMagnetLink = try row.select(externalMagnetQuery).first()?.attr("href") else {
|
||||
continue
|
||||
}
|
||||
|
||||
guard let magnetHtml = await fetchWebsiteData(urlString: baseUrl + externalMagnetLink) else {
|
||||
continue
|
||||
}
|
||||
|
||||
let magnetDocument = try SwiftSoup.parse(magnetHtml)
|
||||
guard let linkResult = try magnetDocument.select(magnetParser.query).first() else {
|
||||
continue
|
||||
}
|
||||
|
||||
if magnetParser.attribute == "text" {
|
||||
href = try linkResult.text()
|
||||
} else {
|
||||
href = try linkResult.attr(magnetParser.attribute)
|
||||
}
|
||||
} else {
|
||||
guard let link = try runHtmlComplexQuery(
|
||||
row: row,
|
||||
query: magnetParser.query,
|
||||
attribute: magnetParser.attribute,
|
||||
regexString: magnetParser.regex
|
||||
) else {
|
||||
continue
|
||||
}
|
||||
|
||||
href = link
|
||||
}
|
||||
|
||||
if !href.starts(with: "magnet:") {
|
||||
continue
|
||||
}
|
||||
|
||||
// Fetches the magnet hash
|
||||
let magnetHash = fetchMagnetHash(magnetLink: href)
|
||||
|
||||
// Fetches the episode/movie title
|
||||
var title: String?
|
||||
if let titleParser = htmlParser.title {
|
||||
title = try? runHtmlComplexQuery(
|
||||
row: row,
|
||||
query: titleParser.query,
|
||||
attribute: titleParser.attribute,
|
||||
regexString: titleParser.regex
|
||||
)
|
||||
}
|
||||
|
||||
// Some sources may use last-child, but SwiftSoup doesn't support it
|
||||
if let titleQuery = source.titleQuery {
|
||||
if titleQuery.contains("last-child") {
|
||||
let newTitleQuery = titleQuery.replacingOccurrences(of: ":last-child", with: "")
|
||||
title = try row.select(newTitleQuery).last()?.text()
|
||||
// Fetches the torrent's size
|
||||
// TODO: Add int translation
|
||||
var size: String?
|
||||
if let sizeParser = htmlParser.size {
|
||||
size = try? runHtmlComplexQuery(
|
||||
row: row,
|
||||
query: sizeParser.query,
|
||||
attribute: sizeParser.attribute,
|
||||
regexString: sizeParser.regex
|
||||
)
|
||||
}
|
||||
|
||||
// Fetches seeders and leechers if there are any
|
||||
var seeders: String?
|
||||
var leechers: String?
|
||||
if let seederLeecher = htmlParser.seedLeech {
|
||||
if let combinedQuery = seederLeecher.combined {
|
||||
if let combinedString = try? runHtmlComplexQuery(
|
||||
row: row,
|
||||
query: combinedQuery,
|
||||
attribute: seederLeecher.attribute,
|
||||
regexString: nil
|
||||
) {
|
||||
if let seederRegex = seederLeecher.seederRegex, let leecherRegex = seederLeecher.leecherRegex {
|
||||
// Seeder regex matching
|
||||
seeders = try? Regex(seederRegex).firstMatch(in: combinedString)?.groups[safe: 0]?.value
|
||||
|
||||
// Leecher regex matching
|
||||
leechers = try? Regex(leecherRegex).firstMatch(in: combinedString)?.groups[safe: 0]?.value
|
||||
}
|
||||
}
|
||||
} else {
|
||||
title = try row.select(titleQuery).first()?.text()
|
||||
if let seederQuery = seederLeecher.seeders {
|
||||
seeders = try? runHtmlComplexQuery(
|
||||
row: row,
|
||||
query: seederQuery,
|
||||
attribute: seederLeecher.attribute,
|
||||
regexString: seederLeecher.seederRegex
|
||||
)
|
||||
}
|
||||
|
||||
if let leecherQuery = seederLeecher.seeders {
|
||||
leechers = try? runHtmlComplexQuery(
|
||||
row: row,
|
||||
query: leecherQuery,
|
||||
attribute: seederLeecher.attribute,
|
||||
regexString: seederLeecher.leecherRegex
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let size = try row.select(source.sizeQuery ?? "").first()
|
||||
let sizeText = try size?.text()
|
||||
|
||||
let result = SearchResult(
|
||||
title: title ?? "No title",
|
||||
source: source.name ?? "N/A",
|
||||
size: sizeText ?? "?B",
|
||||
source: source.name,
|
||||
size: size ?? "",
|
||||
magnetLink: href,
|
||||
magnetHash: magnetHash
|
||||
magnetHash: magnetHash,
|
||||
seeders: seeders,
|
||||
leechers: leechers
|
||||
)
|
||||
|
||||
// Change to bulk request to speed up UI
|
||||
if let hash = magnetHash {
|
||||
hashes.append(hash)
|
||||
if !tempResults.contains(result) {
|
||||
tempResults.append(result)
|
||||
}
|
||||
} catch {
|
||||
toastModel?.toastDescription = "Scraping error: \(error)"
|
||||
print("Scraping error: \(error)")
|
||||
|
||||
tempResults.append(result)
|
||||
continue
|
||||
}
|
||||
}
|
||||
|
||||
return tempResults
|
||||
} catch {
|
||||
toastModel?.toastDescription = "Error while scraping: \(error)"
|
||||
print("Error while scraping: \(error)")
|
||||
return tempResults
|
||||
}
|
||||
|
||||
return []
|
||||
// Complex query parsing for HTML scraping
|
||||
func runHtmlComplexQuery(row: Element, query: String, attribute: String, regexString: String?) throws -> String? {
|
||||
var parsedValue: String?
|
||||
|
||||
let result = try row.select(query).first()
|
||||
|
||||
switch attribute {
|
||||
case "text":
|
||||
parsedValue = try result?.text()
|
||||
default:
|
||||
parsedValue = try result?.attr(attribute)
|
||||
}
|
||||
|
||||
// A capture group must be used in the provided regex
|
||||
if let regexString = regexString,
|
||||
let parsedValue = parsedValue,
|
||||
let regexValue = try? Regex(regexString).firstMatch(in: parsedValue)?.groups[safe: 0]?.value
|
||||
{
|
||||
return regexValue
|
||||
} else {
|
||||
return parsedValue
|
||||
}
|
||||
}
|
||||
|
||||
// Complex query parsing for RSS scraping
|
||||
func runRssComplexQuery(item: Element, query: String, attribute: String, lookupAttribute: String?, regexString: String?) throws -> String? {
|
||||
var parsedValue: String?
|
||||
|
||||
switch attribute {
|
||||
case "text":
|
||||
parsedValue = try item.getElementsByTag(query).first()?.text()
|
||||
default:
|
||||
// If there's a key/value to lookup the attribute with, query it. Othewise assume the value is in the same attribute
|
||||
if let lookupAttribute = lookupAttribute {
|
||||
let containerElement = try item.getElementsByAttributeValue(lookupAttribute, query).first()
|
||||
parsedValue = try containerElement?.attr(attribute)
|
||||
} else {
|
||||
let containerElement = try item.getElementsByAttribute(attribute).first()
|
||||
parsedValue = try containerElement?.attr(attribute)
|
||||
}
|
||||
}
|
||||
|
||||
// A capture group must be used in the provided regex
|
||||
if let regexString = regexString,
|
||||
let parsedValue = parsedValue,
|
||||
let regexValue = try? Regex(regexString).firstMatch(in: parsedValue)?.groups[safe: 0]?.value
|
||||
{
|
||||
return regexValue
|
||||
} else {
|
||||
return parsedValue
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -160,7 +507,49 @@ class ScrapingViewModel: ObservableObject {
|
|||
let decryptedMagnetHash = base32DecodeToData(String(magnetHash))
|
||||
return decryptedMagnetHash?.hexEncodedString()
|
||||
} else {
|
||||
return String(magnetHash)
|
||||
return String(magnetHash).lowercased()
|
||||
}
|
||||
}
|
||||
|
||||
func parseSizeString(sizeString: String) -> String? {
|
||||
// Test if the string can be a full integer
|
||||
guard let size = Int(sizeString) else {
|
||||
return nil
|
||||
}
|
||||
|
||||
let length = sizeString.count
|
||||
|
||||
if length > 9 {
|
||||
// This is a GB
|
||||
return String("\(Double(size) / 1e9) GB")
|
||||
} else if length > 6 {
|
||||
// This is a MB
|
||||
return String("\(Double(size) / 1e6) MB")
|
||||
} else if length > 3 {
|
||||
// This is a KB
|
||||
return String("\(Double(size) / 1e3) KB")
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
public func generateMagnetLink(magnetHash: String, title: String?, trackers: [SourceTracker]) -> String {
|
||||
var magnetLinkArray = ["magnet:?xt=urn:btih:"]
|
||||
|
||||
magnetLinkArray.append(magnetHash)
|
||||
|
||||
if let title = title, let encodedTitle = title.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) {
|
||||
magnetLinkArray.append("&dn=\(encodedTitle)")
|
||||
}
|
||||
|
||||
for tracker in trackers {
|
||||
if URL(string: tracker.urlString) != nil,
|
||||
let encodedUrlString = tracker.urlString.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed)
|
||||
{
|
||||
magnetLinkArray.append("&tr=\(encodedUrlString)")
|
||||
}
|
||||
}
|
||||
|
||||
return magnetLinkArray.joined()
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,30 +5,36 @@
|
|||
// Created by Brian Dashore on 7/25/22.
|
||||
//
|
||||
|
||||
import CoreData
|
||||
import Foundation
|
||||
|
||||
public class SourceManager: ObservableObject {
|
||||
var toastModel: ToastViewModel?
|
||||
|
||||
@Published var availableSources: [TorrentSourceJson] = []
|
||||
@Published var availableSources: [SourceJson] = []
|
||||
|
||||
@Published var urlErrorAlertText = ""
|
||||
@Published var showUrlErrorAlert = false
|
||||
|
||||
@MainActor
|
||||
public func fetchSourcesFromUrl() async {
|
||||
let sourceUrlRequest = TorrentSourceUrl.fetchRequest()
|
||||
let sourceListRequest = SourceList.fetchRequest()
|
||||
do {
|
||||
let sourceUrls = try PersistenceController.shared.backgroundContext.fetch(sourceUrlRequest)
|
||||
var tempSourceUrls: [TorrentSourceJson] = []
|
||||
let sourceLists = try PersistenceController.shared.backgroundContext.fetch(sourceListRequest)
|
||||
var tempSourceUrls: [SourceJson] = []
|
||||
|
||||
for sourceUrl in sourceUrls {
|
||||
guard let url = URL(string: sourceUrl.urlString) else {
|
||||
for sourceList in sourceLists {
|
||||
guard let url = URL(string: sourceList.urlString) else {
|
||||
return
|
||||
}
|
||||
|
||||
let (data, _) = try await URLSession.shared.data(for: URLRequest(url: url))
|
||||
let sourceResponse = try JSONDecoder().decode(SourceJson.self, from: data)
|
||||
var sourceResponse = try JSONDecoder().decode(SourceListJson.self, from: data)
|
||||
|
||||
for index in sourceResponse.sources.indices {
|
||||
sourceResponse.sources[index].author = sourceList.author
|
||||
sourceResponse.sources[index].listId = sourceList.id
|
||||
}
|
||||
|
||||
tempSourceUrls += sourceResponse.sources
|
||||
}
|
||||
|
|
@ -39,34 +45,68 @@ public class SourceManager: ObservableObject {
|
|||
}
|
||||
}
|
||||
|
||||
public func installSource(sourceJson: TorrentSourceJson) {
|
||||
public func installSource(sourceJson: SourceJson, doUpsert: Bool = false) {
|
||||
let backgroundContext = PersistenceController.shared.backgroundContext
|
||||
|
||||
// If a source exists, don't add the new one
|
||||
if let name = sourceJson.name {
|
||||
let existingSourceRequest = TorrentSource.fetchRequest()
|
||||
existingSourceRequest.predicate = NSPredicate(format: "name == %@", name)
|
||||
existingSourceRequest.fetchLimit = 1
|
||||
// If there's no base URL and it isn't dynamic, return before any transactions occur
|
||||
let dynamicBaseUrl = sourceJson.dynamicBaseUrl ?? false
|
||||
|
||||
let existingSource = try? backgroundContext.fetch(existingSourceRequest).first
|
||||
if existingSource != nil {
|
||||
if !dynamicBaseUrl, sourceJson.baseUrl == nil {
|
||||
Task { @MainActor in
|
||||
toastModel?.toastDescription = "Not adding this source because base URL parameters are malformed. Please contact the source dev."
|
||||
}
|
||||
|
||||
print("Not adding this source because base URL parameters are malformed")
|
||||
return
|
||||
}
|
||||
|
||||
// If a source exists, don't add the new one unless upserting
|
||||
let existingSourceRequest = Source.fetchRequest()
|
||||
existingSourceRequest.predicate = NSPredicate(format: "name == %@", sourceJson.name)
|
||||
existingSourceRequest.fetchLimit = 1
|
||||
|
||||
if let existingSource = try? backgroundContext.fetch(existingSourceRequest).first {
|
||||
if doUpsert {
|
||||
PersistenceController.shared.delete(existingSource, context: backgroundContext)
|
||||
} else {
|
||||
Task { @MainActor in
|
||||
toastModel?.toastDescription = "Could not install source \(sourceJson.name ?? "Unknown source") because it is already installed."
|
||||
toastModel?.toastDescription = "Could not install source with name \(sourceJson.name) because it is already installed."
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
let newTorrentSource = TorrentSource(context: backgroundContext)
|
||||
newTorrentSource.name = sourceJson.name
|
||||
newTorrentSource.url = sourceJson.url
|
||||
newTorrentSource.rowQuery = sourceJson.rowQuery
|
||||
newTorrentSource.linkQuery = sourceJson.linkQuery
|
||||
newTorrentSource.titleQuery = sourceJson.titleQuery
|
||||
newTorrentSource.sizeQuery = sourceJson.sizeQuery
|
||||
let newSource = Source(context: backgroundContext)
|
||||
newSource.id = UUID()
|
||||
newSource.name = sourceJson.name
|
||||
newSource.version = sourceJson.version
|
||||
newSource.dynamicBaseUrl = dynamicBaseUrl
|
||||
newSource.baseUrl = sourceJson.baseUrl
|
||||
newSource.author = sourceJson.author ?? "Unknown"
|
||||
newSource.listId = sourceJson.listId
|
||||
|
||||
newTorrentSource.enabled = true
|
||||
if let sourceApiJson = sourceJson.api {
|
||||
addSourceApi(newSource: newSource, apiJson: sourceApiJson)
|
||||
}
|
||||
|
||||
// Adds an RSS parser if present
|
||||
if let rssParserJson = sourceJson.rssParser {
|
||||
addRssParser(newSource: newSource, rssParserJson: rssParserJson)
|
||||
}
|
||||
|
||||
// Adds an HTML parser if present
|
||||
if let htmlParserJson = sourceJson.htmlParser {
|
||||
addHtmlParser(newSource: newSource, htmlParserJson: htmlParserJson)
|
||||
}
|
||||
|
||||
// Add an API condition as well
|
||||
if newSource.rssParser != nil {
|
||||
newSource.preferredParser = Int16(SourcePreferredParser.rss.rawValue)
|
||||
} else {
|
||||
newSource.preferredParser = Int16(SourcePreferredParser.scraping.rawValue)
|
||||
}
|
||||
|
||||
newSource.enabled = true
|
||||
|
||||
do {
|
||||
try backgroundContext.save()
|
||||
|
|
@ -77,8 +117,146 @@ public class SourceManager: ObservableObject {
|
|||
}
|
||||
}
|
||||
|
||||
func addSourceApi(newSource: Source, apiJson: SourceApiJson) {
|
||||
let backgroundContext = PersistenceController.shared.backgroundContext
|
||||
|
||||
let newSourceApi = SourceApi(context: backgroundContext)
|
||||
newSourceApi.clientId = apiJson.clientId
|
||||
|
||||
if let clientId = apiJson.clientId {
|
||||
newSourceApi.clientId = clientId
|
||||
}
|
||||
|
||||
newSourceApi.dynamicClientId = apiJson.dynamicClientId ?? false
|
||||
|
||||
if apiJson.usesSecret {
|
||||
newSourceApi.clientSecret = ""
|
||||
}
|
||||
|
||||
newSource.api = newSourceApi
|
||||
}
|
||||
|
||||
func addRssParser(newSource: Source, rssParserJson: SourceRssParserJson) {
|
||||
let backgroundContext = PersistenceController.shared.backgroundContext
|
||||
|
||||
let newSourceRssParser = SourceRssParser(context: backgroundContext)
|
||||
newSourceRssParser.rssUrl = rssParserJson.rssUrl
|
||||
newSourceRssParser.searchUrl = rssParserJson.searchUrl
|
||||
newSourceRssParser.items = rssParserJson.items
|
||||
|
||||
if let magnetLinkJson = rssParserJson.magnetLink {
|
||||
let newSourceMagnetLink = SourceMagnetLink(context: backgroundContext)
|
||||
newSourceMagnetLink.query = magnetLinkJson.query
|
||||
newSourceMagnetLink.attribute = magnetLinkJson.attribute ?? "text"
|
||||
newSourceMagnetLink.lookupAttribute = magnetLinkJson.lookupAttribute
|
||||
|
||||
newSourceRssParser.magnetLink = newSourceMagnetLink
|
||||
}
|
||||
|
||||
if let magnetHashJson = rssParserJson.magnetHash {
|
||||
let newSourceMagnetHash = SourceMagnetHash(context: backgroundContext)
|
||||
newSourceMagnetHash.query = magnetHashJson.query
|
||||
newSourceMagnetHash.attribute = magnetHashJson.attribute ?? "text"
|
||||
newSourceMagnetHash.lookupAttribute = magnetHashJson.lookupAttribute
|
||||
|
||||
newSourceRssParser.magnetHash = newSourceMagnetHash
|
||||
}
|
||||
|
||||
if let titleJson = rssParserJson.title {
|
||||
let newSourceTitle = SourceTitle(context: backgroundContext)
|
||||
newSourceTitle.query = titleJson.query
|
||||
newSourceTitle.attribute = titleJson.attribute ?? "text"
|
||||
newSourceTitle.lookupAttribute = newSourceTitle.lookupAttribute
|
||||
|
||||
newSourceRssParser.title = newSourceTitle
|
||||
}
|
||||
|
||||
if let sizeJson = rssParserJson.size {
|
||||
let newSourceSize = SourceSize(context: backgroundContext)
|
||||
newSourceSize.query = sizeJson.query
|
||||
newSourceSize.attribute = sizeJson.attribute ?? "text"
|
||||
newSourceSize.lookupAttribute = sizeJson.lookupAttribute
|
||||
|
||||
newSourceRssParser.size = newSourceSize
|
||||
}
|
||||
|
||||
if let seedLeechJson = rssParserJson.sl {
|
||||
let newSourceSeedLeech = SourceSeedLeech(context: backgroundContext)
|
||||
newSourceSeedLeech.seeders = seedLeechJson.seeders
|
||||
newSourceSeedLeech.leechers = seedLeechJson.leechers
|
||||
newSourceSeedLeech.combined = seedLeechJson.combined
|
||||
newSourceSeedLeech.attribute = seedLeechJson.attribute ?? "text"
|
||||
newSourceSeedLeech.lookupAttribute = seedLeechJson.lookupAttribute
|
||||
newSourceSeedLeech.seederRegex = seedLeechJson.seederRegex
|
||||
newSourceSeedLeech.leecherRegex = seedLeechJson.leecherRegex
|
||||
|
||||
newSourceRssParser.seedLeech = newSourceSeedLeech
|
||||
}
|
||||
|
||||
if let trackerJson = rssParserJson.trackers {
|
||||
for urlString in trackerJson {
|
||||
let newSourceTracker = SourceTracker(context: backgroundContext)
|
||||
newSourceTracker.urlString = urlString
|
||||
newSourceTracker.parentRssParser = newSourceRssParser
|
||||
}
|
||||
}
|
||||
|
||||
newSource.rssParser = newSourceRssParser
|
||||
}
|
||||
|
||||
func addHtmlParser(newSource: Source, htmlParserJson: SourceHtmlParserJson) {
|
||||
let backgroundContext = PersistenceController.shared.backgroundContext
|
||||
|
||||
let newSourceHtmlParser = SourceHtmlParser(context: backgroundContext)
|
||||
newSourceHtmlParser.searchUrl = htmlParserJson.searchUrl
|
||||
newSourceHtmlParser.rows = htmlParserJson.rows
|
||||
|
||||
// Adds a title complex query if present
|
||||
if let titleJson = htmlParserJson.title {
|
||||
let newSourceTitle = SourceTitle(context: backgroundContext)
|
||||
newSourceTitle.query = titleJson.query
|
||||
newSourceTitle.attribute = titleJson.attribute ?? "text"
|
||||
newSourceTitle.regex = titleJson.regex
|
||||
|
||||
newSourceHtmlParser.title = newSourceTitle
|
||||
}
|
||||
|
||||
// Adds a size complex query if present
|
||||
if let sizeJson = htmlParserJson.size {
|
||||
let newSourceSize = SourceSize(context: backgroundContext)
|
||||
newSourceSize.query = sizeJson.query
|
||||
newSourceSize.attribute = sizeJson.attribute ?? "text"
|
||||
newSourceSize.regex = sizeJson.regex
|
||||
|
||||
newSourceHtmlParser.size = newSourceSize
|
||||
}
|
||||
|
||||
if let seedLeechJson = htmlParserJson.sl {
|
||||
let newSourceSeedLeech = SourceSeedLeech(context: backgroundContext)
|
||||
newSourceSeedLeech.seeders = seedLeechJson.seeders
|
||||
newSourceSeedLeech.leechers = seedLeechJson.leechers
|
||||
newSourceSeedLeech.combined = seedLeechJson.combined
|
||||
newSourceSeedLeech.attribute = seedLeechJson.attribute ?? "text"
|
||||
newSourceSeedLeech.seederRegex = seedLeechJson.seederRegex
|
||||
newSourceSeedLeech.leecherRegex = seedLeechJson.leecherRegex
|
||||
|
||||
newSourceHtmlParser.seedLeech = newSourceSeedLeech
|
||||
}
|
||||
|
||||
// Adds a magnet complex query and its unique properties
|
||||
let newSourceMagnet = SourceMagnetLink(context: backgroundContext)
|
||||
newSourceMagnet.externalLinkQuery = htmlParserJson.magnet.externalLinkQuery
|
||||
newSourceMagnet.query = htmlParserJson.magnet.query
|
||||
newSourceMagnet.attribute = htmlParserJson.magnet.attribute
|
||||
newSourceMagnet.regex = htmlParserJson.magnet.regex
|
||||
|
||||
newSourceHtmlParser.magnetLink = newSourceMagnet
|
||||
|
||||
newSource.htmlParser = newSourceHtmlParser
|
||||
}
|
||||
|
||||
@MainActor
|
||||
public func addSourceList(sourceUrl: String) async -> Bool {
|
||||
public func addSourceList(sourceUrl: String, existingSourceList: SourceList?) async -> Bool {
|
||||
let backgroundContext = PersistenceController.shared.backgroundContext
|
||||
|
||||
if sourceUrl.isEmpty || URL(string: sourceUrl) == nil {
|
||||
|
|
@ -88,28 +266,42 @@ public class SourceManager: ObservableObject {
|
|||
return false
|
||||
}
|
||||
|
||||
let sourceUrlRequest = TorrentSourceUrl.fetchRequest()
|
||||
sourceUrlRequest.predicate = NSPredicate(format: "urlString == %@", sourceUrl)
|
||||
sourceUrlRequest.fetchLimit = 1
|
||||
|
||||
if let existingSourceUrl = try? backgroundContext.fetch(sourceUrlRequest).first {
|
||||
print("Existing source URL found")
|
||||
PersistenceController.shared.delete(existingSourceUrl, context: backgroundContext)
|
||||
}
|
||||
|
||||
let newSourceUrl = TorrentSourceUrl(context: backgroundContext)
|
||||
newSourceUrl.urlString = sourceUrl
|
||||
|
||||
do {
|
||||
let (data, _) = try await URLSession.shared.data(for: URLRequest(url: URL(string: sourceUrl)!))
|
||||
if let rawResponse = try? JSONDecoder().decode(SourceJson.self, from: data) {
|
||||
newSourceUrl.repoName = rawResponse.repoName
|
||||
}
|
||||
let rawResponse = try JSONDecoder().decode(SourceListJson.self, from: data)
|
||||
|
||||
try backgroundContext.save()
|
||||
if let existingSourceList = existingSourceList {
|
||||
existingSourceList.urlString = sourceUrl
|
||||
existingSourceList.name = rawResponse.name
|
||||
existingSourceList.author = rawResponse.author
|
||||
|
||||
try PersistenceController.shared.container.viewContext.save()
|
||||
} else {
|
||||
let sourceListRequest = SourceList.fetchRequest()
|
||||
let urlPredicate = NSPredicate(format: "urlString == %@", sourceUrl)
|
||||
let infoPredicate = NSPredicate(format: "author == %@ AND name == %@", rawResponse.author, rawResponse.name)
|
||||
sourceListRequest.predicate = NSCompoundPredicate(type: .or, subpredicates: [urlPredicate, infoPredicate])
|
||||
sourceListRequest.fetchLimit = 1
|
||||
|
||||
if (try? backgroundContext.fetch(sourceListRequest).first) != nil {
|
||||
urlErrorAlertText = "An existing source with this information was found. Please try editing the source list instead."
|
||||
showUrlErrorAlert.toggle()
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
let newSourceUrl = SourceList(context: backgroundContext)
|
||||
newSourceUrl.id = UUID()
|
||||
newSourceUrl.urlString = sourceUrl
|
||||
newSourceUrl.name = rawResponse.name
|
||||
newSourceUrl.author = rawResponse.author
|
||||
|
||||
try backgroundContext.save()
|
||||
}
|
||||
|
||||
return true
|
||||
} catch {
|
||||
print(error)
|
||||
urlErrorAlertText = error.localizedDescription
|
||||
showUrlErrorAlert.toggle()
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
//
|
||||
// ErrorViewModel.swift
|
||||
// ToastViewModel.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 7/19/22.
|
||||
|
|
|
|||
39
Ferrite/Views/AboutView.swift
Normal file
39
Ferrite/Views/AboutView.swift
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
//
|
||||
// AboutView.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 7/26/22.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
struct AboutView: View {
|
||||
var body: some View {
|
||||
VStack {
|
||||
Image("AppImage")
|
||||
.resizable()
|
||||
.frame(width: 100, height: 100)
|
||||
.cornerRadius(25)
|
||||
|
||||
Text("Ferrite is a free and open source application developed by Brian Dashore under the GNU-GPLv3 license.")
|
||||
.padding()
|
||||
|
||||
List {
|
||||
ListRowTextView(leftText: "Version", rightText: UIApplication.shared.appVersion)
|
||||
ListRowTextView(leftText: "Build number", rightText: UIApplication.shared.appBuild)
|
||||
ListRowTextView(leftText: "Build type", rightText: UIApplication.shared.buildType)
|
||||
ListRowLinkView(text: "Donate!", link: "https://ko-fi.com/kingbri")
|
||||
ListRowLinkView(text: "Discord server", link: "https://discord.gg/sYQxnuD7Fj")
|
||||
ListRowLinkView(text: "GitHub repository", link: "https://github.com/bdashore3/Ferrite")
|
||||
}
|
||||
.listStyle(.insetGrouped)
|
||||
}
|
||||
.navigationTitle("About")
|
||||
}
|
||||
}
|
||||
|
||||
struct AboutView_Previews: PreviewProvider {
|
||||
static var previews: some View {
|
||||
AboutView()
|
||||
}
|
||||
}
|
||||
|
|
@ -8,11 +8,11 @@
|
|||
import SwiftUI
|
||||
|
||||
struct BatchChoiceView: View {
|
||||
@Environment(\.dismiss) var dismiss
|
||||
@Environment(\.presentationMode) var presentationMode
|
||||
|
||||
@EnvironmentObject var debridManager: DebridManager
|
||||
@EnvironmentObject var scrapingModel: ScrapingViewModel
|
||||
@EnvironmentObject var navigationModel: NavigationViewModel
|
||||
@EnvironmentObject var navModel: NavigationViewModel
|
||||
|
||||
var body: some View {
|
||||
NavView {
|
||||
|
|
@ -25,19 +25,22 @@ struct BatchChoiceView: View {
|
|||
Task {
|
||||
await debridManager.fetchRdDownload(searchResult: searchResult, iaFile: file)
|
||||
|
||||
// The download may complete before this sheet dismisses
|
||||
try? await Task.sleep(seconds: 1)
|
||||
navigationModel.currentChoiceSheet = .magnet
|
||||
if !debridManager.realDebridDownloadUrl.isEmpty {
|
||||
// The download may complete before this sheet dismisses
|
||||
try? await Task.sleep(seconds: 1)
|
||||
navModel.runDebridAction(action: nil, urlString: debridManager.realDebridDownloadUrl)
|
||||
}
|
||||
|
||||
debridManager.selectedRealDebridFile = nil
|
||||
debridManager.selectedRealDebridItem = nil
|
||||
}
|
||||
}
|
||||
|
||||
dismiss()
|
||||
presentationMode.wrappedValue.dismiss()
|
||||
}
|
||||
}
|
||||
}
|
||||
.listStyle(.insetGrouped)
|
||||
.navigationTitle("Select a file")
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
.toolbar {
|
||||
|
|
@ -45,7 +48,7 @@ struct BatchChoiceView: View {
|
|||
Button("Done") {
|
||||
debridManager.selectedRealDebridItem = nil
|
||||
|
||||
dismiss()
|
||||
presentationMode.wrappedValue.dismiss()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
//
|
||||
// CardView.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 7/4/22.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
struct CardView: View {
|
||||
@Binding var result: SearchResult
|
||||
|
||||
var body: some View {
|
||||
Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/)
|
||||
}
|
||||
}
|
||||
22
Ferrite/Views/CommonViews/DynamicAccentColor.swift
Normal file
22
Ferrite/Views/CommonViews/DynamicAccentColor.swift
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
//
|
||||
// dynamicAccentColor.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 8/15/22.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
struct DynamicAccentColor: ViewModifier {
|
||||
let color: Color
|
||||
|
||||
func body(content: Content) -> some View {
|
||||
if #available(iOS 15, *) {
|
||||
content
|
||||
.tint(color)
|
||||
} else {
|
||||
content
|
||||
.accentColor(color)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@ struct ErrorGroupBoxStyle: GroupBoxStyle {
|
|||
configuration.content
|
||||
}
|
||||
.padding(10)
|
||||
.background(Color(uiColor: .secondarySystemGroupedBackground))
|
||||
.background(Color(UIColor.secondarySystemGroupedBackground))
|
||||
.clipShape(RoundedRectangle(cornerRadius: 8, style: .continuous))
|
||||
}
|
||||
}
|
||||
|
|
|
|||
75
Ferrite/Views/CommonViews/ListRowViews.swift
Normal file
75
Ferrite/Views/CommonViews/ListRowViews.swift
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
//
|
||||
// ListRowViews.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 7/26/22.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
// These views were imported from Asobi
|
||||
// View alias for a list row with an external link
|
||||
struct ListRowLinkView: View {
|
||||
let text: String
|
||||
let link: String
|
||||
|
||||
var body: some View {
|
||||
HStack {
|
||||
Link(text, destination: URL(string: link)!)
|
||||
.foregroundColor(.primary)
|
||||
|
||||
Spacer()
|
||||
|
||||
Image(systemName: "arrow.up.forward.app.fill")
|
||||
.foregroundColor(.gray)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct ListRowButtonView: View {
|
||||
let text: String
|
||||
let systemImage: String?
|
||||
let action: () -> Void
|
||||
|
||||
init(_ text: String, systemImage: String? = nil, action: @escaping () -> Void) {
|
||||
self.text = text
|
||||
self.systemImage = systemImage
|
||||
self.action = action
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
HStack {
|
||||
Button(text) {
|
||||
action()
|
||||
}
|
||||
|
||||
Spacer()
|
||||
|
||||
if let imageName = systemImage {
|
||||
Image(systemName: imageName)
|
||||
.foregroundColor(.gray)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct ListRowTextView: View {
|
||||
let leftText: String
|
||||
var rightText: String?
|
||||
var rightSymbol: String?
|
||||
|
||||
var body: some View {
|
||||
HStack {
|
||||
Text(leftText)
|
||||
|
||||
Spacer()
|
||||
|
||||
if let rightText = rightText {
|
||||
Text(rightText)
|
||||
} else {
|
||||
Image(systemName: rightSymbol!)
|
||||
.foregroundColor(.gray)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -6,20 +6,21 @@
|
|||
//
|
||||
|
||||
import SwiftUI
|
||||
import SwiftUIX
|
||||
|
||||
struct ContentView: View {
|
||||
@EnvironmentObject var scrapingModel: ScrapingViewModel
|
||||
@EnvironmentObject var debridManager: DebridManager
|
||||
@EnvironmentObject var navigationModel: NavigationViewModel
|
||||
@EnvironmentObject var navModel: NavigationViewModel
|
||||
|
||||
@AppStorage("RealDebrid.Enabled") var realDebridEnabled = false
|
||||
|
||||
@FetchRequest(
|
||||
entity: TorrentSource.entity(),
|
||||
entity: Source.entity(),
|
||||
sortDescriptors: []
|
||||
) var sources: FetchedResults<TorrentSource>
|
||||
) var sources: FetchedResults<Source>
|
||||
|
||||
@State private var selectedSource: TorrentSource? {
|
||||
@State private var selectedSource: Source? {
|
||||
didSet {
|
||||
scrapingModel.filteredSource = selectedSource
|
||||
}
|
||||
|
|
@ -65,29 +66,62 @@ struct ContentView: View {
|
|||
|
||||
Spacer()
|
||||
}
|
||||
.padding(.vertical, 5)
|
||||
.padding(.horizontal, 20)
|
||||
|
||||
SearchResultsView()
|
||||
}
|
||||
.searchable(text: $scrapingModel.searchText)
|
||||
.onSubmit(of: .search) {
|
||||
Task {
|
||||
await scrapingModel.scanSources(sources: sources.compactMap { $0 })
|
||||
await debridManager.populateDebridHashes(scrapingModel.searchResults)
|
||||
.sheet(item: $navModel.currentChoiceSheet) { item in
|
||||
Group {
|
||||
switch item {
|
||||
case .magnet:
|
||||
MagnetChoiceView()
|
||||
.environmentObject(debridManager)
|
||||
.environmentObject(scrapingModel)
|
||||
.environmentObject(navModel)
|
||||
case .batch:
|
||||
BatchChoiceView()
|
||||
.environmentObject(debridManager)
|
||||
.environmentObject(scrapingModel)
|
||||
.environmentObject(navModel)
|
||||
}
|
||||
}
|
||||
.dynamicAccentColor(.primary)
|
||||
}
|
||||
.sheet(isPresented: $navModel.showActivityView) {
|
||||
if #available(iOS 16, *) {
|
||||
AppActivityView(activityItems: navModel.activityItems)
|
||||
.presentationDetents([.medium])
|
||||
} else {
|
||||
AppActivityView(activityItems: navModel.activityItems)
|
||||
}
|
||||
}
|
||||
.navigationTitle("Search")
|
||||
}
|
||||
.sheet(item: $navigationModel.currentChoiceSheet) { item in
|
||||
Group {
|
||||
switch item {
|
||||
case .magnet:
|
||||
MagnetChoiceView()
|
||||
case .batch:
|
||||
BatchChoiceView()
|
||||
}
|
||||
.navigationSearchBar {
|
||||
SearchBar("Search", text: $scrapingModel.searchText, isEditing: $navModel.isEditingSearch,
|
||||
onCommit: {
|
||||
scrapingModel.runningSearchTask = Task {
|
||||
navModel.isSearching = true
|
||||
navModel.showSearchProgress = true
|
||||
|
||||
await scrapingModel.scanSources(sources: sources.compactMap { $0 })
|
||||
|
||||
if realDebridEnabled, !scrapingModel.searchResults.isEmpty {
|
||||
await debridManager.populateDebridHashes(scrapingModel.searchResults)
|
||||
}
|
||||
|
||||
navModel.showSearchProgress = false
|
||||
}
|
||||
})
|
||||
.showsCancelButton(navModel.isEditingSearch || navModel.isSearching)
|
||||
.onCancel {
|
||||
scrapingModel.searchResults = []
|
||||
scrapingModel.runningSearchTask?.cancel()
|
||||
scrapingModel.runningSearchTask = nil
|
||||
navModel.isSearching = false
|
||||
scrapingModel.searchText = ""
|
||||
}
|
||||
}
|
||||
.tint(.primary)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,8 +8,9 @@
|
|||
import SwiftUI
|
||||
|
||||
struct LoginWebView: View {
|
||||
@Environment(\.dismiss) var dismiss
|
||||
@Environment(\.presentationMode) var presentationMode
|
||||
var url: URL
|
||||
|
||||
var body: some View {
|
||||
NavView {
|
||||
WebView(url: url)
|
||||
|
|
@ -18,7 +19,7 @@ struct LoginWebView: View {
|
|||
.toolbar {
|
||||
ToolbarItem(placement: .navigationBarTrailing) {
|
||||
Button("Done") {
|
||||
dismiss()
|
||||
presentationMode.wrappedValue.dismiss()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,86 +5,96 @@
|
|||
// Created by Brian Dashore on 7/20/22.
|
||||
//
|
||||
|
||||
import ActivityView
|
||||
import SwiftUI
|
||||
import SwiftUIX
|
||||
|
||||
struct MagnetChoiceView: View {
|
||||
@Environment(\.dismiss) var dismiss
|
||||
@Environment(\.presentationMode) var presentationMode
|
||||
|
||||
@EnvironmentObject var scrapingModel: ScrapingViewModel
|
||||
@EnvironmentObject var debridManager: DebridManager
|
||||
@EnvironmentObject var navModel: NavigationViewModel
|
||||
|
||||
@AppStorage("RealDebrid.Enabled") var realDebridEnabled = false
|
||||
|
||||
@State private var showActivityView = false
|
||||
@State private var activityItem: ActivityItem?
|
||||
@State private var showLinkCopyAlert = false
|
||||
@State private var showMagnetCopyAlert = false
|
||||
@State private var activityItems: [Any] = []
|
||||
|
||||
var body: some View {
|
||||
NavView {
|
||||
Form {
|
||||
if realDebridEnabled, debridManager.matchSearchResult(result: scrapingModel.selectedSearchResult) != .none {
|
||||
Section("Real Debrid options") {
|
||||
Button("Play on Outplayer") {
|
||||
guard let downloadUrl = URL(string: "outplayer://\(debridManager.realDebridDownloadUrl)") else {
|
||||
return
|
||||
}
|
||||
|
||||
UIApplication.shared.open(downloadUrl)
|
||||
Section(header: "Real Debrid options") {
|
||||
ListRowButtonView("Play on Outplayer", systemImage: "arrow.up.forward.app.fill") {
|
||||
navModel.runDebridAction(action: .outplayer, urlString: debridManager.realDebridDownloadUrl)
|
||||
}
|
||||
|
||||
Button("Play on VLC") {
|
||||
guard let downloadUrl = URL(string: "vlc://\(debridManager.realDebridDownloadUrl)") else {
|
||||
return
|
||||
}
|
||||
|
||||
UIApplication.shared.open(downloadUrl)
|
||||
ListRowButtonView("Play on VLC", systemImage: "arrow.up.forward.app.fill") {
|
||||
navModel.runDebridAction(action: .vlc, urlString: debridManager.realDebridDownloadUrl)
|
||||
}
|
||||
|
||||
Button("Play on Infuse") {
|
||||
guard let downloadUrl = URL(string: "infuse://x-callback-url/play?url=\(debridManager.realDebridDownloadUrl)") else {
|
||||
return
|
||||
}
|
||||
|
||||
UIApplication.shared.open(downloadUrl)
|
||||
ListRowButtonView("Play on Infuse", systemImage: "arrow.up.forward.app.fill") {
|
||||
navModel.runDebridAction(action: .infuse, urlString: debridManager.realDebridDownloadUrl)
|
||||
}
|
||||
|
||||
Button("Copy download URL") {
|
||||
ListRowButtonView("Copy download URL", systemImage: "doc.on.doc.fill") {
|
||||
UIPasteboard.general.string = debridManager.realDebridDownloadUrl
|
||||
showLinkCopyAlert.toggle()
|
||||
}
|
||||
.alert(isPresented: $showLinkCopyAlert) {
|
||||
Alert(
|
||||
title: Text("Copied"),
|
||||
message: Text("Download link copied successfully"),
|
||||
dismissButton: .cancel(Text("OK"))
|
||||
)
|
||||
}
|
||||
|
||||
Button("Share download URL") {
|
||||
guard let url = URL(string: debridManager.realDebridDownloadUrl) else {
|
||||
return
|
||||
ListRowButtonView("Share download URL", systemImage: "square.and.arrow.up.fill") {
|
||||
if let url = URL(string: debridManager.realDebridDownloadUrl) {
|
||||
activityItems = [url]
|
||||
navModel.showActivityView.toggle()
|
||||
}
|
||||
|
||||
activityItem = ActivityItem(items: url)
|
||||
showActivityView.toggle()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Section("Magnet options") {
|
||||
Button("Copy magnet") {
|
||||
Section(header: "Magnet options") {
|
||||
ListRowButtonView("Copy magnet", systemImage: "doc.on.doc.fill") {
|
||||
UIPasteboard.general.string = scrapingModel.selectedSearchResult?.magnetLink
|
||||
showMagnetCopyAlert.toggle()
|
||||
}
|
||||
.alert(isPresented: $showMagnetCopyAlert) {
|
||||
Alert(
|
||||
title: Text("Copied"),
|
||||
message: Text("Magnet link copied successfully"),
|
||||
dismissButton: .cancel(Text("OK"))
|
||||
)
|
||||
}
|
||||
|
||||
Button("Share magnet") {
|
||||
ListRowButtonView("Share magnet", systemImage: "square.and.arrow.up.fill") {
|
||||
if let result = scrapingModel.selectedSearchResult, let url = URL(string: result.magnetLink) {
|
||||
activityItem = ActivityItem(items: url)
|
||||
showActivityView.toggle()
|
||||
activityItems = [url]
|
||||
navModel.showActivityView.toggle()
|
||||
}
|
||||
}
|
||||
|
||||
Button("Open in WebTor") {
|
||||
if let result = scrapingModel.selectedSearchResult,
|
||||
let url = URL(string: "https://webtor.io/#/show?magnet=\(result.magnetLink)")
|
||||
{
|
||||
UIApplication.shared.open(url)
|
||||
ListRowButtonView("Open in WebTor", systemImage: "arrow.up.forward.app.fill") {
|
||||
if let result = scrapingModel.selectedSearchResult {
|
||||
navModel.runMagnetAction(action: .webtor, searchResult: result)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.activitySheet($activityItem)
|
||||
.sheet(isPresented: $navModel.showActivityView) {
|
||||
if #available(iOS 16, *) {
|
||||
AppActivityView(activityItems: activityItems)
|
||||
.presentationDetents([.medium])
|
||||
} else {
|
||||
AppActivityView(activityItems: activityItems)
|
||||
}
|
||||
}
|
||||
.navigationTitle("Link actions")
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
.toolbar {
|
||||
|
|
@ -92,7 +102,7 @@ struct MagnetChoiceView: View {
|
|||
Button("Done") {
|
||||
debridManager.realDebridDownloadUrl = ""
|
||||
|
||||
dismiss()
|
||||
presentationMode.wrappedValue.dismiss()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,36 +7,29 @@
|
|||
|
||||
import SwiftUI
|
||||
|
||||
enum Tab {
|
||||
case search
|
||||
case sources
|
||||
case settings
|
||||
}
|
||||
|
||||
struct MainView: View {
|
||||
@EnvironmentObject var navModel: NavigationViewModel
|
||||
@EnvironmentObject var toastModel: ToastViewModel
|
||||
|
||||
@State private var tabSelection: Tab = .search
|
||||
|
||||
var body: some View {
|
||||
TabView(selection: $tabSelection) {
|
||||
TabView(selection: $navModel.selectedTab) {
|
||||
ContentView()
|
||||
.tabItem {
|
||||
Label("Search", systemImage: "magnifyingglass")
|
||||
}
|
||||
.tag(Tab.search)
|
||||
.tag(ViewTab.search)
|
||||
|
||||
SourceListView()
|
||||
SourcesView()
|
||||
.tabItem {
|
||||
Label("Sources", systemImage: "doc.text")
|
||||
}
|
||||
.tag(Tab.sources)
|
||||
.tag(ViewTab.sources)
|
||||
|
||||
SettingsView()
|
||||
.tabItem {
|
||||
Label("Settings", systemImage: "gear")
|
||||
}
|
||||
.tag(Tab.settings)
|
||||
.tag(ViewTab.settings)
|
||||
}
|
||||
.overlay {
|
||||
VStack {
|
||||
|
|
@ -58,6 +51,7 @@ struct MainView: View {
|
|||
}
|
||||
}
|
||||
.font(.caption)
|
||||
.shadow(radius: 10)
|
||||
.animation(.easeInOut(duration: 0.3), value: toastModel.showToast)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
20
Ferrite/Views/SearchProgressView.swift
Normal file
20
Ferrite/Views/SearchProgressView.swift
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
//
|
||||
// SearchProgressView.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 8/8/22.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
struct SearchProgressView: View {
|
||||
var body: some View {
|
||||
Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/)
|
||||
}
|
||||
}
|
||||
|
||||
struct SearchProgressView_Previews: PreviewProvider {
|
||||
static var previews: some View {
|
||||
SearchProgressView()
|
||||
}
|
||||
}
|
||||
|
|
@ -20,6 +20,14 @@ struct SearchResultRDView: View {
|
|||
|
||||
Spacer()
|
||||
|
||||
if let seeders = result.seeders {
|
||||
Text("S: \(seeders)")
|
||||
}
|
||||
|
||||
if let leechers = result.leechers {
|
||||
Text("L: \(leechers)")
|
||||
}
|
||||
|
||||
Text(result.size)
|
||||
|
||||
if realDebridEnabled {
|
||||
|
|
|
|||
|
|
@ -8,11 +8,9 @@
|
|||
import SwiftUI
|
||||
|
||||
struct SearchResultsView: View {
|
||||
@Environment(\.isSearching) var isSearching
|
||||
|
||||
@EnvironmentObject var scrapingModel: ScrapingViewModel
|
||||
@EnvironmentObject var debridManager: DebridManager
|
||||
@EnvironmentObject var navigationModel: NavigationViewModel
|
||||
@EnvironmentObject var navModel: NavigationViewModel
|
||||
|
||||
@AppStorage("RealDebrid.Enabled") var realDebridEnabled = false
|
||||
|
||||
|
|
@ -28,21 +26,24 @@ struct SearchResultsView: View {
|
|||
case .full:
|
||||
Task {
|
||||
await debridManager.fetchRdDownload(searchResult: result)
|
||||
navigationModel.currentChoiceSheet = .magnet
|
||||
|
||||
if !debridManager.realDebridDownloadUrl.isEmpty {
|
||||
navModel.runDebridAction(action: nil, urlString: debridManager.realDebridDownloadUrl)
|
||||
}
|
||||
}
|
||||
case .partial:
|
||||
if debridManager.setSelectedRdResult(result: result) {
|
||||
navigationModel.currentChoiceSheet = .batch
|
||||
navModel.currentChoiceSheet = .batch
|
||||
}
|
||||
case .none:
|
||||
navigationModel.currentChoiceSheet = .magnet
|
||||
navModel.runMagnetAction(action: nil, searchResult: result)
|
||||
}
|
||||
} label: {
|
||||
Text(result.title)
|
||||
.font(.callout)
|
||||
.fixedSize(horizontal: false, vertical: true)
|
||||
}
|
||||
.tint(.primary)
|
||||
.dynamicAccentColor(.primary)
|
||||
.padding(.bottom, 5)
|
||||
|
||||
SearchResultRDView(result: result)
|
||||
|
|
@ -50,8 +51,32 @@ struct SearchResultsView: View {
|
|||
}
|
||||
}
|
||||
}
|
||||
.onChange(of: isSearching) { changed in
|
||||
if !changed {
|
||||
.listStyle(.insetGrouped)
|
||||
.overlay {
|
||||
if scrapingModel.searchResults.isEmpty {
|
||||
if navModel.showSearchProgress {
|
||||
VStack(spacing: 5) {
|
||||
ProgressView()
|
||||
Text("Loading \(scrapingModel.currentSourceName ?? "")")
|
||||
}
|
||||
} else if navModel.isSearching, scrapingModel.runningSearchTask != nil {
|
||||
Text("No results found")
|
||||
}
|
||||
}
|
||||
}
|
||||
.onChange(of: navModel.selectedTab) { tab in
|
||||
// Cancel the search if tab is switched while search is in progress
|
||||
if tab != .search, navModel.showSearchProgress {
|
||||
scrapingModel.searchResults = []
|
||||
scrapingModel.runningSearchTask?.cancel()
|
||||
scrapingModel.runningSearchTask = nil
|
||||
navModel.isSearching = false
|
||||
scrapingModel.searchText = ""
|
||||
}
|
||||
}
|
||||
.onChange(of: scrapingModel.searchResults) { _ in
|
||||
// Cleans up any leftover search results in the event of an abrupt cancellation
|
||||
if !navModel.isSearching {
|
||||
scrapingModel.searchResults = []
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,17 +9,20 @@ import SwiftUI
|
|||
|
||||
struct SettingsView: View {
|
||||
@EnvironmentObject var debridManager: DebridManager
|
||||
@EnvironmentObject var sourceManager: SourceManager
|
||||
|
||||
let backgroundContext = PersistenceController.shared.backgroundContext
|
||||
|
||||
@AppStorage("RealDebrid.Enabled") var realDebridEnabled = false
|
||||
@AppStorage("Actions.DefaultDebrid") var defaultDebridAction: DefaultDebridActionType = .none
|
||||
@AppStorage("Actions.DefaultMagnet") var defaultMagnetAction: DefaultMagnetActionType = .none
|
||||
|
||||
@State private var isProcessing = false
|
||||
|
||||
var body: some View {
|
||||
NavView {
|
||||
Form {
|
||||
Section("Debrid services") {
|
||||
Section(header: "Debrid services") {
|
||||
HStack {
|
||||
Text("Real Debrid")
|
||||
Spacer()
|
||||
|
|
@ -39,9 +42,65 @@ struct SettingsView: View {
|
|||
}
|
||||
}
|
||||
|
||||
Section("Source management") {
|
||||
Section(header: "Source management") {
|
||||
NavigationLink("Source lists", destination: SettingsSourceListView())
|
||||
}
|
||||
|
||||
Section(header: "Default actions") {
|
||||
if realDebridEnabled {
|
||||
NavigationLink(
|
||||
destination: DebridActionPickerView(),
|
||||
label: {
|
||||
HStack {
|
||||
Text("Default debrid action")
|
||||
Spacer()
|
||||
Group {
|
||||
switch defaultDebridAction {
|
||||
case .none:
|
||||
Text("User choice")
|
||||
case .outplayer:
|
||||
Text("Outplayer")
|
||||
case .vlc:
|
||||
Text("VLC")
|
||||
case .infuse:
|
||||
Text("Infuse")
|
||||
case .shareDownload:
|
||||
Text("Share")
|
||||
}
|
||||
}
|
||||
.foregroundColor(.gray)
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
NavigationLink(
|
||||
destination: MagnetActionPickerView(),
|
||||
label: {
|
||||
HStack {
|
||||
Text("Default magnet action")
|
||||
Spacer()
|
||||
Group {
|
||||
switch defaultMagnetAction {
|
||||
case .none:
|
||||
Text("User choice")
|
||||
case .webtor:
|
||||
Text("Webtor")
|
||||
case .shareMagnet:
|
||||
Text("Share")
|
||||
}
|
||||
}
|
||||
.foregroundColor(.gray)
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
Section {
|
||||
ListRowLinkView(text: "Report issues", link: "https://github.com/bdashore3/Ferrite/issues")
|
||||
|
||||
NavigationLink("About", destination: AboutView())
|
||||
}
|
||||
}
|
||||
.sheet(isPresented: $debridManager.showWebView) {
|
||||
LoginWebView(url: URL(string: debridManager.realDebridAuthUrl)!)
|
||||
|
|
|
|||
54
Ferrite/Views/SettingsViews/DefaultActionsPickerViews.swift
Normal file
54
Ferrite/Views/SettingsViews/DefaultActionsPickerViews.swift
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
//
|
||||
// DefaultActionsPickerViews.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 8/11/22.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
struct MagnetActionPickerView: View {
|
||||
@AppStorage("Actions.DefaultMagnet") var defaultMagnetAction: DefaultMagnetActionType = .none
|
||||
|
||||
var body: some View {
|
||||
List {
|
||||
Picker(selection: $defaultMagnetAction, label: EmptyView()) {
|
||||
Text("Let me choose")
|
||||
.tag(DefaultMagnetActionType.none)
|
||||
Text("Open in Webtor")
|
||||
.tag(DefaultMagnetActionType.webtor)
|
||||
Text("Share magnet link")
|
||||
.tag(DefaultMagnetActionType.shareMagnet)
|
||||
}
|
||||
}
|
||||
.pickerStyle(.inline)
|
||||
.listStyle(.insetGrouped)
|
||||
.navigationTitle("Default magnet action")
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
}
|
||||
}
|
||||
|
||||
struct DebridActionPickerView: View {
|
||||
@AppStorage("Actions.DefaultDebrid") var defaultDebridAction: DefaultDebridActionType = .none
|
||||
|
||||
var body: some View {
|
||||
List {
|
||||
Picker(selection: $defaultDebridAction, label: EmptyView()) {
|
||||
Text("Let me choose")
|
||||
.tag(DefaultDebridActionType.none)
|
||||
Text("Open in Outplayer")
|
||||
.tag(DefaultDebridActionType.outplayer)
|
||||
Text("Open in VLC")
|
||||
.tag(DefaultDebridActionType.vlc)
|
||||
Text("Open in Infuse")
|
||||
.tag(DefaultDebridActionType.infuse)
|
||||
Text("Share download link")
|
||||
.tag(DefaultDebridActionType.shareDownload)
|
||||
}
|
||||
}
|
||||
.pickerStyle(.inline)
|
||||
.listStyle(.insetGrouped)
|
||||
.navigationTitle("Default debrid action")
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
//
|
||||
// SettingsSourceUrlView.swift
|
||||
// SettingsSourceListView.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 7/25/22.
|
||||
|
|
@ -10,22 +10,43 @@ import SwiftUI
|
|||
struct SettingsSourceListView: View {
|
||||
let backgroundContext = PersistenceController.shared.backgroundContext
|
||||
|
||||
@EnvironmentObject var navModel: NavigationViewModel
|
||||
|
||||
@FetchRequest(
|
||||
entity: TorrentSourceUrl.entity(),
|
||||
entity: SourceList.entity(),
|
||||
sortDescriptors: []
|
||||
) var sourceUrls: FetchedResults<TorrentSourceUrl>
|
||||
) var sourceLists: FetchedResults<SourceList>
|
||||
|
||||
@State private var presentSourceSheet = false
|
||||
@State private var selectedSourceList: SourceList?
|
||||
|
||||
var body: some View {
|
||||
List {
|
||||
ForEach(sourceUrls, id: \.self) { sourceUrl in
|
||||
Text(sourceUrl.repoName ?? "Unknown repo")
|
||||
}
|
||||
.onDelete { offsets in
|
||||
for index in offsets {
|
||||
if let sourceUrl = sourceUrls[safe: index] {
|
||||
PersistenceController.shared.delete(sourceUrl, context: backgroundContext)
|
||||
ForEach(sourceLists, id: \.self) { sourceList in
|
||||
VStack(alignment: .leading, spacing: 5) {
|
||||
Text(sourceList.name)
|
||||
|
||||
Text(sourceList.author)
|
||||
.foregroundColor(.gray)
|
||||
|
||||
Text("ID: \(sourceList.id)")
|
||||
.font(.caption)
|
||||
.foregroundColor(.gray)
|
||||
}
|
||||
.contextMenu {
|
||||
Button {
|
||||
navModel.selectedSourceList = sourceList
|
||||
presentSourceSheet.toggle()
|
||||
} label: {
|
||||
Text("Edit")
|
||||
Image(systemName: "pencil")
|
||||
}
|
||||
|
||||
Button {
|
||||
PersistenceController.shared.delete(sourceList, context: backgroundContext)
|
||||
} label: {
|
||||
Text("Remove")
|
||||
Image(systemName: "trash")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -8,8 +8,9 @@
|
|||
import SwiftUI
|
||||
|
||||
struct SourceListEditorView: View {
|
||||
@Environment(\.dismiss) var dismiss
|
||||
@Environment(\.presentationMode) var presentationMode
|
||||
|
||||
@EnvironmentObject var navModel: NavigationViewModel
|
||||
@EnvironmentObject var sourceManager: SourceManager
|
||||
|
||||
let backgroundContext = PersistenceController.shared.backgroundContext
|
||||
|
|
@ -26,6 +27,9 @@ struct SourceListEditorView: View {
|
|||
.autocapitalization(.none)
|
||||
}
|
||||
}
|
||||
.onAppear {
|
||||
sourceUrl = navModel.selectedSourceList?.urlString ?? ""
|
||||
}
|
||||
.alert(isPresented: $sourceManager.showUrlErrorAlert) {
|
||||
Alert(
|
||||
title: Text("Error"),
|
||||
|
|
@ -38,20 +42,26 @@ struct SourceListEditorView: View {
|
|||
.toolbar {
|
||||
ToolbarItem(placement: .navigationBarLeading) {
|
||||
Button("Cancel") {
|
||||
dismiss()
|
||||
presentationMode.wrappedValue.dismiss()
|
||||
}
|
||||
}
|
||||
|
||||
ToolbarItem(placement: .navigationBarTrailing) {
|
||||
Button("Save") {
|
||||
Task {
|
||||
if await sourceManager.addSourceList(sourceUrl: sourceUrl) {
|
||||
dismiss()
|
||||
if await sourceManager.addSourceList(
|
||||
sourceUrl: sourceUrl,
|
||||
existingSourceList: navModel.selectedSourceList
|
||||
) {
|
||||
presentationMode.wrappedValue.dismiss()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.onDisappear {
|
||||
navModel.selectedSourceList = nil
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,80 +0,0 @@
|
|||
//
|
||||
// SourceListView.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 7/24/22.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
struct SourceListView: View {
|
||||
@EnvironmentObject var sourceManager: SourceManager
|
||||
|
||||
let backgroundContext = PersistenceController.shared.backgroundContext
|
||||
|
||||
@FetchRequest(
|
||||
entity: TorrentSource.entity(),
|
||||
sortDescriptors: []
|
||||
) var sources: FetchedResults<TorrentSource>
|
||||
|
||||
@State private var availableSourceLength = 0
|
||||
|
||||
var body: some View {
|
||||
NavView {
|
||||
List {
|
||||
if !sources.isEmpty {
|
||||
Section("Installed") {
|
||||
ForEach(sources, id: \.self) { source in
|
||||
Toggle(isOn: Binding<Bool>(
|
||||
get: { source.enabled },
|
||||
set: {
|
||||
source.enabled = $0
|
||||
PersistenceController.shared.save()
|
||||
}
|
||||
)) {
|
||||
Text(source.name ?? "Unknown Source")
|
||||
}
|
||||
}
|
||||
.onDelete { offsets in
|
||||
for index in offsets {
|
||||
if let source = sources[safe: index] {
|
||||
PersistenceController.shared.delete(source, context: backgroundContext)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if sourceManager.availableSources.contains(where: { avail in
|
||||
!sources.contains(where: { avail.name == $0.name })
|
||||
}) {
|
||||
Section("Catalog") {
|
||||
ForEach(sourceManager.availableSources, id: \.self) { availableSource in
|
||||
if !sources.contains(where: { availableSource.name == $0.name }) {
|
||||
HStack {
|
||||
Text(availableSource.name ?? "Unnamed source")
|
||||
|
||||
Spacer()
|
||||
|
||||
Button("Install") {
|
||||
sourceManager.installSource(sourceJson: availableSource)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.task {
|
||||
await sourceManager.fetchSourcesFromUrl()
|
||||
}
|
||||
.navigationTitle("Sources")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct SourceListView_Previews: PreviewProvider {
|
||||
static var previews: some View {
|
||||
SourceListView()
|
||||
}
|
||||
}
|
||||
53
Ferrite/Views/SourceViews/InstalledSourceView.swift
Normal file
53
Ferrite/Views/SourceViews/InstalledSourceView.swift
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
//
|
||||
// InstalledSourceView.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 8/5/22.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
struct InstalledSourceView: View {
|
||||
let backgroundContext = PersistenceController.shared.backgroundContext
|
||||
|
||||
@EnvironmentObject var navModel: NavigationViewModel
|
||||
|
||||
@ObservedObject var installedSource: Source
|
||||
|
||||
var body: some View {
|
||||
Toggle(isOn: Binding<Bool>(
|
||||
get: { installedSource.enabled },
|
||||
set: {
|
||||
installedSource.enabled = $0
|
||||
PersistenceController.shared.save()
|
||||
}
|
||||
)) {
|
||||
VStack(alignment: .leading, spacing: 5) {
|
||||
HStack {
|
||||
Text(installedSource.name)
|
||||
Text("v\(installedSource.version)")
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
|
||||
Text("by \(installedSource.author)")
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
}
|
||||
.contextMenu {
|
||||
Button {
|
||||
navModel.selectedSource = installedSource
|
||||
navModel.showSourceSettings.toggle()
|
||||
} label: {
|
||||
Text("Settings")
|
||||
Image(systemName: "gear")
|
||||
}
|
||||
|
||||
Button {
|
||||
PersistenceController.shared.delete(installedSource, context: backgroundContext)
|
||||
} label: {
|
||||
Text("Remove")
|
||||
Image(systemName: "trash")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
35
Ferrite/Views/SourceViews/SourceCatalogView.swift
Normal file
35
Ferrite/Views/SourceViews/SourceCatalogView.swift
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
//
|
||||
// SourceCatalogButtonView.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 8/5/22.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
struct SourceCatalogButtonView: View {
|
||||
@EnvironmentObject var sourceManager: SourceManager
|
||||
|
||||
let availableSource: SourceJson
|
||||
|
||||
var body: some View {
|
||||
HStack {
|
||||
VStack(alignment: .leading, spacing: 5) {
|
||||
HStack {
|
||||
Text(availableSource.name)
|
||||
Text("v\(availableSource.version)")
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
|
||||
Text("by \(availableSource.author ?? "Unknown")")
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
|
||||
Spacer()
|
||||
|
||||
Button("Install") {
|
||||
sourceManager.installSource(sourceJson: availableSource)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
165
Ferrite/Views/SourceViews/SourceSettingsView.swift
Normal file
165
Ferrite/Views/SourceViews/SourceSettingsView.swift
Normal file
|
|
@ -0,0 +1,165 @@
|
|||
//
|
||||
// SourceSettingsView.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 8/4/22.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
struct SourceSettingsView: View {
|
||||
@Environment(\.presentationMode) var presentationMode
|
||||
|
||||
@EnvironmentObject var navModel: NavigationViewModel
|
||||
|
||||
var body: some View {
|
||||
NavView {
|
||||
List {
|
||||
if let selectedSource = navModel.selectedSource {
|
||||
Section(header: "Info") {
|
||||
VStack(alignment: .leading, spacing: 5) {
|
||||
HStack {
|
||||
Text(selectedSource.name)
|
||||
|
||||
Text("v\(selectedSource.version)")
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
|
||||
Text("by \(selectedSource.author)")
|
||||
.foregroundColor(.secondary)
|
||||
|
||||
Group {
|
||||
Text("ID: \(selectedSource.id)")
|
||||
|
||||
if let listId = selectedSource.listId {
|
||||
Text("List ID: \(listId)")
|
||||
} else {
|
||||
Text("No list ID found. This source should be removed.")
|
||||
}
|
||||
}
|
||||
.foregroundColor(.secondary)
|
||||
.font(.caption)
|
||||
}
|
||||
}
|
||||
|
||||
if selectedSource.dynamicBaseUrl {
|
||||
SourceSettingsBaseUrlView(selectedSource: selectedSource)
|
||||
}
|
||||
|
||||
if let sourceApi = selectedSource.api {
|
||||
SourceSettingsApiView(selectedSourceApi: sourceApi)
|
||||
}
|
||||
|
||||
SourceSettingsMethodView(selectedSource: selectedSource)
|
||||
}
|
||||
}
|
||||
.listStyle(.insetGrouped)
|
||||
.onDisappear {
|
||||
PersistenceController.shared.save()
|
||||
}
|
||||
.navigationTitle("Source settings")
|
||||
.toolbar {
|
||||
ToolbarItem(placement: .navigationBarTrailing) {
|
||||
Button("Done") {
|
||||
presentationMode.wrappedValue.dismiss()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct SourceSettingsBaseUrlView: View {
|
||||
@ObservedObject var selectedSource: Source
|
||||
|
||||
@State private var tempBaseUrl: String = ""
|
||||
var body: some View {
|
||||
Section(
|
||||
header: Text("Base URL"),
|
||||
footer: Text("Enter the base URL of your server.")
|
||||
) {
|
||||
TextField("https://...", text: $tempBaseUrl, onEditingChanged: { isFocused in
|
||||
if !isFocused {
|
||||
if tempBaseUrl.last == "/" {
|
||||
selectedSource.baseUrl = String(tempBaseUrl.dropLast())
|
||||
} else {
|
||||
selectedSource.baseUrl = tempBaseUrl
|
||||
}
|
||||
}
|
||||
})
|
||||
.keyboardType(.URL)
|
||||
.onAppear {
|
||||
tempBaseUrl = selectedSource.baseUrl ?? ""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct SourceSettingsApiView: View {
|
||||
@ObservedObject var selectedSourceApi: SourceApi
|
||||
|
||||
@State private var tempClientId: String = ""
|
||||
@State private var tempClientSecret: String = ""
|
||||
|
||||
enum Field {
|
||||
case secure, plain
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
Section(
|
||||
header: Text("API credentials"),
|
||||
footer: Text("Grab the required API credentials from the website. A client secret can be an API token.")
|
||||
) {
|
||||
if selectedSourceApi.dynamicClientId {
|
||||
TextField("Client ID", text: $tempClientId, onEditingChanged: { isFocused in
|
||||
if !isFocused {
|
||||
selectedSourceApi.clientId = tempClientId
|
||||
}
|
||||
})
|
||||
.autocapitalization(.none)
|
||||
.onAppear {
|
||||
tempClientId = selectedSourceApi.clientId ?? ""
|
||||
}
|
||||
}
|
||||
|
||||
if selectedSourceApi.clientSecret != nil {
|
||||
TextField("Token", text: $tempClientSecret, onEditingChanged: { isFocused in
|
||||
if !isFocused {
|
||||
selectedSourceApi.clientSecret = tempClientSecret
|
||||
}
|
||||
})
|
||||
.autocapitalization(.none)
|
||||
.onAppear {
|
||||
tempClientSecret = selectedSourceApi.clientSecret ?? ""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct SourceSettingsMethodView: View {
|
||||
@ObservedObject var selectedSource: Source
|
||||
|
||||
@State private var selectedTempParser: SourcePreferredParser = .none
|
||||
|
||||
var body: some View {
|
||||
Picker("Fetch method", selection: $selectedTempParser) {
|
||||
if selectedSource.htmlParser != nil {
|
||||
Text("Web scraping")
|
||||
.tag(SourcePreferredParser.scraping)
|
||||
}
|
||||
|
||||
if selectedSource.rssParser != nil {
|
||||
Text("RSS")
|
||||
.tag(SourcePreferredParser.rss)
|
||||
}
|
||||
}
|
||||
.pickerStyle(.inline)
|
||||
.onAppear {
|
||||
selectedTempParser = SourcePreferredParser(rawValue: selectedSource.preferredParser) ?? .none
|
||||
}
|
||||
.onChange(of: selectedTempParser) { _ in
|
||||
selectedSource.preferredParser = selectedTempParser.rawValue
|
||||
}
|
||||
}
|
||||
}
|
||||
35
Ferrite/Views/SourceViews/SourceUpdateButtonView.swift
Normal file
35
Ferrite/Views/SourceViews/SourceUpdateButtonView.swift
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
//
|
||||
// SourceUpdateButtonView.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 8/5/22.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
struct SourceUpdateButtonView: View {
|
||||
@EnvironmentObject var sourceManager: SourceManager
|
||||
|
||||
let updatedSource: SourceJson
|
||||
|
||||
var body: some View {
|
||||
HStack {
|
||||
VStack(alignment: .leading, spacing: 5) {
|
||||
HStack {
|
||||
Text(updatedSource.name)
|
||||
Text("v\(updatedSource.version)")
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
|
||||
Text("by \(updatedSource.author ?? "Unknown")")
|
||||
.foregroundColor(.secondary)
|
||||
}
|
||||
|
||||
Spacer()
|
||||
|
||||
Button("Update") {
|
||||
sourceManager.installSource(sourceJson: updatedSource, doUpsert: true)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
106
Ferrite/Views/SourcesView.swift
Normal file
106
Ferrite/Views/SourcesView.swift
Normal file
|
|
@ -0,0 +1,106 @@
|
|||
//
|
||||
// SourceListView.swift
|
||||
// Ferrite
|
||||
//
|
||||
// Created by Brian Dashore on 7/24/22.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
struct SourcesView: View {
|
||||
@EnvironmentObject var sourceManager: SourceManager
|
||||
@EnvironmentObject var navModel: NavigationViewModel
|
||||
|
||||
let backgroundContext = PersistenceController.shared.backgroundContext
|
||||
|
||||
@FetchRequest(
|
||||
entity: Source.entity(),
|
||||
sortDescriptors: []
|
||||
) var sources: FetchedResults<Source>
|
||||
|
||||
private var updatedSources: [SourceJson] {
|
||||
var tempSources: [SourceJson] = []
|
||||
|
||||
for source in sources {
|
||||
guard let availableSource = sourceManager.availableSources.first(where: {
|
||||
source.listId == $0.listId && source.name == $0.name && source.author == $0.author
|
||||
}) else {
|
||||
continue
|
||||
}
|
||||
|
||||
if availableSource.version > source.version {
|
||||
tempSources.append(availableSource)
|
||||
}
|
||||
}
|
||||
|
||||
return tempSources
|
||||
}
|
||||
|
||||
@State private var viewTask: Task<Void, Never>? = nil
|
||||
|
||||
var body: some View {
|
||||
NavView {
|
||||
List {
|
||||
if !updatedSources.isEmpty {
|
||||
Section(header: "Updates") {
|
||||
ForEach(updatedSources, id: \.self) { source in
|
||||
SourceUpdateButtonView(updatedSource: source)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if !sources.isEmpty {
|
||||
Section(header: "Installed") {
|
||||
ForEach(sources, id: \.self) { source in
|
||||
InstalledSourceView(installedSource: source)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if sourceManager.availableSources.contains(where: { availableSource in
|
||||
!sources.contains(
|
||||
where: {
|
||||
availableSource.name == $0.name &&
|
||||
availableSource.listId == $0.listId &&
|
||||
availableSource.author == $0.author
|
||||
}
|
||||
)
|
||||
}) {
|
||||
Section(header: "Catalog") {
|
||||
ForEach(sourceManager.availableSources, id: \.self) { availableSource in
|
||||
if !sources.contains(
|
||||
where: {
|
||||
availableSource.name == $0.name &&
|
||||
availableSource.listId == $0.listId &&
|
||||
availableSource.author == $0.author
|
||||
}
|
||||
) {
|
||||
SourceCatalogButtonView(availableSource: availableSource)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.listStyle(.insetGrouped)
|
||||
.sheet(isPresented: $navModel.showSourceSettings) {
|
||||
SourceSettingsView()
|
||||
.environmentObject(navModel)
|
||||
}
|
||||
.onAppear {
|
||||
viewTask = Task {
|
||||
await sourceManager.fetchSourcesFromUrl()
|
||||
}
|
||||
}
|
||||
.onDisappear {
|
||||
viewTask?.cancel()
|
||||
}
|
||||
.navigationTitle("Sources")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct SourcesView_Previews: PreviewProvider {
|
||||
static var previews: some View {
|
||||
SourcesView()
|
||||
}
|
||||
}
|
||||
674
LICENSE
Normal file
674
LICENSE
Normal file
|
|
@ -0,0 +1,674 @@
|
|||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
<program> Copyright (C) <year> <name of author>
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||
58
README.md
Normal file
58
README.md
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
# Ferrite
|
||||
|
||||
A media search engine for iOS with a plugin API to extend its functionality.
|
||||
|
||||
## Disclaimer
|
||||
|
||||
This project is developed with a hobbyist/educational purpose and I am not responsible for what you do with Ferrite.
|
||||
|
||||
Ferrite does not and will never host any content. It is a search engine and will be nothing more.
|
||||
|
||||
## Why did I make this?
|
||||
|
||||
Finding shows and movies is usually pretty easy because there are many websites out there with the ability to search for the files you want.
|
||||
|
||||
However, the main problem is that these websites tend to suck in terms of UI or finding media to watch. Ferrite aims to provide a better UI to search and find the media you want.
|
||||
|
||||
I also wanted to support the use of RealDebrid since there aren't any (free) options on iOS that have support for this service.
|
||||
|
||||
## What iOS versions are supported?
|
||||
|
||||
iOS 14 and up. I was able to successfully backport the app!
|
||||
|
||||
## Planned features
|
||||
|
||||
- Website API support in sources: This allows for website APIs to be used in Ferrite sources which is quicker than scraping or RSS parsing
|
||||
|
||||
## Downloads
|
||||
|
||||
Ferrite will only exist as an ipa. There are and will never be any plans to release on TestFlight or the App Store. Ipa builds are automatically built and are provided in CircleCI artifacts.
|
||||
|
||||
## Building from source
|
||||
|
||||
Xcode 14 must be used since Ferrite requires some iOS 16 APIs that are not present in Xcode 13. Please make sure you have the right Xcode or download the beta xip from Apple's developer website.
|
||||
|
||||
There is currently one branch in the repository:
|
||||
|
||||
- default: The current working branch. This will change in the future once a stable version is released.
|
||||
|
||||
## Contribution
|
||||
|
||||
If you have issues with the app:
|
||||
|
||||
- Describe the issue in detail
|
||||
- If you have a feature request, please indicate it as so. Planned features are in a different section of the README, so be sure to read those before submitting.
|
||||
If you want to make custom icons for the app:
|
||||
- Please join [the discord](https://discord.gg/sYQxnuD7Fj) for more info
|
||||
|
||||
## Developers and Permissions
|
||||
|
||||
I try to make comments/commits as detailed as possible, but if you don't understand something, please contact me via Discord.
|
||||
|
||||
Creator/Developer: kingbri
|
||||
|
||||
Developer Website: [kingbri.dev](https://kingbri.dev)
|
||||
|
||||
Developer Discord: kingbri#6666
|
||||
|
||||
Join the support discord here: [Ferrite Discord](https://discord.gg/sYQxnuD7Fj)
|
||||
Loading…
Reference in a new issue