diff --git a/OF DL/Crypto/Padding.cs b/OF DL/Crypto/Padding.cs index 4701c1c..34b5ec7 100644 --- a/OF DL/Crypto/Padding.cs +++ b/OF DL/Crypto/Padding.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Security.Cryptography; +using System.Security.Cryptography; namespace WidevineClient.Crypto { diff --git a/OF DL/Entities/Archived/Archived.cs b/OF DL/Entities/Archived/Archived.cs index 7f132e2..1231e1c 100644 --- a/OF DL/Entities/Archived/Archived.cs +++ b/OF DL/Entities/Archived/Archived.cs @@ -1,10 +1,5 @@ using Newtonsoft.Json; using OF_DL.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace OF_DL.Entities.Archived { diff --git a/OF DL/Entities/Archived/ArchivedCollection.cs b/OF DL/Entities/Archived/ArchivedCollection.cs index 2eb56fb..82a1ab3 100644 --- a/OF DL/Entities/Archived/ArchivedCollection.cs +++ b/OF DL/Entities/Archived/ArchivedCollection.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace OF_DL.Entities.Archived { public class ArchivedCollection diff --git a/OF DL/Entities/Auth.cs b/OF DL/Entities/Auth.cs index 86d9f83..e2ea9ff 100644 --- a/OF DL/Entities/Auth.cs +++ b/OF DL/Entities/Auth.cs @@ -1,8 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Newtonsoft.Json; namespace OF_DL.Entities diff --git a/OF DL/Entities/CDRMProjectRequest.cs b/OF DL/Entities/CDRMProjectRequest.cs index b48279b..69be2be 100644 --- a/OF DL/Entities/CDRMProjectRequest.cs +++ b/OF DL/Entities/CDRMProjectRequest.cs @@ -1,9 +1,4 @@ using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace OF_DL.Entities { diff --git a/OF DL/Entities/Highlights/HighlightMedia.cs b/OF DL/Entities/Highlights/HighlightMedia.cs index af51136..12b4ccf 100644 --- a/OF DL/Entities/Highlights/HighlightMedia.cs +++ b/OF DL/Entities/Highlights/HighlightMedia.cs @@ -1,9 +1,4 @@ using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace OF_DL.Entities.Highlights { diff --git a/OF DL/Entities/Highlights/Highlights.cs b/OF DL/Entities/Highlights/Highlights.cs index fbcd4dc..8f3df8a 100644 --- a/OF DL/Entities/Highlights/Highlights.cs +++ b/OF DL/Entities/Highlights/Highlights.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace OF_DL.Entities.Highlights { public class Highlights diff --git a/OF DL/Entities/Lists/UserList.cs b/OF DL/Entities/Lists/UserList.cs index cc42563..28a60d6 100644 --- a/OF DL/Entities/Lists/UserList.cs +++ b/OF DL/Entities/Lists/UserList.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OF_DL.Entities.Lists +namespace OF_DL.Entities.Lists { public class UserList { diff --git a/OF DL/Entities/Lists/UsersList.cs b/OF DL/Entities/Lists/UsersList.cs index 010db51..acd4c2a 100644 --- a/OF DL/Entities/Lists/UsersList.cs +++ b/OF DL/Entities/Lists/UsersList.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace OF_DL.Entities.Lists { public class UsersList diff --git a/OF DL/Entities/Messages/MessageCollection.cs b/OF DL/Entities/Messages/MessageCollection.cs index dd01461..4766fc1 100644 --- a/OF DL/Entities/Messages/MessageCollection.cs +++ b/OF DL/Entities/Messages/MessageCollection.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace OF_DL.Entities.Messages { public class MessageCollection diff --git a/OF DL/Entities/Messages/Messages.cs b/OF DL/Entities/Messages/Messages.cs index c211368..0809d57 100644 --- a/OF DL/Entities/Messages/Messages.cs +++ b/OF DL/Entities/Messages/Messages.cs @@ -1,9 +1,4 @@ using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace OF_DL.Entities.Messages { diff --git a/OF DL/Entities/Messages/SingleMessage.cs b/OF DL/Entities/Messages/SingleMessage.cs index 2e013f4..8b7be53 100644 --- a/OF DL/Entities/Messages/SingleMessage.cs +++ b/OF DL/Entities/Messages/SingleMessage.cs @@ -1,4 +1,3 @@ -using Newtonsoft.Json; using static OF_DL.Entities.Messages.Messages; namespace OF_DL.Entities.Messages diff --git a/OF DL/Entities/OFDLRequest.cs b/OF DL/Entities/OFDLRequest.cs index 56060b9..718fac4 100644 --- a/OF DL/Entities/OFDLRequest.cs +++ b/OF DL/Entities/OFDLRequest.cs @@ -1,9 +1,4 @@ using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace OF_DL.Entities { diff --git a/OF DL/Entities/Post/Post.cs b/OF DL/Entities/Post/Post.cs index d7b661b..13613fd 100644 --- a/OF DL/Entities/Post/Post.cs +++ b/OF DL/Entities/Post/Post.cs @@ -1,11 +1,5 @@ using Newtonsoft.Json; using OF_DL.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using static OF_DL.Entities.Messages.Messages; namespace OF_DL.Entities.Post; diff --git a/OF DL/Entities/Post/PostCollection.cs b/OF DL/Entities/Post/PostCollection.cs index 1ed0478..bc2acbf 100644 --- a/OF DL/Entities/Post/PostCollection.cs +++ b/OF DL/Entities/Post/PostCollection.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace OF_DL.Entities.Post { public class PostCollection diff --git a/OF DL/Entities/Post/SinglePost.cs b/OF DL/Entities/Post/SinglePost.cs index ef37c40..909e3e8 100644 --- a/OF DL/Entities/Post/SinglePost.cs +++ b/OF DL/Entities/Post/SinglePost.cs @@ -1,11 +1,5 @@ using Newtonsoft.Json; using OF_DL.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using static OF_DL.Entities.Post.Post; namespace OF_DL.Entities.Post { diff --git a/OF DL/Entities/Post/SinglePostCollection.cs b/OF DL/Entities/Post/SinglePostCollection.cs index aceedb5..6d374e2 100644 --- a/OF DL/Entities/Post/SinglePostCollection.cs +++ b/OF DL/Entities/Post/SinglePostCollection.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace OF_DL.Entities.Post { public class SinglePostCollection diff --git a/OF DL/Entities/Purchased/PaidMessageCollection.cs b/OF DL/Entities/Purchased/PaidMessageCollection.cs index 1222ba0..09111eb 100644 --- a/OF DL/Entities/Purchased/PaidMessageCollection.cs +++ b/OF DL/Entities/Purchased/PaidMessageCollection.cs @@ -1,8 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using static OF_DL.Entities.Messages.Messages; namespace OF_DL.Entities.Purchased diff --git a/OF DL/Entities/Purchased/Purchased.cs b/OF DL/Entities/Purchased/Purchased.cs index 64ae348..2e0c087 100644 --- a/OF DL/Entities/Purchased/Purchased.cs +++ b/OF DL/Entities/Purchased/Purchased.cs @@ -1,9 +1,4 @@ using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using static OF_DL.Entities.Messages.Messages; namespace OF_DL.Entities.Purchased diff --git a/OF DL/Entities/Purchased/PurchasedTabCollection.cs b/OF DL/Entities/Purchased/PurchasedTabCollection.cs index f3af333..822c0dd 100644 --- a/OF DL/Entities/Purchased/PurchasedTabCollection.cs +++ b/OF DL/Entities/Purchased/PurchasedTabCollection.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace OF_DL.Entities.Purchased { public class PurchasedTabCollection diff --git a/OF DL/Entities/Purchased/SinglePaidMessageCollection.cs b/OF DL/Entities/Purchased/SinglePaidMessageCollection.cs index 625b6ff..ba9515e 100644 --- a/OF DL/Entities/Purchased/SinglePaidMessageCollection.cs +++ b/OF DL/Entities/Purchased/SinglePaidMessageCollection.cs @@ -1,10 +1,4 @@ using OF_DL.Entities.Messages; -using OF_DL.Entities.Post; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using static OF_DL.Entities.Messages.Messages; namespace OF_DL.Entities.Purchased diff --git a/OF DL/Entities/ShortDateConverter.cs b/OF DL/Entities/ShortDateConverter.cs index 2ba2cbd..93278f3 100644 --- a/OF DL/Entities/ShortDateConverter.cs +++ b/OF DL/Entities/ShortDateConverter.cs @@ -1,5 +1,4 @@ using Newtonsoft.Json.Converters; -using System.Runtime.Serialization; namespace OF_DL.Entities { diff --git a/OF DL/Entities/Stories/Stories.cs b/OF DL/Entities/Stories/Stories.cs index 1f2efcd..90f0291 100644 --- a/OF DL/Entities/Stories/Stories.cs +++ b/OF DL/Entities/Stories/Stories.cs @@ -1,9 +1,4 @@ using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace OF_DL.Entities.Stories { diff --git a/OF DL/Entities/Streams/Streams.cs b/OF DL/Entities/Streams/Streams.cs index 2ad51e3..13bc4b1 100644 --- a/OF DL/Entities/Streams/Streams.cs +++ b/OF DL/Entities/Streams/Streams.cs @@ -1,10 +1,5 @@ using Newtonsoft.Json; using OF_DL.Utils; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace OF_DL.Entities.Streams { diff --git a/OF DL/Entities/Streams/StreamsCollection.cs b/OF DL/Entities/Streams/StreamsCollection.cs index 247a13b..c9a76f2 100644 --- a/OF DL/Entities/Streams/StreamsCollection.cs +++ b/OF DL/Entities/Streams/StreamsCollection.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace OF_DL.Entities.Streams { public class StreamsCollection diff --git a/OF DL/Entities/Subscriptions.cs b/OF DL/Entities/Subscriptions.cs index f5bacdd..b5da541 100644 --- a/OF DL/Entities/Subscriptions.cs +++ b/OF DL/Entities/Subscriptions.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace OF_DL.Entities { public class Subscriptions diff --git a/OF DL/Entities/User.cs b/OF DL/Entities/User.cs index e5dae37..1273c2b 100644 --- a/OF DL/Entities/User.cs +++ b/OF DL/Entities/User.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace OF_DL.Entities { public class User diff --git a/OF DL/Enumerations/CustomFileNameOption.cs b/OF DL/Enumerations/CustomFileNameOption.cs index eecd762..4e9659f 100644 --- a/OF DL/Enumerations/CustomFileNameOption.cs +++ b/OF DL/Enumerations/CustomFileNameOption.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace OF_DL.Enumerations; public enum CustomFileNameOption diff --git a/OF DL/Enumerations/DownloadDateSelection.cs b/OF DL/Enumerations/DownloadDateSelection.cs index 926c7bd..e40c38f 100644 --- a/OF DL/Enumerations/DownloadDateSelection.cs +++ b/OF DL/Enumerations/DownloadDateSelection.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace OF_DL.Enumerations { public enum DownloadDateSelection diff --git a/OF DL/Enumerations/LoggingLevel.cs b/OF DL/Enumerations/LoggingLevel.cs index 6757262..876c527 100644 --- a/OF DL/Enumerations/LoggingLevel.cs +++ b/OF DL/Enumerations/LoggingLevel.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace OF_DL.Enumerations { public enum LoggingLevel diff --git a/OF DL/Enumerations/MediaType.cs b/OF DL/Enumerations/MediaType.cs index 86078e8..38e3e81 100644 --- a/OF DL/Enumerations/MediaType.cs +++ b/OF DL/Enumerations/MediaType.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace OF_DL.Enumurations +namespace OF_DL.Enumerations { public enum MediaType { diff --git a/OF DL/Enumerations/VideoResolution.cs b/OF DL/Enumerations/VideoResolution.cs index 2514dee..6c2f340 100644 --- a/OF DL/Enumerations/VideoResolution.cs +++ b/OF DL/Enumerations/VideoResolution.cs @@ -1,9 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - namespace OF_DL.Enumerations { public enum VideoResolution diff --git a/OF DL/Helpers/Interfaces/IFileNameHelper.cs b/OF DL/Helpers/IFileNameHelper.cs similarity index 100% rename from OF DL/Helpers/Interfaces/IFileNameHelper.cs rename to OF DL/Helpers/IFileNameHelper.cs diff --git a/OF DL/Program.cs b/OF DL/Program.cs index 041900c..6cc38a0 100644 --- a/OF DL/Program.cs +++ b/OF DL/Program.cs @@ -7,7 +7,6 @@ using OF_DL.Entities.Post; using OF_DL.Entities.Purchased; using OF_DL.Entities.Streams; using OF_DL.Enumerations; -using OF_DL.Enumurations; using OF_DL.CLI; using OF_DL.Helpers; using OF_DL.Services; @@ -18,6 +17,7 @@ using System.Runtime.InteropServices; using System.Text.RegularExpressions; using static OF_DL.Entities.Messages.Messages; using Microsoft.Extensions.DependencyInjection; +using Constants = OF_DL.Widevine.Constants; namespace OF_DL; diff --git a/OF DL/Services/APIService.cs b/OF DL/Services/APIService.cs index 3d9517e..00a4870 100644 --- a/OF DL/Services/APIService.cs +++ b/OF DL/Services/APIService.cs @@ -10,7 +10,6 @@ using OF_DL.Entities.Purchased; using OF_DL.Entities.Stories; using OF_DL.Entities.Streams; using OF_DL.Enumerations; -using OF_DL.Enumurations; using Serilog; using Spectre.Console; using System.Globalization; @@ -19,8 +18,7 @@ using System.Text; using System.Text.Json; using System.Xml.Linq; using OF_DL.Widevine; -using WidevineClient.Widevine; -using static WidevineClient.HttpUtil; +using static OF_DL.Utils.HttpUtil; using Constants = OF_DL.Helpers.Constants; namespace OF_DL.Services; diff --git a/OF DL/Services/DownloadService.cs b/OF DL/Services/DownloadService.cs index 9fb0403..113be78 100644 --- a/OF DL/Services/DownloadService.cs +++ b/OF DL/Services/DownloadService.cs @@ -10,7 +10,6 @@ using OF_DL.Entities.Post; using OF_DL.Entities.Purchased; using OF_DL.Entities.Streams; using OF_DL.Enumerations; -using OF_DL.Enumurations; using OF_DL.Utils; using Serilog; using Serilog.Events; diff --git a/OF DL/Services/IAPIService.cs b/OF DL/Services/IAPIService.cs index e3959ea..a24c088 100644 --- a/OF DL/Services/IAPIService.cs +++ b/OF DL/Services/IAPIService.cs @@ -5,7 +5,7 @@ using OF_DL.Entities.Messages; using OF_DL.Entities.Post; using OF_DL.Entities.Purchased; using OF_DL.Entities.Streams; -using OF_DL.Enumurations; +using OF_DL.Enumerations; using Spectre.Console; namespace OF_DL.Services diff --git a/OF DL/HttpUtil.cs b/OF DL/Utils/HttpUtil.cs similarity index 98% rename from OF DL/HttpUtil.cs rename to OF DL/Utils/HttpUtil.cs index 25f0ebe..89f3ec1 100644 --- a/OF DL/HttpUtil.cs +++ b/OF DL/Utils/HttpUtil.cs @@ -1,7 +1,4 @@ using OF_DL.Helpers; -using System; -using System.Collections.Generic; -using System.Net.Http; using System.Text; namespace WidevineClient diff --git a/OF DL/Utils/ThrottledStream.cs b/OF DL/Utils/ThrottledStream.cs index 07b8857..b52b413 100644 --- a/OF DL/Utils/ThrottledStream.cs +++ b/OF DL/Utils/ThrottledStream.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; using System.Reactive.Concurrency; -using System.Text; -using System.Threading.Tasks; namespace OF_DL.Utils; diff --git a/OF DL/Utils/XmlUtils.cs b/OF DL/Utils/XmlUtils.cs index 55a68c6..940ebef 100644 --- a/OF DL/Utils/XmlUtils.cs +++ b/OF DL/Utils/XmlUtils.cs @@ -1,8 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Xml.Linq; namespace OF_DL.Utils diff --git a/OF DL/Widevine/CDM.cs b/OF DL/Widevine/CDM.cs index bfb2841..6b5f6fc 100644 --- a/OF DL/Widevine/CDM.cs +++ b/OF DL/Widevine/CDM.cs @@ -1,11 +1,7 @@ -using ProtoBuf; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; using System.Reflection; using System.Security.Cryptography; using System.Text; +using ProtoBuf; using WidevineClient.Crypto; namespace WidevineClient.Widevine diff --git a/OF DL/Widevine/CDMDevice.cs b/OF DL/Widevine/CDMDevice.cs index 4259511..78b9ea4 100644 --- a/OF DL/Widevine/CDMDevice.cs +++ b/OF DL/Widevine/CDMDevice.cs @@ -1,14 +1,11 @@ -using Org.BouncyCastle.Crypto; +using System.Text; +using Org.BouncyCastle.Crypto; using Org.BouncyCastle.Crypto.Digests; using Org.BouncyCastle.Crypto.Encodings; using Org.BouncyCastle.Crypto.Engines; using Org.BouncyCastle.Crypto.Signers; using Org.BouncyCastle.OpenSsl; using ProtoBuf; -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; namespace WidevineClient.Widevine { diff --git a/OF DL/Widevine/ContentKey.cs b/OF DL/Widevine/ContentKey.cs index f10b9be..9810225 100644 --- a/OF DL/Widevine/ContentKey.cs +++ b/OF DL/Widevine/ContentKey.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; +using System.ComponentModel.DataAnnotations.Schema; using System.Text.Json.Serialization; namespace WidevineClient.Widevine diff --git a/OF DL/Widevine/PSSHBox.cs b/OF DL/Widevine/PSSHBox.cs index c735366..55b16de 100644 --- a/OF DL/Widevine/PSSHBox.cs +++ b/OF DL/Widevine/PSSHBox.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -namespace WidevineClient.Widevine +namespace OF_DL.Widevine { class PSSHBox { diff --git a/OF DL/Widevine/Session.cs b/OF DL/Widevine/Session.cs index 51cd618..0c6a515 100644 --- a/OF DL/Widevine/Session.cs +++ b/OF DL/Widevine/Session.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace WidevineClient.Widevine +namespace OF_DL.Widevine { class Session { @@ -24,4 +22,4 @@ namespace WidevineClient.Widevine Device = device; } } -} \ No newline at end of file +}