alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-31 21:08:27 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Switched to service stack json. Added more api enhancements.

Browse Source
This commit is contained in:
LukePulverenti Luke Pulverenti luke pulverenti
2012-07-15 16:27:07 -04:00
parent 2e03cb0916
commit baedafbeb9
27 changed files with 370 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Controller/Kernel.cs
View File

@@ -202,7 +202,7 @@ namespace MediaBrowser.Controller
return new Configuration();
}
return JsonSerializer.Deserialize<Configuration>(file);
return JsonSerializer.DeserializeFromFile<Configuration>(file);
}
public void ReloadItem(BaseItem item)

4
MediaBrowser.Controller/MediaBrowser.Controller.csproj
View File

@@ -30,10 +30,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.4.5.7\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Reactive">

4
MediaBrowser.Controller/UserController.cs
View File

@@ -41,7 +41,7 @@ namespace MediaBrowser.Controller
{
string file = Path.Combine(path, "user.js");
return JsonSerializer.Deserialize<User>(file);
return JsonSerializer.DeserializeFromFile<User>(file);
}
public void CreateUser(User user)
@@ -54,7 +54,7 @@ namespace MediaBrowser.Controller
Directory.CreateDirectory(userFolder);
JsonSerializer.Serialize(user, Path.Combine(userFolder, "user.js"));
JsonSerializer.SerializeToFile(user, Path.Combine(userFolder, "user.js"));
}
}
}

1
MediaBrowser.Controller/packages.config
View File

@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="4.5.7" targetFramework="net45" />
<package id="Rx-Main" version="1.0.11226" targetFramework="net45" />
</packages>