1.7

Lrdsnow · Jun 15, 2024 · 520059f · 520059f
1 parent ba2b0a3
commit 520059f
Show file tree

Hide file tree

Showing 48 changed files with 480 additions and 838 deletions.
diff --git a/PurePKG/Main.swift b/PurePKG/Main.swift
@@ -56,11 +56,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         UITableView.appearance().separatorStyle = .none
         UITableView.appearance().separatorColor = .clear
         #endif
-        appData.jbdata.jbtype = Jailbreak.type(appData)
-        appData.jbdata.jbarch = Jailbreak.arch(appData)
-        appData.jbdata.jbroot = Jailbreak.path(appData)
-        appData.deviceInfo = getDeviceInfo()
-        appData.installed_pkgs = RepoHandler.getInstalledTweaks(Jailbreak.path(appData)+"/Library/dpkg")
+        appData.installed_pkgs = RepoHandler.getInstalledTweaks(Jailbreak().path+"/Library/dpkg")
         appData.repos = RepoHandler.getCachedRepos()
         appData.pkgs = appData.repos.flatMap { $0.tweaks }
         if !UserDefaults.standard.bool(forKey: "ignoreInitRefresh") {
@@ -164,11 +160,7 @@ struct ContentViewWatchOS: View {
 
     private func startup() {
         if #available(iOS 14.0, tvOS 14.0, *) {
-            appData.jbdata.jbtype = Jailbreak.type(appData)
-            appData.jbdata.jbarch = Jailbreak.arch(appData)
-            appData.jbdata.jbroot = Jailbreak.path(appData)
-            appData.deviceInfo = getDeviceInfo()
-            appData.installed_pkgs = RepoHandler.getInstalledTweaks(Jailbreak.path(appData)+"/Library/dpkg")
+            appData.installed_pkgs = RepoHandler.getInstalledTweaks(Jailbreak().path+"/Library/dpkg")
             appData.repos = RepoHandler.getCachedRepos()
             appData.pkgs = appData.repos.flatMap { $0.tweaks }
             if !UserDefaults.standard.bool(forKey: "ignoreInitRefresh") {
@@ -245,12 +237,8 @@ struct ContentView: View {
     private func startup() {
         if #available(iOS 14.0, tvOS 14.0, *) {
             if !preview {
-                appData.jbdata.jbtype = Jailbreak.type(appData)
-                appData.jbdata.jbarch = Jailbreak.arch(appData)
-                appData.jbdata.jbroot = Jailbreak.path(appData)
-                appData.deviceInfo = getDeviceInfo()
-                log(appData.deviceInfo)
-                appData.installed_pkgs = RepoHandler.getInstalledTweaks(Jailbreak.path(appData)+"/Library/dpkg")
+                log("PurePKG Running on \(Device().modelIdentifier) running iOS \(Device().pretty_version) (\(Device().build_number))")
+                appData.installed_pkgs = RepoHandler.getInstalledTweaks(Jailbreak().path+"/Library/dpkg")
                 appData.repos = RepoHandler.getCachedRepos()
                 appData.pkgs = appData.repos.flatMap { $0.tweaks }
                 if !UserDefaults.standard.bool(forKey: "ignoreInitRefresh") {
@@ -269,7 +257,7 @@ struct ContentView: View {
             print("Adding Repo: \(repourl)")
             RepoHandler.addRepo(repourl)
         } else if url.pathExtension == "deb" {
-            let info = APTWrapper.spawn(command: "\(Jailbreak.path())/\(Jailbreak.type() == .macos ? "" : "usr/")bin/dpkg-deb", args: ["dpkg-deb", "--field", url.path])
+            let info = APTWrapper.spawn(command: "\(Jailbreak().path)/\(Jailbreak().type == .macos ? "" : "usr/")bin/dpkg-deb", args: ["dpkg-deb", "--field", url.path])
             if info.0 == 0 {
                 let dict = Networking.genDict(info.1)
                 var tweak = RepoHandler.createPackageStruct(dict)

diff --git a/PurePKG/Views/QueueView.swift b/PurePKG/Views/QueueView.swift
@@ -162,7 +162,7 @@ struct InstallQueuedButton: View {
                         showLog = false
                     }
                 } else {
-                    if Jailbreak.type(appData) == .jailed {
+                    if Jailbreak().type == .jailed {
                         showPopup("bruh", "PurePKG is in demo mode, you cannot install tweaks")
                     } else {
                         installingQueue = true

diff --git a/PurePKG/Views/SettingsView.swift b/PurePKG/Views/SettingsView.swift
@@ -43,7 +43,7 @@ struct SettingsView: View {
                 HStack {
                     Text("Device")
                     Spacer()
-                    Text(appData.deviceInfo.modelIdentifier)
+                    Text(Device().modelIdentifier)
                 }.listRowBG()
                 HStack {
                     #if os(watchOS)
@@ -53,9 +53,9 @@ struct SettingsView: View {
                     #endif
                     Spacer()
                     #if os(watchOS)
-                    Text("\(appData.deviceInfo.major).\(appData.deviceInfo.minor)\(appData.deviceInfo.patch == 0 ? "" : ".\(appData.deviceInfo.patch)")")
+                    Text("\(Device().pretty_version)")
                     #else
-                    Text("\(appData.deviceInfo.major).\(appData.deviceInfo.minor)\(appData.deviceInfo.patch == 0 ? "" : ".\(appData.deviceInfo.patch)")\(appData.deviceInfo.build_number == "0" ? "" : " (\(appData.deviceInfo.build_number))")")
+                    Text("\(Device().pretty_version)\(Device().build_number == "0" ? "" : " (\(Device().build_number))")")
                     #endif
                 }.listRowBG()
 #if !os(macOS)
@@ -66,7 +66,7 @@ struct SettingsView: View {
                     Text("Jailbreak Type")
                     #endif
                     Spacer()
-                    Text((appData.jbdata.jbtype == .rootful || appData.jbdata.jbtype == .tvOS_rootful) ? "Rootful" : appData.jbdata.jbtype == .rootless ? "Rootless" : appData.jbdata.jbtype == .roothide ? "Roothide" : "Jailed")
+                    Text(Jailbreak().pretty_type)
                 }.listRowBG()
 #endif
                 HStack {
@@ -76,7 +76,7 @@ struct SettingsView: View {
                     Text("Architecture")
                     #endif
                     Spacer()
-                    Text("\(appData.jbdata.jbarch)")
+                    Text(Jailbreak().arch)
                 }.listRowBG()
 #if !os(macOS)
                 if let jb = jb {