From c5bf7a6d3a31ed637040cdbe01ed5d562df8a427 Mon Sep 17 00:00:00 2001 From: Kaunteya Suryawanshi Date: Thu, 12 Jul 2018 15:28:44 +0530 Subject: [PATCH] Structure change --- Mac Cache Cleaner.xcodeproj/project.pbxproj | 18 +++++++++++++++--- MacCacheCleaner/AppDelegate.swift | 5 ++--- .../{Extensions => Others}/Log.swift | 0 MacCacheCleaner/Others/Other.swift | 10 ++++++++++ .../{Extensions => Others}/Tagged.swift | 0 .../AutoStartSpinner.swift} | 6 +++--- 6 files changed, 30 insertions(+), 9 deletions(-) rename MacCacheCleaner/{Extensions => Others}/Log.swift (100%) create mode 100644 MacCacheCleaner/Others/Other.swift rename MacCacheCleaner/{Extensions => Others}/Tagged.swift (100%) rename MacCacheCleaner/{Extensions/Other.swift => View/AutoStartSpinner.swift} (71%) diff --git a/Mac Cache Cleaner.xcodeproj/project.pbxproj b/Mac Cache Cleaner.xcodeproj/project.pbxproj index 39e4507..f999fce 100644 --- a/Mac Cache Cleaner.xcodeproj/project.pbxproj +++ b/Mac Cache Cleaner.xcodeproj/project.pbxproj @@ -24,6 +24,7 @@ E389A46320EA651B0044B20A /* CacheList.swift in Sources */ = {isa = PBXBuildFile; fileRef = E389A46220EA651B0044B20A /* CacheList.swift */; }; E389A46520EA98470044B20A /* CacheFetcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = E389A46420EA98470044B20A /* CacheFetcher.swift */; }; E389A46720EAA0A20044B20A /* NSWindowController+intialize.swift in Sources */ = {isa = PBXBuildFile; fileRef = E389A46620EAA0A20044B20A /* NSWindowController+intialize.swift */; }; + E3B073B720F75E94009DA160 /* AutoStartSpinner.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3B073B620F75E94009DA160 /* AutoStartSpinner.swift */; }; E3F7285820E0FF6F007B0CB0 /* FileManager+Size.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3F7285720E0FF6F007B0CB0 /* FileManager+Size.swift */; }; E3F728D920E3B1C1007B0CB0 /* Other.swift in Sources */ = {isa = PBXBuildFile; fileRef = E3F728D820E3B1C1007B0CB0 /* Other.swift */; }; /* End PBXBuildFile section */ @@ -61,6 +62,7 @@ E389A46220EA651B0044B20A /* CacheList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CacheList.swift; sourceTree = ""; }; E389A46420EA98470044B20A /* CacheFetcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CacheFetcher.swift; sourceTree = ""; }; E389A46620EAA0A20044B20A /* NSWindowController+intialize.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSWindowController+intialize.swift"; sourceTree = ""; }; + E3B073B620F75E94009DA160 /* AutoStartSpinner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoStartSpinner.swift; sourceTree = ""; }; E3F7285720E0FF6F007B0CB0 /* FileManager+Size.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FileManager+Size.swift"; sourceTree = ""; }; E3F728D820E3B1C1007B0CB0 /* Other.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Other.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -97,6 +99,7 @@ children = ( E34E83052079CD5400BA09DF /* Main.storyboard */, E352B6B320E90E02004C276B /* CacheTableCellView.swift */, + E3B073B620F75E94009DA160 /* AutoStartSpinner.swift */, ); path = View; sourceTree = ""; @@ -127,6 +130,7 @@ E32B71DF20F4A2E600158B7F /* TableViewHandler.swift */, E32B71C520F083AD00158B7F /* View */, E3F728D620E3B02C007B0CB0 /* Models */, + E3B073B520F75E3D009DA160 /* Others */, E3F7285D20E10720007B0CB0 /* Extensions */, E34E83032079CD5400BA09DF /* Assets.xcassets */, E3197F1520E8007500746439 /* Source.json */, @@ -136,6 +140,16 @@ path = MacCacheCleaner; sourceTree = ""; }; + E3B073B520F75E3D009DA160 /* Others */ = { + isa = PBXGroup; + children = ( + E309EC7720EE49B200D3D16F /* Log.swift */, + E3F728D820E3B1C1007B0CB0 /* Other.swift */, + E32B71DB20F11E6300158B7F /* Tagged.swift */, + ); + path = Others; + sourceTree = ""; + }; E3F7285D20E10720007B0CB0 /* Extensions */ = { isa = PBXGroup; children = ( @@ -143,9 +157,6 @@ E389A46620EAA0A20044B20A /* NSWindowController+intialize.swift */, E32B71E120F4A6DB00158B7F /* NSStoryboard.swift */, E3197F0F20E78B8C00746439 /* URLSession+Result.swift */, - E3F728D820E3B1C1007B0CB0 /* Other.swift */, - E32B71DB20F11E6300158B7F /* Tagged.swift */, - E309EC7720EE49B200D3D16F /* Log.swift */, ); path = Extensions; sourceTree = ""; @@ -282,6 +293,7 @@ E32B71E220F4A6DB00158B7F /* NSStoryboard.swift in Sources */, E3F7285820E0FF6F007B0CB0 /* FileManager+Size.swift in Sources */, E32B71E020F4A2E600158B7F /* TableViewHandler.swift in Sources */, + E3B073B720F75E94009DA160 /* AutoStartSpinner.swift in Sources */, E32B71DC20F11E6300158B7F /* Tagged.swift in Sources */, E3197F2E20E90A6C00746439 /* MainViewController.swift in Sources */, E34E83002079CD5200BA09DF /* AppDelegate.swift in Sources */, diff --git a/MacCacheCleaner/AppDelegate.swift b/MacCacheCleaner/AppDelegate.swift index a107ae5..3a29852 100644 --- a/MacCacheCleaner/AppDelegate.swift +++ b/MacCacheCleaner/AppDelegate.swift @@ -7,13 +7,12 @@ // import Cocoa +let sourceJSONPath = "https://raw.githubusercontent.com/kaunteya/MacCacheCleaner/master/Source.json" @NSApplicationMain class AppDelegate: NSObject, NSApplicationDelegate { - let cacheListFetcher = CacheFetcher( - urlString: "https://raw.githubusercontent.com/kaunteya/MacCacheCleaner/master/Source.json" - ) + let cacheListFetcher = CacheFetcher(urlString: sourceJSONPath) let cacheList = CacheList() diff --git a/MacCacheCleaner/Extensions/Log.swift b/MacCacheCleaner/Others/Log.swift similarity index 100% rename from MacCacheCleaner/Extensions/Log.swift rename to MacCacheCleaner/Others/Log.swift diff --git a/MacCacheCleaner/Others/Other.swift b/MacCacheCleaner/Others/Other.swift new file mode 100644 index 0000000..bc0d5fb --- /dev/null +++ b/MacCacheCleaner/Others/Other.swift @@ -0,0 +1,10 @@ +// +// Other.swift +// MacCacheCleaner +// +// Created by Kaunteya Suryawanshi on 27/06/18. +// Copyright © 2018 Kaunteya Suryawanshi. All rights reserved. +// + +import AppKit + diff --git a/MacCacheCleaner/Extensions/Tagged.swift b/MacCacheCleaner/Others/Tagged.swift similarity index 100% rename from MacCacheCleaner/Extensions/Tagged.swift rename to MacCacheCleaner/Others/Tagged.swift diff --git a/MacCacheCleaner/Extensions/Other.swift b/MacCacheCleaner/View/AutoStartSpinner.swift similarity index 71% rename from MacCacheCleaner/Extensions/Other.swift rename to MacCacheCleaner/View/AutoStartSpinner.swift index 91bbf66..74b8fb2 100644 --- a/MacCacheCleaner/Extensions/Other.swift +++ b/MacCacheCleaner/View/AutoStartSpinner.swift @@ -1,8 +1,8 @@ // -// Other.swift -// MacCacheCleaner +// AutoStartSpinner.swift +// Mac Cache Cleaner // -// Created by Kaunteya Suryawanshi on 27/06/18. +// Created by Kaunteya Suryawanshi on 12/07/18. // Copyright © 2018 Kaunteya Suryawanshi. All rights reserved. //