update demo

Author: MaksymRohach

SDK/Aspose.OMR.Cloud.SDK/Internal/RequestHandlers/JwtRequestHandler.cs

@@ -14,7 +14,7 @@ internal class JwtRequestHandler : IRequestHandler
         private readonly ApiInvoker apiInvoker;
 
         private string accessToken;
-        private string refreshToken;
+        //private string refreshToken;
 
         public JwtRequestHandler(Configuration configuration)
         {

SDK/Aspose.OMR.Cloud.SDK/Model/Requests/FolderRequests/CreateFolderRequest.cs

@@ -42,7 +42,7 @@ public CreateFolderRequest()
         /// </summary>
         /// <param name="path">Folder path to create e.g. &#39;folder_1/folder_2/&#39;</param>
         /// <param name="storageName">Storage name</param>
-        public CreateFolderRequest(string path, string storageName = null)
+        public CreateFolderRequest(string path, string storageName)
         {
             this.path = path;
             this.storageName = storageName;

SDK/Aspose.OMR.Demo/Aspose.OMR.Demo.csproj

@@ -31,9 +31,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Aspose.Storage.Cloud.Sdk, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Aspose.Storage-Cloud.18.3.0\lib\net20\Aspose.Storage.Cloud.Sdk.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net20\Newtonsoft.Json.dll</HintPath>
     </Reference>

SDK/Aspose.OMR.Demo/Program.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Aspose Pty Ltd. All Rights Reserved.
+ * Copyright (c) 2020 Aspose Pty Ltd. All Rights Reserved.
  *
  * Licensed under the MIT (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,19 +14,15 @@
  * limitations under the License.
  */
 
-using Aspose.Omr.Cloud.Sdk;
-using Aspose.Omr.Cloud.Sdk.Model;
-using Aspose.Omr.Cloud.Sdk.Model.Requests;
-
 namespace Aspose.OMR.Demo
 {
     using System;
     using System.Collections.Generic;
     using System.IO;
-    using Storage.Cloud.Sdk;
-    using Storage.Cloud.Sdk.Api;
-    using Storage.Cloud.Sdk.Model;
-    using Storage.Cloud.Sdk.Model.Requests;
+    using Aspose.Omr.Cloud.Sdk;
+    using Aspose.Omr.Cloud.Sdk.Api;
+    using Aspose.Omr.Cloud.Sdk.Model;
+    using Aspose.Omr.Cloud.Sdk.Model.Requests;
     using Newtonsoft.Json;
     using Newtonsoft.Json.Linq;
     using FileInfo = Aspose.Omr.Cloud.Sdk.Model.FileInfo;
@@ -125,6 +121,16 @@ class OmrDemo
         /// </summary>
         private StorageApi StorageApi = null;
 
+        /// <summary>
+        /// Instance of Cloud Folder API
+        /// </summary>
+        private FolderApi FolderApi = null;
+
+        /// <summary>
+        /// Instance of Cloud File API
+        /// </summary>
+        private FileApi FileApi = null;
+
         /// <summary>
         /// Instance of OMR API
         /// </summary>
@@ -137,35 +143,36 @@ public OmrDemo()
             string configFileRelativePath = Path.Combine(this.demoDataSubmoduleName, this.configFileName);
 
             // Locate submodule folder containing demo data and config
-            //while (current != null && !File.Exists(Path.Combine(current.FullName, configFileRelativePath)))
-            //{
-            //    current = current.Parent;
-            //}
-
-            
+            while (current != null && !File.Exists(Path.Combine(current.FullName, configFileRelativePath)))
+            {
+                current = current.Parent;
+            }
 
             // Check if config file exists
             if (current == null)
             {
                 throw new Exception($"Unable to find {this.configFileName}");
             }
 
-            // string configFilePath = Path.Combine(current.FullName, configFileRelativePath);
-            string configFilePath = Path.Combine($"C:\\Users\\MAKS\\Desktop\\Новая папка\\aspose-omr-cloud-dotnet", configFileRelativePath);
+            string configFilePath = Path.Combine(current.FullName, configFileRelativePath);
 
             // parse config
             this.Config = JObject.Parse(File.ReadAllText(configFilePath));
             this.DataFolder = Path.Combine(Directory.GetParent(configFilePath).FullName, this.Config["data_folder"].ToString());
 
             // create storage api and provide parameters
             string baseHost = new Uri(this.Basepath).GetComponents(UriComponents.SchemeAndServer, UriFormat.SafeUnescaped).ToString();
+
             Configuration storageConfiguration = new Configuration();
             storageConfiguration.AppKey = this.AppKey;
             storageConfiguration.AppSid = this.AppSid;
             storageConfiguration.ApiBaseUrl = baseHost;
+
             this.StorageApi = new StorageApi(storageConfiguration);
+            this.FolderApi = new FolderApi(storageConfiguration);
+            this.FileApi = new FileApi(storageConfiguration);
 
-            this.OmrApi = new OmrApi(this.AppKey, this.AppSid);
+            this.OmrApi = new OmrApi(storageConfiguration);
         }
 
         /// <summary>
@@ -330,8 +337,8 @@ protected void UploadFile(string srcFile, string dstPath)
         {
             using (FileStream fs = new FileStream(srcFile, FileMode.Open))
             {
-                UploadResponse response = this.StorageApi.PutCreate(new PutCreateRequest(dstPath, fs));
-                Console.WriteLine($"File {dstPath} uploaded successfully with response {response.Status}");
+                FilesUploadResult response = FileApi.UploadFile(new UploadFileRequest(dstPath, fs));
+                Console.WriteLine($"File {dstPath} uploaded successfully with response {response}");
             }
         }
 
@@ -342,18 +349,18 @@ protected void UploadFile(string srcFile, string dstPath)
         protected void UploadDemoFiles(string dataDirPath)
         {
             // check if folder already exists on storage
-            FileExistResponse response = this.StorageApi.GetIsExist(new GetIsExistRequest(this.LogosFolderName));
-            if (response.FileExist.IsExist == false)
+            ObjectExist response = this.StorageApi.ObjectExists(new ObjectExistsRequest(this.LogosFolderName));
+            if (response.Exists == false)
             {
-                this.StorageApi.PutCreateFolder(new PutCreateFolderRequest(this.LogosFolderName));
+                FolderApi.CreateFolder(new CreateFolderRequest(this.LogosFolderName, "storage"));
             }
 
             // upload logo images
             foreach (string logo in this.templateLogosImagesNames)
             {
                 string destLogoPath = $"{this.LogosFolderName}/{logo}";
-                response = this.StorageApi.GetIsExist(new GetIsExistRequest(destLogoPath));
-                if (response.FileExist.IsExist == false)
+                response = this.StorageApi.ObjectExists(new ObjectExistsRequest(destLogoPath));
+                if (response.Exists == false)
                 {
                     this.UploadFile(Path.Combine(dataDirPath, logo), destLogoPath);
                 }

SDK/Aspose.OMR.Demo/packages.config

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Aspose.Storage-Cloud" version="18.3.0" targetFramework="net20" />
   <package id="Newtonsoft.Json" version="11.0.1" targetFramework="net20" />
 </packages>