Skip to content

Commit

Permalink
Implemented the Google Drive backend, and trashed the Google Docs bac…
Browse files Browse the repository at this point in the history 
…kend for issue #1347
  • Loading branch information
@kenkendk
kenkendk committed Jun 22, 2015
1 parent 74bbf0f commit 3fc9102
Show file tree
Hide file tree
Showing 41 changed files with 368 additions and 909 deletions.
24 changes: 16 additions & 8 deletions Duplicati.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Server.Serializat
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.CommandLine.BackendTool", "Duplicati\CommandLine\BackendTool\Duplicati.CommandLine.BackendTool.csproj", "{2AF960C0-357D-4D44-A3D5-8B6E89DB0F11}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.GoogleDocs", "Duplicati\Library\Backend\GoogleDocs\Duplicati.Library.Backend.GoogleDocs.csproj", "{42C91180-11EB-4590-82EA-80FE9D4DEBEC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.SQLiteHelper", "Duplicati\Library\SQLiteHelper\Duplicati.Library.SQLiteHelper.csproj", "{2C838169-B187-4B09-8768-1C24C2521C8D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Localization", "Duplicati\Library\Localization\Duplicati.Library.Localization.csproj", "{B68F2214-951F-4F78-8488-66E1ED3F50BF}"
Expand All @@ -63,6 +61,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.A
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.UnitTest", "Duplicati\UnitTest\Duplicati.UnitTest.csproj", "{ECB63D1C-1724-442D-9228-DEABF14F2EA3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.GoogleDrive", "Duplicati\Library\Backend\GoogleDrive\Duplicati.Library.Backend.GoogleDrive.csproj", "{487B2558-13BA-4A7C-A617-669F7B2F6D74}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.OAuthHelper", "Duplicati\Library\Backend\OAuthHelper\Duplicati.Library.OAuthHelper.csproj", "{D4C37C33-5E73-4B56-B2C3-DC4A6BAA36BB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -124,12 +126,12 @@ Global
{33FD1D24-C28F-4C71-933F-98F1586EA76C}.Release|Any CPU.Build.0 = Release|Any CPU
{33FD1D24-C28F-4C71-933F-98F1586EA76C}.Test|Any CPU.ActiveCfg = Debug|Any CPU
{33FD1D24-C28F-4C71-933F-98F1586EA76C}.Test|Any CPU.Build.0 = Debug|Any CPU
{42C91180-11EB-4590-82EA-80FE9D4DEBEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{42C91180-11EB-4590-82EA-80FE9D4DEBEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{42C91180-11EB-4590-82EA-80FE9D4DEBEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{42C91180-11EB-4590-82EA-80FE9D4DEBEC}.Release|Any CPU.Build.0 = Release|Any CPU
{42C91180-11EB-4590-82EA-80FE9D4DEBEC}.Test|Any CPU.ActiveCfg = Debug|Any CPU
{42C91180-11EB-4590-82EA-80FE9D4DEBEC}.Test|Any CPU.Build.0 = Debug|Any CPU
{487B2558-13BA-4A7C-A617-669F7B2F6D74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{487B2558-13BA-4A7C-A617-669F7B2F6D74}.Debug|Any CPU.Build.0 = Debug|Any CPU
{487B2558-13BA-4A7C-A617-669F7B2F6D74}.Release|Any CPU.ActiveCfg = Release|Any CPU
{487B2558-13BA-4A7C-A617-669F7B2F6D74}.Release|Any CPU.Build.0 = Release|Any CPU
{487B2558-13BA-4A7C-A617-669F7B2F6D74}.Test|Any CPU.ActiveCfg = Debug|Any CPU
{487B2558-13BA-4A7C-A617-669F7B2F6D74}.Test|Any CPU.Build.0 = Debug|Any CPU
{4D012CB1-4B92-47F4-89B7-BF80A73A2E99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4D012CB1-4B92-47F4-89B7-BF80A73A2E99}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4D012CB1-4B92-47F4-89B7-BF80A73A2E99}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -208,6 +210,12 @@ Global
{D10A5FC0-11B4-4E70-86AA-8AEA52BD9798}.Release|Any CPU.Build.0 = Release|Any CPU
{D10A5FC0-11B4-4E70-86AA-8AEA52BD9798}.Test|Any CPU.ActiveCfg = Debug|Any CPU
{D10A5FC0-11B4-4E70-86AA-8AEA52BD9798}.Test|Any CPU.Build.0 = Debug|Any CPU
{D4C37C33-5E73-4B56-B2C3-DC4A6BAA36BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D4C37C33-5E73-4B56-B2C3-DC4A6BAA36BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D4C37C33-5E73-4B56-B2C3-DC4A6BAA36BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D4C37C33-5E73-4B56-B2C3-DC4A6BAA36BB}.Release|Any CPU.Build.0 = Release|Any CPU
{D4C37C33-5E73-4B56-B2C3-DC4A6BAA36BB}.Test|Any CPU.ActiveCfg = Debug|Any CPU
{D4C37C33-5E73-4B56-B2C3-DC4A6BAA36BB}.Test|Any CPU.Build.0 = Debug|Any CPU
{D63E53E4-A458-4C2F-914D-92F715F58ACE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D63E53E4-A458-4C2F-914D-92F715F58ACE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D63E53E4-A458-4C2F-914D-92F715F58ACE}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
7 changes: 5 additions & 2 deletions Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
<SignAssembly>true</SignAssembly>
<SignAssembly>false</SignAssembly>

This comment has been minimized.

Sign in to view

Copy link
@rryk

rryk Jun 25, 2015

Why was this change necessary? Isn't it less secure if assemblies are not signed?

This comment has been minimized.

Sign in to view

Copy link
@kenkendk

kenkendk Jun 25, 2015

Author Member

Yes, ideally all binaries should be strong-named, but Google's API is currently not strong-named:
googleapis/google-api-dotnet-client#238

I attempted to manually strong-name them, but this messes up some internal visibility dependencies between the assemblies. I will be looking at removing the Google Drive dlls completely, and just using the web API, because there is very little that I need from the provided assemblies, and they are quite large.
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile />
Expand Down Expand Up @@ -48,7 +48,6 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\..\thirdparty\Json.NET\Newtonsoft.Json.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -97,6 +96,10 @@
<Project>{C0270709-2A40-43B5-8CF1-69581B9FA2A1}</Project>
<Name>Duplicati.Library.Backend.TahoeLAFS</Name>
</ProjectReference>
<ProjectReference Include="..\..\Library\Backend\GoogleDrive\Duplicati.Library.Backend.GoogleDrive.csproj">
<Project>{487B2558-13BA-4A7C-A617-669F7B2F6D74}</Project>
<Name>Duplicati.Library.Backend.GoogleDrive</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
10 changes: 5 additions & 5 deletions Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<OutputType>Exe</OutputType>
<RootNamespace>Duplicati.CommandLine.BackendTool</RootNamespace>
<AssemblyName>Duplicati.CommandLine.BackendTool</AssemblyName>
<SignAssembly>true</SignAssembly>
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>..\Duplicati.snk</AssemblyOriginatorKeyFile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile />
Expand Down Expand Up @@ -95,10 +95,6 @@
<Project>{DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}</Project>
<Name>Duplicati.Library.Utility</Name>
</ProjectReference>
<ProjectReference Include="..\..\Library\Backend\GoogleDocs\Duplicati.Library.Backend.GoogleDocs.csproj">
<Project>{42C91180-11EB-4590-82EA-80FE9D4DEBEC}</Project>
<Name>Duplicati.Library.Backend.GoogleDocs</Name>
</ProjectReference>
<ProjectReference Include="..\..\Library\AutoUpdater\Duplicati.Library.AutoUpdater.csproj">
<Project>{7E119745-1F62-43F0-936C-F312A1912C0B}</Project>
<Name>Duplicati.Library.AutoUpdater</Name>
Expand All @@ -111,6 +107,10 @@
<Project>{CCD76347-7DC7-4B42-B7E1-E500E624CAC3}</Project>
<Name>Duplicati.Library.Backend.OneDrive</Name>
</ProjectReference>
<ProjectReference Include="..\..\Library\Backend\GoogleDrive\Duplicati.Library.Backend.GoogleDrive.csproj">
<Project>{487B2558-13BA-4A7C-A617-669F7B2F6D74}</Project>
<Name>Duplicati.Library.Backend.GoogleDrive</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
Expand Down
10 changes: 5 additions & 5 deletions Duplicati/CommandLine/Duplicati.CommandLine.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Duplicati.CommandLine</RootNamespace>
<AssemblyName>Duplicati.CommandLine</AssemblyName>
<SignAssembly>true</SignAssembly>
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
<ApplicationIcon>TrayWarning.ico</ApplicationIcon>
<FileUpgradeFlags>
Expand Down Expand Up @@ -137,10 +137,6 @@
<Project>{E7280DCA-7776-4A73-B9B5-41FD77FC8799}</Project>
<Name>Duplicati.CommandLine.BackendTester</Name>
</ProjectReference>
<ProjectReference Include="..\Library\Backend\GoogleDocs\Duplicati.Library.Backend.GoogleDocs.csproj">
<Project>{42C91180-11EB-4590-82EA-80FE9D4DEBEC}</Project>
<Name>Duplicati.Library.Backend.GoogleDocs</Name>
</ProjectReference>
<ProjectReference Include="..\Library\AutoUpdater\Duplicati.Library.AutoUpdater.csproj">
<Project>{7E119745-1F62-43F0-936C-F312A1912C0B}</Project>
<Name>Duplicati.Library.AutoUpdater</Name>
Expand All @@ -153,6 +149,10 @@
<Project>{B68F2214-951F-4F78-8488-66E1ED3F50BF}</Project>
<Name>Duplicati.Library.Localization</Name>
</ProjectReference>
<ProjectReference Include="..\Library\Backend\GoogleDrive\Duplicati.Library.Backend.GoogleDrive.csproj">
<Project>{487B2558-13BA-4A7C-A617-669F7B2F6D74}</Project>
<Name>Duplicati.Library.Backend.GoogleDrive</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="Duplicati.snk" />
Expand Down
8 changes: 4 additions & 4 deletions Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,6 @@
<Project>{2AF960C0-357D-4D44-A3D5-8B6E89DB0F11}</Project>
<Name>Duplicati.CommandLine.BackendTool</Name>
</ProjectReference>
<ProjectReference Include="..\..\Library\Backend\GoogleDocs\Duplicati.Library.Backend.GoogleDocs.csproj">
<Project>{42C91180-11EB-4590-82EA-80FE9D4DEBEC}</Project>
<Name>Duplicati.Library.Backend.GoogleDocs</Name>
</ProjectReference>
<ProjectReference Include="..\..\Library\Compression\Duplicati.Library.Compression.csproj">
<Project>{19ECCE09-B5EB-406C-8C57-BAC66997D469}</Project>
<Name>Duplicati.Library.Compression</Name>
Expand Down Expand Up @@ -268,6 +264,10 @@
<Project>{E93F3DE2-FF3A-4709-96A3-8190AA14FA25}</Project>
<Name>Duplicati.Service</Name>
</ProjectReference>
<ProjectReference Include="..\..\Library\Backend\GoogleDrive\Duplicati.Library.Backend.GoogleDrive.csproj">
<Project>{487B2558-13BA-4A7C-A617-669F7B2F6D74}</Project>
<Name>Duplicati.Library.Backend.GoogleDrive</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.0">
Expand Down
97 changes: 0 additions & 97 deletions Duplicati/Library/Backend/GoogleDocs/Duplicati.Library.Backend.GoogleDocs.csproj
View file

This file was deleted.

Loading

0 comments on commit 3fc9102

Please sign in to comment.