Merge branch 'development'

klemmchr · Jan 9, 2017 · 4e826ce · 4e826ce
2 parents 9db44bc + a24238e
commit 4e826ce
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 75 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -13,7 +13,7 @@
 #  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
 # version format
-version: 0.2.{build}-beta
+version: 0.3.{build}-beta
 
 # branches:
   # whitelist

diff --git a/src/YTMusicDownloader.sln b/src/YTMusicDownloader.sln
@@ -106,9 +106,9 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		RESX_SaveFilesImmediatelyUponChange = True
-		RESX_SortFileContentOnSave = True
-		RESX_ResXSortingComparison = OrdinalIgnoreCase
 		RESX_AutoCreateNewLanguageFiles = False
+		RESX_ResXSortingComparison = OrdinalIgnoreCase
+		RESX_SortFileContentOnSave = True
+		RESX_SaveFilesImmediatelyUponChange = True
 	EndGlobalSection
 EndGlobal
diff --git a/src/YTMusicDownloader/Properties/Settings.settings b/src/YTMusicDownloader/Properties/Settings.settings
@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)"
-              GeneratedClassNamespace="YTMusicDownloader.Properties" GeneratedClassName="Settings">
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="YTMusicDownloader.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>
     <Setting Name="ParallelDownloads" Type="System.Int32" Scope="User">

diff --git a/src/YTMusicDownloaderAPI/Controllers/PlaylistDataController.cs b/src/YTMusicDownloaderAPI/Controllers/PlaylistDataController.cs
diff --git a/src/YTMusicDownloaderAPI/Properties/Settings.cs b/src/YTMusicDownloaderAPI/Properties/Settings.cs
@@ -7,9 +7,5 @@ internal partial class Settings
         public const string EmailAddress = "**REMOVED**";
         public const string SmptUsername = "**REMOVED**";
         public const string SmtpPassword = "**REMOVED**";
-        public const string GoogleApiKey = "**REMOVED**";
-        public const string DiscogsApiKey = "**REMOVED**";
-        public const string DiscogsApiSecret = "**REMOVED**";
-        public const string LastFmApiKey = "**REMOVED**";
     }
 }
diff --git a/src/YTMusicDownloaderAPI/Properties/Settings.settings b/src/YTMusicDownloaderAPI/Properties/Settings.settings
@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)"
-              GeneratedClassNamespace="YTMusicDownloaderAPI.Properties" GeneratedClassName="Settings">
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="YTMusicDownloaderAPI.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>
     <Setting Name="MaxPlaylistRequestsPerHour" Type="System.Int32" Scope="Application">

diff --git a/src/YTMusicDownloaderAPI/YTMusicDownloaderAPI.csproj b/src/YTMusicDownloaderAPI/YTMusicDownloaderAPI.csproj
@@ -124,7 +124,6 @@
     <Compile Include="App_Start\RouteConfig.cs" />
     <Compile Include="App_Start\WebApiConfig.cs" />
     <Compile Include="Controllers\CrashReportController.cs" />
-    <Compile Include="Controllers\PlaylistDataController.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>

diff --git a/src/YTMusicDownloaderLib/Properties/Settings.Designer.cs b/src/YTMusicDownloaderLib/Properties/Settings.Designer.cs
diff --git a/src/YTMusicDownloaderLib/Properties/Settings.settings b/src/YTMusicDownloaderLib/Properties/Settings.settings
@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)"
-              GeneratedClassNamespace="YTMusicDownloaderLib.Properties" GeneratedClassName="Settings">
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="YTMusicDownloaderLib.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>
     <Setting Name="GitHubRepositoryOwner" Type="System.String" Scope="Application">
@@ -10,5 +8,8 @@
     <Setting Name="GitHubRepositoryName" Type="System.String" Scope="User">
       <Value Profile="(Default)">YTMusicDownloader</Value>
     </Setting>
+    <Setting Name="GoogleApiKey" Type="System.String" Scope="User">
+      <Value Profile="(Default)">AIzaSyBdA-M63y7UxOSm-lnMU_Ss3EtqJqq1KN4</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/src/YTMusicDownloaderLib/RetrieverEngine/PlaylistItemsRetriever.cs b/src/YTMusicDownloaderLib/RetrieverEngine/PlaylistItemsRetriever.cs
@@ -50,8 +50,8 @@ public void GetPlaylistItems(string playlistId)
                 throw new ArgumentException(nameof(playlistId));
 
             var playlistItems = new List<PlaylistItem>();
-            var client = new RestClient("http://ytdownloaderapi.azurewebsites.net");
-            var request = new RestRequest("api/PlaylistData", Method.GET);
+            var client = new RestClient("https://www.googleapis.com");
+            var request = new RestRequest("/youtube/v3/playlistItems", Method.GET);
 
             var pageToken = "";
             var totalResults = -1;
@@ -61,8 +61,11 @@ public void GetPlaylistItems(string playlistId)
                 while (pageToken != null)
                 {
                     request.Parameters.Clear();
+                    request.AddParameter("key", Properties.Settings.Default.GoogleApiKey);
+                    request.AddParameter("part", "snippet");
                     request.AddParameter("playlistId", playlistId);
                     request.AddParameter("pageToken", pageToken);
+                    request.AddParameter("maxResults", 50);
 
                     var response = client.Execute(request);
 

diff --git a/src/YTMusicDownloaderLib/app.config b/src/YTMusicDownloaderLib/app.config
@@ -25,6 +25,9 @@
       <setting name="GitHubRepositoryName" serializeAs="String">
         <value>YTMusicDownloader</value>
       </setting>
+      <setting name="GoogleApiKey" serializeAs="String">
+        <value>AIzaSyBdA-M63y7UxOSm-lnMU_Ss3EtqJqq1KN4</value>
+      </setting>
     </YTMusicDownloaderLib.Properties.Settings>
   </userSettings>
   <applicationSettings>