Skip to content

Commit 41bbb71

Browse files
cyberootcyberoot
committed
Some minor normalizations
1 parent 446b3b6 commit 41bbb71

File tree

4 files changed

+39
-36
lines changed

4 files changed

+39
-36
lines changed

‎SynologyAPI/DownloadStation.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ public TaskOperationResult PauseTasks(string[] taskIds)
6969
public TaskOperationResult PauseTasks(string taskIds)
7070
{
7171
return CallMethod<TaskOperationResult>("SYNO.DownloadStation.Task",
72-
"pause", new ReqParams()
73-
{
72+
"pause", new ReqParams
73+
{
7474
{"id", taskIds},
7575
}
7676
);
@@ -84,8 +84,8 @@ public TaskOperationResult ResumeTasks(string[] taskIds)
8484
public TaskOperationResult ResumeTasks(string taskIds)
8585
{
8686
return CallMethod<TaskOperationResult>("SYNO.DownloadStation.Task",
87-
"resume", new ReqParams()
88-
{
87+
"resume", new ReqParams
88+
{
8989
{"id", taskIds},
9090
}
9191
);
@@ -99,8 +99,8 @@ public TaskOperationResult DeleteTasks(string[] taskIds, bool forceComplete = fa
9999
public TaskOperationResult DeleteTasks(string taskIds, bool forceComplete = false)
100100
{
101101
return CallMethod<TaskOperationResult>("SYNO.DownloadStation.Task",
102-
"delete", new ReqParams()
103-
{
102+
"delete", new ReqParams
103+
{
104104
{"id", taskIds},
105105
{"force_complete", forceComplete == null ? "false" : forceComplete.ToString().ToLower()}
106106
}
@@ -115,25 +115,25 @@ public ListResult GetTasks(string[] taskIds, string[] additional)
115115
public ListResult GetTasks(string taskIds, string additional = "detail")
116116
{
117117
return CallMethod<ListResult>("SYNO.DownloadStation.Task",
118-
"getinfo", new ReqParams()
119-
{
118+
"getinfo", new ReqParams
119+
{
120120
{"id", taskIds},
121121
{"additional", additional}
122122
}
123123
);
124124
}
125125

126-
public SynologyRestDAL.TResult<Object> CreateTask(string url)
126+
public TResult<Object> CreateTask(string url)
127127
{
128128
return CallMethod<TResult<Object>>("SYNO.DownloadStation.Task",
129-
"create", new ReqParams()
129+
"create", new ReqParams
130130
{
131131
{"uri", url}
132132
}
133133
);
134134
}
135135

136-
public SynologyRestDAL.TResult<Object> CreateTask(string fileName, Stream fileStream)
136+
public TResult<Object> CreateTask(string fileName, Stream fileStream)
137137
{
138138
return PostFile<TResult<Object>>("SYNO.DownloadStation.Task", "create", fileName, fileStream);
139139
}

‎SynologyAPI/JsonHelper.cs

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
11
using System.IO;
2-
using System.Text;
32
using System.Runtime.Serialization.Json;
3+
using System.Text;
44

5-
public static class JsonHelper
5+
namespace SynologyAPI
66
{
7-
public static string ToJson<T>(T instance)
7+
public static class JsonHelper
88
{
9-
var settings = new DataContractJsonSerializerSettings {UseSimpleDictionaryFormat = true};
10-
var serializer = new DataContractJsonSerializer(typeof(T), settings);
11-
12-
using (var tempStream = new MemoryStream())
9+
public static string ToJson<T>(T instance)
1310
{
14-
serializer.WriteObject(tempStream, instance);
15-
return Encoding.Default.GetString(tempStream.ToArray());
11+
var settings = new DataContractJsonSerializerSettings {UseSimpleDictionaryFormat = true};
12+
var serializer = new DataContractJsonSerializer(typeof(T), settings);
13+
14+
using (var tempStream = new MemoryStream())
15+
{
16+
serializer.WriteObject(tempStream, instance);
17+
return Encoding.Default.GetString(tempStream.ToArray());
18+
}
1619
}
17-
}
1820

19-
public static T FromJson<T>(string json)
20-
{
21-
var settings = new DataContractJsonSerializerSettings {UseSimpleDictionaryFormat = true};
22-
var serializer = new DataContractJsonSerializer(typeof(T), settings);
23-
using (var tempStream = new MemoryStream(Encoding.Unicode.GetBytes(json)))
21+
public static T FromJson<T>(string json)
2422
{
25-
return (T)serializer.ReadObject(tempStream);
23+
var settings = new DataContractJsonSerializerSettings {UseSimpleDictionaryFormat = true};
24+
var serializer = new DataContractJsonSerializer(typeof(T), settings);
25+
using (var tempStream = new MemoryStream(Encoding.Unicode.GetBytes(json)))
26+
{
27+
return (T)serializer.ReadObject(tempStream);
28+
}
2629
}
2730
}
2831
}

‎synods/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<add key="password" value="" />
66
<add key="host" value="https://synology-diskstation" />
77
<add key="proxy" value="" />
8-
<!-- add key="proxy" value="http://127.0.0.1:8123" /-->
8+
<!-- add key="proxy" value="http://127.0.0.1:8123" /-->
99
</appSettings>
1010
<startup>
1111
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />

‎synods/Program.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ static void Main(string[] args)
2121
string invokedVerb = "";
2222
object invokedVerbInstance = null;
2323
var options = new Options();
24-
if (!CommandLine.Parser.Default.ParseArguments(args, options,
24+
if (!Parser.Default.ParseArguments(args, options,
2525
(verb, subOptions) =>
2626
{
2727
invokedVerb = verb;
2828
invokedVerbInstance = subOptions;
2929
}))
3030
{
31-
Environment.Exit(CommandLine.Parser.DefaultExitCodeFail);
31+
Environment.Exit(Parser.DefaultExitCodeFail);
3232
}
3333
NameValueCollection appSettings = ConfigurationManager.AppSettings;
3434
var ds = new DownloadStation(new Uri(appSettings["host"]), appSettings["username"], appSettings["password"], CreateProxy(appSettings["proxy"]));
@@ -42,7 +42,7 @@ static void Main(string[] args)
4242
if (listResult.Success)
4343
{
4444
var taskList = from task in listResult.Data.Tasks select task;
45-
if (listOptions.Status.Count() > 0)
45+
if (listOptions.Status.Any())
4646
{
4747
var statusesToList = new List<string>(listOptions.Status);
4848
taskList = from task in taskList where statusesToList.Contains(task.Status) select task;
@@ -86,7 +86,7 @@ static void Main(string[] args)
8686
{
8787
taskResult = ds.CreateTask(newOptions.Uri);
8888
}
89-
if (!taskResult.Success)
89+
if (taskResult != null && !taskResult.Success)
9090
{
9191
Console.WriteLine("Failed uploading {0} (((", newOptions.Filename);
9292
}
@@ -97,7 +97,7 @@ static void Main(string[] args)
9797
var deleteOptions = (TaskDeleteOptions)invokedVerbInstance;
9898
if (ds.Login())
9999
{
100-
if (deleteOptions.Id.Count() > 0)
100+
if (deleteOptions.Id.Any())
101101
{
102102
var taskResult = ds.DeleteTasks(deleteOptions.Id, deleteOptions.Force);
103103
if (taskResult.Success)
@@ -116,7 +116,7 @@ static void Main(string[] args)
116116
var pauseOptions = (TaskPauseOptions)invokedVerbInstance;
117117
if (ds.Login())
118118
{
119-
if (pauseOptions.Id.Count() > 0)
119+
if (pauseOptions.Id.Any())
120120
{
121121
var taskResult = ds.PauseTasks(pauseOptions.Id);
122122
if (taskResult.Success)
@@ -135,7 +135,7 @@ static void Main(string[] args)
135135
var resumeOptions = (TaskResumeOptions)invokedVerbInstance;
136136
if (ds.Login())
137137
{
138-
if (resumeOptions.Id.Count() > 0)
138+
if (resumeOptions.Id.Any())
139139
{
140140
var taskResult = ds.ResumeTasks(resumeOptions.Id);
141141
if (taskResult.Success)
@@ -153,7 +153,7 @@ static void Main(string[] args)
153153
default:
154154
break;
155155
}
156-
// Console.ReadLine();
156+
Console.ReadLine();
157157
}
158158

159159

0 commit comments

Comments
 (0)