Skip to content

Commit

Permalink
chore: remove dead code and add Periphery
Browse files Browse the repository at this point in the history
  • Loading branch information
flaksp committed Feb 2, 2025
1 parent 2c38e56 commit b7c6c38
Show file tree
Hide file tree
Showing 41 changed files with 82 additions and 573 deletions.
42 changes: 42 additions & 0 deletions .github/workflows/code_qualty.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,27 @@ name: Code Quality
on: pull_request

jobs:
xcodegen:
name: XcodeGen
runs-on: macos-15

steps:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Install XcodeGen
run: brew install xcodegen

- name: Generate Xcode Configs
run: xcodegen generate

- name: Upload Ichime.xcodeproj Artifact
uses: actions/upload-artifact@v4
with:
name: Ichime.xcodeproj
path: ./Ichime.xcodeproj/
retention-days: 7

swift_format:
name: swift-format
runs-on: macos-15
Expand Down Expand Up @@ -38,3 +59,24 @@ jobs:

- name: Check Code Formatting
run: swiftlint --strict

periphery:
name: Periphery
runs-on: macos-15
needs: [xcodegen]

steps:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Install Periphery
run: brew install periphery

- name: Download Ichime.xcodeproj Artifact
uses: actions/download-artifact@v4
with:
name: Ichime.xcodeproj
path: ./Ichime.xcodeproj/

- name: Check For Unused Code
run: periphery scan
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/.idea/
/.vscode/
/Ichime.xcodeproj/
/DerivedData/
.DS_Store
*.app
*.ipa
Expand Down
4 changes: 4 additions & 0 deletions .periphery.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
project: Ichime.xcodeproj
retain_public: true
schemes:
- Ichime_tvOS
30 changes: 0 additions & 30 deletions Ichime/AppPreferences/PlayerPreference.swift

This file was deleted.

23 changes: 0 additions & 23 deletions Ichime/Calendar/Model/ShowFromCalendar.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import Anime365ApiClient
import Foundation
import ShikimoriApiClient

Expand All @@ -12,27 +11,9 @@ struct ShowFromCalendar: Hashable, Identifiable {
let translated: TranslatedTitles
}

enum BroadcastType {
case tv
case other

static func createFromApiType(apiType: String) -> Self {
switch apiType {
case "tv":
return .tv
default:
return .other
}
}
}

let id: Int
let title: Title
let posterUrl: URL?
let score: Float?
let numberOfEpisodes: Int?
let broadcastType: BroadcastType
let isOngoing: Bool
let nextEpisodeNumber: Int
let nextEpisodeReleaseDate: Date

Expand All @@ -58,10 +39,6 @@ struct ShowFromCalendar: Hashable, Identifiable {
)
),
posterUrl: URL(string: shikimoriBaseUrl.absoluteString + anime.image.original),
score: score <= 0 ? nil : Float(anime.score),
numberOfEpisodes: anime.episodes <= 0 ? nil : anime.episodes,
broadcastType: .createFromApiType(apiType: anime.kind),
isOngoing: anime.status == "ongoing",
nextEpisodeNumber: calendarEntry.next_episode,
nextEpisodeReleaseDate: isoDateFormatter.date(from: calendarEntry.next_episode_at)!
)
Expand Down
1 change: 0 additions & 1 deletion Ichime/ContentView/ContentView.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import ScraperAPI
import SwiftUI

private enum NavigationStyle: String {
Expand Down
7 changes: 2 additions & 5 deletions Ichime/ContentView/ContentViewWithSideBar.swift
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import ScraperAPI
import SwiftData
import SwiftUI

struct ContentViewWithSideBar: View {
@Environment(\.modelContext) private var modelContext
@AppStorage("ContentViewWithTabView.selectedTab") private var selectedTab: Tabs = .home

@State private var route: Route?
Expand Down Expand Up @@ -101,10 +99,10 @@ struct ContentViewWithSideBar: View {
switch action {
case URLActions.show.rawValue:
print("its show \(id)")
self.route = Route(id: id, type: .show, title: nil)
self.route = Route(id: id, type: .show)
case URLActions.episode.rawValue:
print("its episode \(id)")
self.route = Route(id: id, type: .episode, title: episodeTitle)
self.route = Route(id: id, type: .episode)
default:
print("idk")
}
Expand All @@ -120,5 +118,4 @@ enum URLActions: String {
struct Route: Hashable, Identifiable {
let id: Int
let type: URLActions
let title: String?
}
6 changes: 2 additions & 4 deletions Ichime/ContentView/ContentViewWithTabBar.swift
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import ScraperAPI
import SwiftData
import SwiftUI

struct ContentViewWithTabBar: View {
@Environment(\.modelContext) private var modelContext
@AppStorage("ContentViewWithTabView.selectedTab") private var selectedTab: Tabs = .home
@State private var route: Route?

Expand Down Expand Up @@ -103,10 +101,10 @@ struct ContentViewWithTabBar: View {
switch action {
case URLActions.show.rawValue:
print("its show \(id)")
self.route = Route(id: id, type: .show, title: nil)
self.route = Route(id: id, type: .show)
case URLActions.episode.rawValue:
print("its episode \(id)")
self.route = Route(id: id, type: .episode, title: episodeTitle)
self.route = Route(id: id, type: .episode)
default:
print("idk")
}
Expand Down
32 changes: 15 additions & 17 deletions Ichime/CurrentlyWatching/Component/WatchCard.swift
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import SwiftUI

struct WatchCard: View {
private let ROW_PADDING: CGFloat = 4

let data: WatchCardModel

var body: some View {
Expand All @@ -25,7 +23,7 @@ struct WatchCard: View {
name: .init(ru: "Взрывной храбрец Брейверн", romaji: "Yuuki Bakuhatsu Bang Bravern"),
title: "2 серия",
sideText: "Русские субтитры",
data: .init(episode: 1, title: "2 серия", translation: 1)
data: .init(episode: 1)
)
)
WatchCard(
Expand All @@ -35,7 +33,7 @@ struct WatchCard: View {
name: .init(ru: "Взрывной храбрец Брейверн", romaji: "Yuuki Bakuhatsu Bang Bravern"),
title: "OVA 2 серия",
sideText: "Русская озвучка",
data: .init(episode: 1, title: "2 серия", translation: 1)
data: .init(episode: 1)
)
)
WatchCard(
Expand All @@ -45,7 +43,7 @@ struct WatchCard: View {
name: .init(ru: "Взрывной храбрец Брейверн", romaji: "Yuuki Bakuhatsu Bang Bravern"),
title: "Фильм",
sideText: "RAW",
data: .init(episode: 1, title: "2 серия", translation: 1)
data: .init(episode: 1)
)
)
WatchCard(
Expand All @@ -55,7 +53,7 @@ struct WatchCard: View {
name: .init(ru: "Взрывной храбрец Брейверн", romaji: "Yuuki Bakuhatsu Bang Bravern"),
title: "Фильм",
sideText: "RAW",
data: .init(episode: 1, title: "2 серия", translation: 1)
data: .init(episode: 1)
)
)
WatchCard(
Expand All @@ -70,7 +68,7 @@ struct WatchCard: View {
),
title: "Фильм",
sideText: "RAW",
data: .init(episode: 1, title: "2 серия", translation: 1)
data: .init(episode: 1)
)
)
WatchCard(
Expand All @@ -80,7 +78,7 @@ struct WatchCard: View {
name: .init(ru: "Братик-братик 2", romaji: "Shixiong A Shixiong 2nd Season"),
title: "Фильм",
sideText: "RAW",
data: .init(episode: 1, title: "2 серия", translation: 1)
data: .init(episode: 1)
)
)
}
Expand All @@ -99,7 +97,7 @@ struct WatchCard: View {
name: .init(ru: "Взрывной храбрец Брейверн", romaji: "Yuuki Bakuhatsu Bang Bravern"),
title: "2 серия",
sideText: "Вышло сегодня",
data: .init(episode: 1, title: "2 серия", translation: 1)
data: .init(episode: 1)
)
)
WatchCard(
Expand All @@ -109,7 +107,7 @@ struct WatchCard: View {
name: .init(ru: "Взрывной храбрец Брейверн", romaji: "Yuuki Bakuhatsu Bang Bravern"),
title: "2 серия",
sideText: "Вышло 18.01.24",
data: .init(episode: 1, title: "2 серия", translation: 1)
data: .init(episode: 1)
)
)
WatchCard(
Expand All @@ -119,7 +117,7 @@ struct WatchCard: View {
name: .init(ru: "Взрывной храбрец Брейверн", romaji: "Yuuki Bakuhatsu Bang Bravern"),
title: "OVA 2 серия",
sideText: "Смотрели вчера",
data: .init(episode: 1, title: "2 серия", translation: 1)
data: .init(episode: 1)
)
)
WatchCard(
Expand All @@ -129,7 +127,7 @@ struct WatchCard: View {
name: .init(ru: "Взрывной храбрец Брейверн", romaji: "Yuuki Bakuhatsu Bang Bravern"),
title: "Фильм",
sideText: "В плане с 18.01.24",
data: .init(episode: 1, title: "2 серия", translation: 1)
data: .init(episode: 1)
)
)
WatchCard(
Expand All @@ -139,7 +137,7 @@ struct WatchCard: View {
name: .init(ru: "Взрывной храбрец Брейверн", romaji: "Yuuki Bakuhatsu Bang Bravern"),
title: "4000 серия",
sideText: "В плане сегодня",
data: .init(episode: 1, title: "2 серия", translation: 1)
data: .init(episode: 1)
)
)
WatchCard(
Expand All @@ -149,7 +147,7 @@ struct WatchCard: View {
name: .init(ru: "Взрывной храбрец Брейверн", romaji: "Yuuki Bakuhatsu Bang Bravern"),
title: "4000 серия",
sideText: "Запланировали 18.01.24",
data: .init(episode: 1, title: "2 серия", translation: 1)
data: .init(episode: 1)
)
)
WatchCard(
Expand All @@ -159,7 +157,7 @@ struct WatchCard: View {
name: .init(ru: "Взрывной храбрец Брейверн", romaji: "Yuuki Bakuhatsu Bang Bravern"),
title: "Фильм",
sideText: "Запланировали 18.01.24",
data: .init(episode: 1, title: "2 серия", translation: 1)
data: .init(episode: 1)
)
)
WatchCard(
Expand All @@ -174,7 +172,7 @@ struct WatchCard: View {
),
title: "Фильм",
sideText: "Запланировали 18.01.24",
data: .init(episode: 1, title: "2 серия", translation: 1)
data: .init(episode: 1)
)
)
WatchCard(
Expand All @@ -184,7 +182,7 @@ struct WatchCard: View {
name: .init(ru: "Братик-братик 2", romaji: "Shixiong A Shixiong 2nd Season"),
title: "Фильм",
sideText: "Запланировали 18.01.24",
data: .init(episode: 1, title: "2 серия", translation: 1)
data: .init(episode: 1)
)
)
}
Expand Down
8 changes: 2 additions & 6 deletions Ichime/CurrentlyWatching/Model/WatchCardModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ extension ScraperAPI.Types.WatchShow.UpdateType {
struct WatchCardModel: Equatable, Identifiable, Hashable {
struct WatchData: Hashable {
let episode: Int
let title: String
let translation: Int?
}

let id: Int
Expand Down Expand Up @@ -56,7 +54,7 @@ struct WatchCardModel: Equatable, Identifiable, Hashable {
name: show.name,
title: show.episode.displayName,
sideText: show.update.displayName,
data: .init(episode: show.episode.id, title: show.episode.displayName, translation: nil)
data: .init(episode: show.episode.id)
)
}

Expand All @@ -68,9 +66,7 @@ struct WatchCardModel: Equatable, Identifiable, Hashable {
title: notification.episode.displayName,
sideText: notification.translation.type,
data: .init(
episode: notification.episode.id,
title: notification.episode.displayName,
translation: notification.translation.id
episode: notification.episode.id
)
)
}
Expand Down
14 changes: 0 additions & 14 deletions Ichime/DependencyInjection/ServiceLocator.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import Anime365ApiClient
import Foundation
import ScraperAPI

enum ServiceLocator {
static let appGroup = "group.dev.midorinome.ichime.group"
Expand Down Expand Up @@ -34,18 +32,6 @@ enum ServiceLocator {
return appName
}

static var permittedScheduleBGTaskName: String {
guard
let tasks = Bundle.main.object(forInfoDictionaryKey: "BGTaskSchedulerPermittedIdentifiers")
as? [String],
let task = tasks.first
else {
fatalError("Cannot get bg task name")
}

return task
}

static var applicationVersion: String {
guard
let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString")
Expand Down
Loading

0 comments on commit b7c6c38

Please sign in to comment.