Merge pull request #59 from a-legotin/develop

1.2.6
a-legotin · Aug 19, 2017 · 350c43c · 350c43c
2 parents 6fe6395 + 1e8140e
commit 350c43c
Show file tree

Hide file tree

Showing 177 changed files with 983 additions and 571 deletions.
diff --git a/InstaSharper.Examples/App.config b/InstaSharper.Examples/App.config
@@ -2,6 +2,6 @@
 
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
   </startup>
-</configuration>
+</configuration>
diff --git a/InstaSharper.Examples/InstaSharper.Examples.csproj b/InstaSharper.Examples/InstaSharper.Examples.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>InstaSharper.Examples</RootNamespace>
     <AssemblyName>InstaSharper.Examples</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -33,8 +34,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="InstaSharper">
-      <HintPath>..\InstaSharper\bin\Debug\net452\InstaSharper.dll</HintPath>
+    <Reference Include="InstaSharper, Version=1.2.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\InstaSharper.1.2.6\lib\net452\InstaSharper.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -46,6 +50,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Utils\DebugFileLogger.cs" />
     <Compile Include="Samples\Basics.cs" />
     <Compile Include="Samples\CommentMedia.cs" />
     <Compile Include="Program.cs" />
@@ -56,6 +61,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/InstaSharper.Examples/Program.cs b/InstaSharper.Examples/Program.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using InstaSharper.API;
 using InstaSharper.API.Builder;
@@ -19,48 +16,75 @@ public class Program
 
         private static void Main(string[] args)
         {
-            Console.WriteLine("Starting demo of InstaSharper project");
-            // create user session data and provide login details
-            var userSession = new UserSessionData
-            {
-                UserName = "username",
-                Password = "password"
-            };
-            // create new InstaApi instance using Builder
-            _instaApi = new InstaApiBuilder()
-                .SetUser(userSession)
-                .Build();
-            // login
-            var logInResult = _instaApi.Login();
-            if (!logInResult.Succeeded)
-            {
-                Console.WriteLine($"Unable to login: {logInResult.Info.Message}");
-            }
-            else
+            var result = Task.Run(MainAsync).GetAwaiter().GetResult();
+        }
+
+        public static async Task<bool> MainAsync()
+        {
+            try
             {
-                Console.WriteLine("Press 1 to start basic demo samples");
-                Console.WriteLine("Press 2 to start upload photo demo sample");
-                Console.WriteLine("Press 3 to start comment media demo sample");
+                Console.WriteLine("Starting demo of InstaSharper project");
+                // create user session data and provide login details
+                var userSession = new UserSessionData
+                {
+                    UserName = "username",
+                    Password = "password"
+                };
+
+                // create new InstaApi instance using Builder
+                _instaApi = new InstaApiBuilder()
+                    .SetUser(userSession)
+                    .UseLogger(new DebugFileLogger()) // use logger for requests and debug messages
+                    .SetRequestDelay(TimeSpan.FromSeconds(1)) // set delay between requests
+                    .Build();
 
-                var key = Console.ReadKey();
-                switch (key.Key)
+                // login
+                Console.WriteLine($"Logging in as {userSession.UserName}");
+                var logInResult = await _instaApi.LoginAsync();
+                if (!logInResult.Succeeded)
                 {
-                    case ConsoleKey.D1:
-                        new Basics(_instaApi).DoShow();
-                        break;
-                    case ConsoleKey.D2:
-                        new UploadPhoto(_instaApi).DoShow();
-                        break;
-                    case ConsoleKey.D3:
-                        new CommentMedia(_instaApi).DoShow();
-                        break;
-                    default:
-                        break;
+                    Console.WriteLine($"Unable to login: {logInResult.Info.Message}");
                 }
-                var logoutResult = _instaApi.Logout();
-                if (logoutResult.Value) Console.WriteLine("Logout succeed");
+                else
+                {
+                    Console.WriteLine("Press 1 to start basic demo samples");
+                    Console.WriteLine("Press 2 to start upload photo demo sample");
+                    Console.WriteLine("Press 3 to start comment media demo sample");
+
+                    var key = Console.ReadKey();
+                    Console.WriteLine(Environment.NewLine);
+                    switch (key.Key)
+                    {
+                        case ConsoleKey.D1:
+                            var basics = new Basics(_instaApi);
+                            await basics.DoShow();
+                            break;
+                        case ConsoleKey.D2:
+                            var upload = new UploadPhoto(_instaApi);
+                            await upload.DoShow();
+                            break;
+                        case ConsoleKey.D3:
+                            var comment = new CommentMedia(_instaApi);
+                            await comment.DoShow();
+                            break;
+                        default:
+                            break;
+                    }
+                    Console.WriteLine("Done. Press esc key to exit...");
+                    key = Console.ReadKey();
+                    return key.Key == ConsoleKey.Escape;
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex);
+            }
+            finally
+            {
+                var logoutResult = Task.Run(() => _instaApi.LogoutAsync()).GetAwaiter().GetResult();
+                if (logoutResult.Succeeded) Console.WriteLine("Logout succeed");
             }
-            Console.ReadKey();
+            return false;
         }
     }
-}
+}
diff --git a/InstaSharper.Examples/Properties/AssemblyInfo.cs b/InstaSharper.Examples/Properties/AssemblyInfo.cs
@@ -36,4 +36,4 @@
 // [assembly: AssemblyVersion("1.0.*")]
 
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/InstaSharper.Examples/Samples/Basics.cs b/InstaSharper.Examples/Samples/Basics.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Threading.Tasks;
 using InstaSharper.API;
 using InstaSharper.Examples.Utils;
 
@@ -19,51 +20,56 @@ public Basics(IInstaApi instaApi)
             _instaApi = instaApi;
         }
 
-        public void DoShow()
+        public async Task DoShow()
         {
             // get currently logged in user
-            var currentUser = _instaApi.GetCurrentUser().Value;
-            Console.WriteLine($"Logged in: username - {currentUser.UserName}, full name - {currentUser.FullName}");
+            var currentUser = await _instaApi.GetCurrentUserAsync();
+            Console.WriteLine(
+                $"Logged in: username - {currentUser.Value.UserName}, full name - {currentUser.Value.FullName}");
 
             // get self followers 
-            var followers = _instaApi.GetUserFollowersAsync(currentUser.UserName, 5).Result.Value;
-            Console.WriteLine($"Count of followers [{currentUser.UserName}]:{followers.Count}");
+            var followers = await _instaApi.GetUserFollowersAsync(currentUser.Value.UserName, 5);
+            Console.WriteLine($"Count of followers [{currentUser.Value.UserName}]:{followers.Value.Count}");
+
+            // get self folling 
+            var following = await _instaApi.GetUserFollowingAsync(currentUser.Value.UserName, 5);
+            Console.WriteLine($"Count of following [{currentUser.Value.UserName}]:{following.Value.Count}");
 
             // get self user's media, latest 5 pages
-            var currentUserMedia = _instaApi.GetUserMedia(currentUser.UserName, 5);
+            var currentUserMedia = await _instaApi.GetUserMediaAsync(currentUser.Value.UserName, 5);
             if (currentUserMedia.Succeeded)
             {
-                Console.WriteLine($"Media count [{currentUser.UserName}]: {currentUserMedia.Value.Count}");
+                Console.WriteLine($"Media count [{currentUser.Value.UserName}]: {currentUserMedia.Value.Count}");
                 foreach (var media in currentUserMedia.Value)
                     ConsoleUtils.PrintMedia("Self media", media, _maxDescriptionLength);
             }
 
             //get user time line feed, latest 5 pages
-            var userFeed = _instaApi.GetUserTimelineFeed(5);
+            var userFeed = await _instaApi.GetUserTimelineFeedAsync(5);
             if (userFeed.Succeeded)
             {
                 Console.WriteLine(
-                    $"Feed items (in {userFeed.Value.Pages} pages) [{currentUser.UserName}]: {userFeed.Value.Medias.Count}");
+                    $"Feed items (in {userFeed.Value.Pages} pages) [{currentUser.Value.UserName}]: {userFeed.Value.Medias.Count}");
                 foreach (var media in userFeed.Value.Medias)
                     ConsoleUtils.PrintMedia("Feed media", media, _maxDescriptionLength);
                 //like first 10 medias from user timeline feed
                 foreach (var media in userFeed.Value.Medias.Take(10))
                 {
-                    var likeResult = _instaApi.LikeMedia(media.InstaIdentifier);
+                    var likeResult = await _instaApi.LikeMediaAsync(media.InstaIdentifier);
                     var resultString = likeResult.Value ? "liked" : "not liked";
                     Console.WriteLine($"Media {media.Code} {resultString}");
                 }
             }
 
             // get tag feed, latest 5 pages
-            var tagFeed = _instaApi.GetTagFeed("quadcopter", 5);
+            var tagFeed = await _instaApi.GetTagFeedAsync("quadcopter", 5);
             if (tagFeed.Succeeded)
             {
                 Console.WriteLine(
-                    $"Tag feed items (in {tagFeed.Value.Pages} pages) [{currentUser.UserName}]: {tagFeed.Value.Medias.Count}");
+                    $"Tag feed items (in {tagFeed.Value.Pages} pages) [{currentUser.Value.UserName}]: {tagFeed.Value.Medias.Count}");
                 foreach (var media in tagFeed.Value.Medias)
                     ConsoleUtils.PrintMedia("Tag feed", media, _maxDescriptionLength);
             }
         }
     }
-}
+}
diff --git a/InstaSharper.Examples/Samples/CommentMedia.cs b/InstaSharper.Examples/Samples/CommentMedia.cs
@@ -1,4 +1,5 @@
-using System;
+using System;
+using System.Threading.Tasks;
 using InstaSharper.API;
 
 namespace InstaSharper.Examples.Samples
@@ -12,12 +13,12 @@ public CommentMedia(IInstaApi instaApi)
             _instaApi = instaApi;
         }
 
-        public void DoShow()
+        public async Task DoShow()
         {
-            var commentResult = _instaApi.CommentMedia("", "Hi there!");
+            var commentResult = await _instaApi.CommentMediaAsync("", "Hi there!");
             Console.WriteLine(commentResult.Succeeded
                 ? $"Comment created: {commentResult.Value.Pk}, text: {commentResult.Value.Text}"
                 : $"Unable to create comment: {commentResult.Info.Message}");
         }
     }
-}
+}
diff --git a/InstaSharper.Examples/Samples/UploadPhoto.cs b/InstaSharper.Examples/Samples/UploadPhoto.cs
@@ -1,5 +1,6 @@
-using System;
+using System;
 using System.IO;
+using System.Threading.Tasks;
 using InstaSharper.API;
 using InstaSharper.Classes.Models;
 
@@ -14,18 +15,18 @@ public UploadPhoto(IInstaApi instaApi)
             _instaApi = instaApi;
         }
 
-        public void DoShow()
+        public async Task DoShow()
         {
             var mediaImage = new MediaImage
             {
                 Height = 1080,
                 Width = 1080,
                 URI = new Uri(Path.GetFullPath(@"c:\someawesomepicture.jpg"), UriKind.Absolute).LocalPath
             };
-            var result = _instaApi.UploadPhoto(mediaImage, "someawesomepicture");
+            var result = await _instaApi.UploadPhotoAsync(mediaImage, "someawesomepicture");
             Console.WriteLine(result.Succeeded
                 ? $"Media created: {result.Value.Pk}, {result.Value.Caption}"
                 : $"Unable to upload photo: {result.Info.Message}");
         }
     }
-}
+}
diff --git a/InstaSharper.Examples/Utils/ConsoleUtils.cs b/InstaSharper.Examples/Utils/ConsoleUtils.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using InstaSharper.Classes.Models;
 
 namespace InstaSharper.Examples.Utils
@@ -15,4 +11,4 @@ public static void PrintMedia(string header, InstaMedia media, int maxDescriptio
                 $"{header} [{media.User.UserName}]: {media.Caption?.Text.Truncate(maxDescriptionLength)}, {media.Code}, likes: {media.LikesCount}, multipost: {media.IsMultiPost}");
         }
     }
-}
+}
diff --git a/InstaSharper.Examples/Utils/DebugFileLogger.cs b/InstaSharper.Examples/Utils/DebugFileLogger.cs
@@ -0,0 +1,27 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using InstaSharper.Logger;
+
+namespace InstaSharper.Examples
+{
+    internal class DebugFileLogger : ILogger
+    {
+        private const string logFile = "log.txt";
+
+        public void Write(string logMessage)
+        {
+            File.AppendAllText(logFile, logMessage);
+        }
+
+        public async Task WriteAsync(string logMessage)
+        {
+            await Task.Run(() => File.AppendAllText(logFile, logMessage));
+        }
+
+        public void WriteLine(string logMessage)
+        {
+            Write(logMessage + Environment.NewLine);
+        }
+    }
+}
diff --git a/InstaSharper.Examples/Utils/StringExtensions.cs b/InstaSharper.Examples/Utils/StringExtensions.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace InstaSharper.Examples.Utils
+namespace InstaSharper.Examples.Utils
 {
     public static class StringExtensions
     {
@@ -13,4 +7,4 @@ public static string Truncate(this string value, int maxChars)
             return value.Length <= maxChars ? value : value.Substring(0, maxChars) + "...";
         }
     }
-}
+}
diff --git a/InstaSharper.Examples/packages.config b/InstaSharper.Examples/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<packages>
+  <package id="InstaSharper" version="1.2.6" targetFramework="net47" />
+  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net47" />
+</packages>
diff --git a/InstaSharper.Tests/Classes/AuthenticatedTestFixture.cs b/InstaSharper.Tests/Classes/AuthenticatedTestFixture.cs
@@ -43,4 +43,4 @@ public string GetPassword()
             return _password;
         }
     }
-}
+}
diff --git a/InstaSharper.Tests/Classes/RunnableInDebugOnlyFact.cs b/InstaSharper.Tests/Classes/RunnableInDebugOnlyFact.cs
@@ -11,4 +11,4 @@ public RunnableInDebugOnlyFact()
                 Skip = "This fact only running in interactive mode.";
         }
     }
-}
+}