diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index aae9804fb3..54525465d8 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -14,6 +14,7 @@ MediaBrowser.Server.Mac.MainClass A personal media server + v4.5 true @@ -33,6 +34,9 @@ Developer ID Installer false false + HttpClientHandler + Default + None true @@ -49,6 +53,9 @@ Developer ID Installer false false + HttpClientHandler + Default + None full @@ -66,6 +73,9 @@ false false false + HttpClientHandler + Default + None @@ -95,7 +105,6 @@ - @@ -117,7 +126,10 @@ Native\CertificateGenerator.cs - + + + Native\SqliteExtensions.cs + @@ -202,18 +214,65 @@ + + Resources\swagger-ui\index.html + + Resources\swagger-ui\o2c.html + + + Resources\swagger-ui\patch.js + Resources\swagger-ui\swagger-ui.js Resources\swagger-ui\swagger-ui.min.js + + Resources\swagger-ui\css\reset.css + Resources\swagger-ui\css\screen.css + + Resources\swagger-ui\css\typography.css + + + Resources\swagger-ui\fonts\droid-sans-v6-latin-700.eot + + + Resources\swagger-ui\fonts\droid-sans-v6-latin-700.svg + + + Resources\swagger-ui\fonts\droid-sans-v6-latin-700.ttf + + + Resources\swagger-ui\fonts\droid-sans-v6-latin-700.woff + + + Resources\swagger-ui\fonts\droid-sans-v6-latin-700.woff2 + + + Resources\swagger-ui\fonts\droid-sans-v6-latin-regular.eot + + + Resources\swagger-ui\fonts\droid-sans-v6-latin-regular.svg + + + Resources\swagger-ui\fonts\droid-sans-v6-latin-regular.ttf + + + Resources\swagger-ui\fonts\droid-sans-v6-latin-regular.woff + + + Resources\swagger-ui\fonts\droid-sans-v6-latin-regular.woff2 + + + Resources\swagger-ui\images\explorer_icons.png + Resources\swagger-ui\images\logo_small.png @@ -229,8 +288,8 @@ Resources\swagger-ui\lib\backbone-min.js - - Resources\swagger-ui\lib\handlebars-1.0.0.js + + Resources\swagger-ui\lib\handlebars-2.0.0.js Resources\swagger-ui\lib\highlight.7.3.pack.js @@ -247,11 +306,17 @@ Resources\swagger-ui\lib\jquery.wiggle.min.js + + Resources\swagger-ui\lib\marked.js + Resources\swagger-ui\lib\shred.bundle.js - - Resources\swagger-ui\lib\swagger.js + + Resources\swagger-ui\lib\swagger-client.js + + + Resources\swagger-ui\lib\swagger-oauth.js Resources\swagger-ui\lib\underscore-min.js @@ -259,8 +324,6 @@ Resources\swagger-ui\lib\shred\content.js - - Resources\dashboard-ui\about.html @@ -288,9 +351,6 @@ Resources\dashboard-ui\cinemamodeconfiguration.html - - Resources\dashboard-ui\collections.html - Resources\dashboard-ui\connectlogin.html @@ -372,6 +432,9 @@ Resources\dashboard-ui\library.html + + Resources\dashboard-ui\librarydisplay.html + Resources\dashboard-ui\librarypathmapping.html @@ -552,6 +615,9 @@ Resources\dashboard-ui\wizardagreement.html + + Resources\dashboard-ui\wizardcomponents.html + Resources\dashboard-ui\wizardfinish.html @@ -1365,12 +1431,21 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\alert\nativealert.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\alphapicker\alphapicker.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\alphapicker\style.css + Resources\dashboard-ui\bower_components\emby-webcomponents\backdrop\backdrop.js Resources\dashboard-ui\bower_components\emby-webcomponents\backdrop\style.css + + Resources\dashboard-ui\bower_components\emby-webcomponents\collectioneditor\collectioneditor.js + Resources\dashboard-ui\bower_components\emby-webcomponents\confirm\confirm.js @@ -1383,6 +1458,45 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\dialoghelper\dialoghelper.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\emby-button\emby-button.css + + + Resources\dashboard-ui\bower_components\emby-webcomponents\emby-button\emby-button.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\emby-button\paper-icon-button-light.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\emby-checkbox\emby-checkbox.css + + + Resources\dashboard-ui\bower_components\emby-webcomponents\emby-checkbox\emby-checkbox.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\emby-input\emby-input.css + + + Resources\dashboard-ui\bower_components\emby-webcomponents\emby-input\emby-input.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\emby-select\emby-select.css + + + Resources\dashboard-ui\bower_components\emby-webcomponents\emby-select\emby-select.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\emby-slider\emby-slider.css + + + Resources\dashboard-ui\bower_components\emby-webcomponents\emby-slider\emby-slider.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\emby-textarea\emby-textarea.css + + + Resources\dashboard-ui\bower_components\emby-webcomponents\emby-textarea\emby-textarea.js + Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\material-icons\2fcrYFNaTjcS6g4U3t-Y5ZjZjT5FdEJ140U2DJYC3mY.woff2 @@ -1581,12 +1695,6 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\guide\tvguide.template.html - - Resources\dashboard-ui\bower_components\emby-webcomponents\icons\mediainfo.html - - - Resources\dashboard-ui\bower_components\emby-webcomponents\icons\nav.html - Resources\dashboard-ui\bower_components\emby-webcomponents\images\basicimagefetcher.js @@ -1596,9 +1704,24 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\images\persistentimagefetcher.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\indicators\indicators.css + + + Resources\dashboard-ui\bower_components\emby-webcomponents\indicators\indicators.js + Resources\dashboard-ui\bower_components\emby-webcomponents\input\api.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\listview\listview.css + + + Resources\dashboard-ui\bower_components\emby-webcomponents\listview\listview.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\loading\loading-lite.css + Resources\dashboard-ui\bower_components\emby-webcomponents\loading\loading-lite.js @@ -1626,6 +1749,9 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\page.js\page.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\playlisteditor\playlisteditor.js + Resources\dashboard-ui\bower_components\emby-webcomponents\prompt\nativeprompt.js @@ -1650,6 +1776,9 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\recordingcreator\recordingeditor.template.html + + Resources\dashboard-ui\bower_components\emby-webcomponents\refreshdialog\refreshdialog.js + Resources\dashboard-ui\bower_components\emby-webcomponents\require\requirecss.js @@ -1692,9 +1821,6 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\sharing\social-share-kit-1.0.4\dist\js\social-share-kit.min.js - - Resources\dashboard-ui\bower_components\emby-webcomponents\slideshow\icons.html - Resources\dashboard-ui\bower_components\emby-webcomponents\slideshow\slideshow.js @@ -1704,6 +1830,9 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\strings\da.json + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\de.json + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\en-US.json @@ -1719,12 +1848,33 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\strings\nl.json + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\pt-BR.json + + + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\pt-PT.json + Resources\dashboard-ui\bower_components\emby-webcomponents\strings\ru.json + + Resources\dashboard-ui\bower_components\emby-webcomponents\subtitleeditor\subtitleeditor.css + + + Resources\dashboard-ui\bower_components\emby-webcomponents\subtitleeditor\subtitleeditor.js + + + Resources\dashboard-ui\bower_components\emby-webcomponents\subtitleeditor\subtitleeditor.template.html + + + Resources\dashboard-ui\bower_components\emby-webcomponents\toast\toast.css + Resources\dashboard-ui\bower_components\emby-webcomponents\toast\toast.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\viewmanager\viewcontainer-lite.css + Resources\dashboard-ui\bower_components\emby-webcomponents\viewmanager\viewcontainer-lite.js @@ -1974,6 +2124,9 @@ Resources\dashboard-ui\bower_components\hls.js\src\controller\cap-level-controller.js + + Resources\dashboard-ui\bower_components\hls.js\src\controller\ewma-bandwidth-estimator.js + Resources\dashboard-ui\bower_components\hls.js\src\controller\fps-controller.js @@ -2055,6 +2208,9 @@ Resources\dashboard-ui\bower_components\hls.js\src\utils\cea-708-interpreter.js + + Resources\dashboard-ui\bower_components\hls.js\src\utils\ewma.js + Resources\dashboard-ui\bower_components\hls.js\src\utils\hex.js @@ -2640,105 +2796,6 @@ Resources\dashboard-ui\bower_components\iron-input\test\letters-only.html - - Resources\dashboard-ui\bower_components\iron-list\.bower.json - - - Resources\dashboard-ui\bower_components\iron-list\.gitignore - - - Resources\dashboard-ui\bower_components\iron-list\.travis.yml - - - Resources\dashboard-ui\bower_components\iron-list\CONTRIBUTING.md - - - Resources\dashboard-ui\bower_components\iron-list\README.md - - - Resources\dashboard-ui\bower_components\iron-list\bower.json - - - Resources\dashboard-ui\bower_components\iron-list\index.html - - - Resources\dashboard-ui\bower_components\iron-list\iron-list.html - - - Resources\dashboard-ui\bower_components\iron-list\.github\ISSUE_TEMPLATE.md - - - Resources\dashboard-ui\bower_components\iron-list\demo\basic.html - - - Resources\dashboard-ui\bower_components\iron-list\demo\collapse.html - - - Resources\dashboard-ui\bower_components\iron-list\demo\grid.html - - - Resources\dashboard-ui\bower_components\iron-list\demo\index.html - - - Resources\dashboard-ui\bower_components\iron-list\demo\scroll-threshold.html - - - Resources\dashboard-ui\bower_components\iron-list\demo\selection.html - - - Resources\dashboard-ui\bower_components\iron-list\demo\data\contacts.json - - - Resources\dashboard-ui\bower_components\iron-list\test\basic.html - - - Resources\dashboard-ui\bower_components\iron-list\test\different-heights.html - - - Resources\dashboard-ui\bower_components\iron-list\test\dynamic-item-size.html - - - Resources\dashboard-ui\bower_components\iron-list\test\focus.html - - - Resources\dashboard-ui\bower_components\iron-list\test\grid.html - - - Resources\dashboard-ui\bower_components\iron-list\test\helpers.html - - - Resources\dashboard-ui\bower_components\iron-list\test\hidden-list.html - - - Resources\dashboard-ui\bower_components\iron-list\test\index.html - - - Resources\dashboard-ui\bower_components\iron-list\test\mutations.html - - - Resources\dashboard-ui\bower_components\iron-list\test\physical-count.html - - - Resources\dashboard-ui\bower_components\iron-list\test\selection.html - - - Resources\dashboard-ui\bower_components\iron-list\test\x-grid.html - - - Resources\dashboard-ui\bower_components\iron-list\test\x-list.html - - - Resources\dashboard-ui\bower_components\iron-list\test\smoke\avg-worst-case.html - - - Resources\dashboard-ui\bower_components\iron-list\test\smoke\dummy-data.html - - - Resources\dashboard-ui\bower_components\iron-list\test\smoke\index.html - - - Resources\dashboard-ui\bower_components\iron-list\test\smoke\physical-count.html - Resources\dashboard-ui\bower_components\iron-location\.bower.json @@ -2796,42 +2853,6 @@ Resources\dashboard-ui\bower_components\iron-location\test\redirection.html - - Resources\dashboard-ui\bower_components\iron-media-query\.bower.json - - - Resources\dashboard-ui\bower_components\iron-media-query\.gitignore - - - Resources\dashboard-ui\bower_components\iron-media-query\.travis.yml - - - Resources\dashboard-ui\bower_components\iron-media-query\CONTRIBUTING.md - - - Resources\dashboard-ui\bower_components\iron-media-query\README.md - - - Resources\dashboard-ui\bower_components\iron-media-query\bower.json - - - Resources\dashboard-ui\bower_components\iron-media-query\hero.svg - - - Resources\dashboard-ui\bower_components\iron-media-query\index.html - - - Resources\dashboard-ui\bower_components\iron-media-query\iron-media-query.html - - - Resources\dashboard-ui\bower_components\iron-media-query\demo\index.html - - - Resources\dashboard-ui\bower_components\iron-media-query\test\basic.html - - - Resources\dashboard-ui\bower_components\iron-media-query\test\index.html - Resources\dashboard-ui\bower_components\iron-menu-behavior\.bower.json @@ -2970,6 +2991,12 @@ Resources\dashboard-ui\bower_components\iron-range-behavior\.gitignore + + Resources\dashboard-ui\bower_components\iron-range-behavior\.travis.yml + + + Resources\dashboard-ui\bower_components\iron-range-behavior\CONTRIBUTING.md + Resources\dashboard-ui\bower_components\iron-range-behavior\README.md @@ -2982,6 +3009,9 @@ Resources\dashboard-ui\bower_components\iron-range-behavior\iron-range-behavior.html + + Resources\dashboard-ui\bower_components\iron-range-behavior\.github\ISSUE_TEMPLATE.md + Resources\dashboard-ui\bower_components\iron-range-behavior\demo\index.html @@ -3285,6 +3315,9 @@ Resources\dashboard-ui\bower_components\jquery\bower.json + + Resources\dashboard-ui\bower_components\jquery\dist\core.js + Resources\dashboard-ui\bower_components\jquery\dist\jquery.js @@ -3303,17 +3336,17 @@ Resources\dashboard-ui\bower_components\jquery\dist\jquery.slim.min.map - - Resources\dashboard-ui\bower_components\jquery\sizzle\LICENSE.txt + + Resources\dashboard-ui\bower_components\jquery\external\sizzle\LICENSE.txt - - Resources\dashboard-ui\bower_components\jquery\sizzle\dist\sizzle.js + + Resources\dashboard-ui\bower_components\jquery\external\sizzle\dist\sizzle.js - - Resources\dashboard-ui\bower_components\jquery\sizzle\dist\sizzle.min.js + + Resources\dashboard-ui\bower_components\jquery\external\sizzle\dist\sizzle.min.js - - Resources\dashboard-ui\bower_components\jquery\sizzle\dist\sizzle.min.map + + Resources\dashboard-ui\bower_components\jquery\external\sizzle\dist\sizzle.min.map Resources\dashboard-ui\bower_components\jquery\src\.jshintrc @@ -3351,9 +3384,6 @@ Resources\dashboard-ui\bower_components\jquery\src\event.js - - Resources\dashboard-ui\bower_components\jquery\src\intro.js - Resources\dashboard-ui\bower_components\jquery\src\jquery.js @@ -3363,9 +3393,6 @@ Resources\dashboard-ui\bower_components\jquery\src\offset.js - - Resources\dashboard-ui\bower_components\jquery\src\outro.js - Resources\dashboard-ui\bower_components\jquery\src\queue.js @@ -3381,9 +3408,6 @@ Resources\dashboard-ui\bower_components\jquery\src\serialize.js - - Resources\dashboard-ui\bower_components\jquery\src\support.js - Resources\dashboard-ui\bower_components\jquery\src\traversing.js @@ -3396,9 +3420,6 @@ Resources\dashboard-ui\bower_components\jquery\src\ajax\load.js - - Resources\dashboard-ui\bower_components\jquery\src\ajax\parseJSON.js - Resources\dashboard-ui\bower_components\jquery\src\ajax\parseXML.js @@ -3435,6 +3456,9 @@ Resources\dashboard-ui\bower_components\jquery\src\core\parseHTML.js + + Resources\dashboard-ui\bower_components\jquery\src\core\ready-no-deferred.js + Resources\dashboard-ui\bower_components\jquery\src\core\ready.js @@ -3450,9 +3474,6 @@ Resources\dashboard-ui\bower_components\jquery\src\css\curCSS.js - - Resources\dashboard-ui\bower_components\jquery\src\css\defaultDisplay.js - Resources\dashboard-ui\bower_components\jquery\src\css\hiddenVisibleSelectors.js @@ -3465,12 +3486,6 @@ Resources\dashboard-ui\bower_components\jquery\src\data\Data.js - - Resources\dashboard-ui\bower_components\jquery\src\data\accepts.js - - - Resources\dashboard-ui\bower_components\jquery\src\data\support.js - Resources\dashboard-ui\bower_components\jquery\src\deferred\exceptionHook.js @@ -3480,9 +3495,6 @@ Resources\dashboard-ui\bower_components\jquery\src\effects\animatedSelector.js - - Resources\dashboard-ui\bower_components\jquery\src\effects\support.js - Resources\dashboard-ui\bower_components\jquery\src\event\ajax.js @@ -3510,9 +3522,6 @@ Resources\dashboard-ui\bower_components\jquery\src\manipulation\buildFragment.js - - Resources\dashboard-ui\bower_components\jquery\src\manipulation\createSafeFragment.js - Resources\dashboard-ui\bower_components\jquery\src\manipulation\getAll.js @@ -3780,660 +3789,6 @@ Resources\dashboard-ui\bower_components\marked-element\test\marked-element.html - - Resources\dashboard-ui\bower_components\material-design-lite\.bower.json - - - Resources\dashboard-ui\bower_components\material-design-lite\LICENSE - - - Resources\dashboard-ui\bower_components\material-design-lite\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\bower.json - - - Resources\dashboard-ui\bower_components\material-design-lite\gulpfile.babel.js - - - Resources\dashboard-ui\bower_components\material-design-lite\material.css - - - Resources\dashboard-ui\bower_components\material-design-lite\material.js - - - Resources\dashboard-ui\bower_components\material-design-lite\material.min.css - - - Resources\dashboard-ui\bower_components\material-design-lite\material.min.css.map - - - Resources\dashboard-ui\bower_components\material-design-lite\material.min.js - - - Resources\dashboard-ui\bower_components\material-design-lite\material.min.js.map - - - Resources\dashboard-ui\bower_components\material-design-lite\package.json - - - Resources\dashboard-ui\bower_components\material-design-lite\src\INTRODUCTION.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\_color-definitions.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\_functions.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\_mixins.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\_variables.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\demos.css - - - Resources\dashboard-ui\bower_components\material-design-lite\src\index.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\material-design-lite-grid.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\material-design-lite.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\mdlComponentHandler.js - - - Resources\dashboard-ui\bower_components\material-design-lite\src\styleguide.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\template.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\animation\_animation.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\animation\demo.css - - - Resources\dashboard-ui\bower_components\material-design-lite\src\animation\demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\animation\demo.js - - - Resources\dashboard-ui\bower_components\material-design-lite\src\badge\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\badge\_badge.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\badge\snippets\badge-on-icon-icon-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\badge\snippets\badge-on-icon-icon.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\badge\snippets\badge-on-icon-text-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\badge\snippets\badge-on-icon-text.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\badge\snippets\badge-on-text-icon-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\badge\snippets\badge-on-text-icon.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\badge\snippets\badge-on-text-text-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\badge\snippets\badge-on-text-text.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\button\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\button\_button.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\button\button.js - - - Resources\dashboard-ui\bower_components\material-design-lite\src\button\snippets\fab-colored-ripple.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\button\snippets\fab-colored.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\button\snippets\fab-disabled.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\button\snippets\fab-mini-colored.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\button\snippets\fab-mini.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\button\snippets\fab-ripple.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\button\snippets\fab.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\button\snippets\flat-accent.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\button\snippets\flat-disabled.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\button\snippets\flat-primary.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\button\snippets\flat-ripple.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\button\snippets\flat.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\button\snippets\icon-colored.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\button\snippets\icon.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\button\snippets\raised-accent.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\button\snippets\raised-colored.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\button\snippets\raised-disabled.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\button\snippets\raised-ripple-accent.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\button\snippets\raised-ripple.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\button\snippets\raised.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\card\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\card\_card.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\card\snippets\event.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\card\snippets\image.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\card\snippets\square.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\card\snippets\wide.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\checkbox\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\checkbox\_checkbox.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\checkbox\checkbox.js - - - Resources\dashboard-ui\bower_components\material-design-lite\src\checkbox\snippets\check-off.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\checkbox\snippets\check-on.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\data-table\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\data-table\_data-table.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\data-table\data-table.js - - - Resources\dashboard-ui\bower_components\material-design-lite\src\data-table\snippets\data-table.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\dialog\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\dialog\_dialog.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\footer\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\footer\_mega_footer.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\footer\_mini_footer.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\footer\snippets\mega-footer.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\footer\snippets\mini-footer.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\grid\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\grid\_grid.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\grid\snippets\codepen-grid.css - - - Resources\dashboard-ui\bower_components\material-design-lite\src\grid\snippets\grid-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\grid\snippets\grid.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\icon-toggle\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\icon-toggle\_icon-toggle.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\icon-toggle\icon-toggle.js - - - Resources\dashboard-ui\bower_components\material-design-lite\src\icon-toggle\snippets\icon-off.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\icon-toggle\snippets\icon-on.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\images\buffer.svg - - - Resources\dashboard-ui\bower_components\material-design-lite\src\images\tick-mask.svg - - - Resources\dashboard-ui\bower_components\material-design-lite\src\images\tick.svg - - - Resources\dashboard-ui\bower_components\material-design-lite\src\layout\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\layout\_layout.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\layout\layout.js - - - Resources\dashboard-ui\bower_components\material-design-lite\src\layout\snippets\fixed-drawer-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\layout\snippets\fixed-drawer.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\layout\snippets\fixed-header-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\layout\snippets\fixed-header-drawer-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\layout\snippets\fixed-header-drawer.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\layout\snippets\fixed-header.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\layout\snippets\fixed-tabs-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\layout\snippets\fixed-tabs.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\layout\snippets\scrollable-tabs-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\layout\snippets\scrollable-tabs.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\layout\snippets\scrolling-header-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\layout\snippets\scrolling-header.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\layout\snippets\transparent-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\layout\snippets\transparent.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\layout\snippets\waterfall-header-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\layout\snippets\waterfall-header.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\list\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\list\_list.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\list\snippets\action.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\list\snippets\icon.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\list\snippets\list-control.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\list\snippets\list-item.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\list\snippets\three-line.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\list\snippets\two-line.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\menu\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\menu\_menu.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\menu\menu.js - - - Resources\dashboard-ui\bower_components\material-design-lite\src\menu\snippets\codepen-lower-buttons.css - - - Resources\dashboard-ui\bower_components\material-design-lite\src\menu\snippets\codepen-top-buttons.css - - - Resources\dashboard-ui\bower_components\material-design-lite\src\menu\snippets\lower-left-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\menu\snippets\lower-left.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\menu\snippets\lower-right-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\menu\snippets\lower-right.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\menu\snippets\top-left-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\menu\snippets\top-left.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\menu\snippets\top-right-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\menu\snippets\top-right.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\palette\_palette.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\palette\demo.css - - - Resources\dashboard-ui\bower_components\material-design-lite\src\palette\demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\progress\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\progress\_progress.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\progress\progress.js - - - Resources\dashboard-ui\bower_components\material-design-lite\src\progress\snippets\progress-buffering-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\progress\snippets\progress-buffering.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\progress\snippets\progress-default-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\progress\snippets\progress-default.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\progress\snippets\progress-indeterminate-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\progress\snippets\progress-indeterminate.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\radio\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\radio\_radio.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\radio\radio.js - - - Resources\dashboard-ui\bower_components\material-design-lite\src\radio\snippets\radio-off.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\radio\snippets\radio-on.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\resets\_h5bp.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\resets\_mobile.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\resets\_resets.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\ripple\_ripple.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\ripple\ripple.js - - - Resources\dashboard-ui\bower_components\material-design-lite\src\shadow\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\shadow\_shadow.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\shadow\demo.css - - - Resources\dashboard-ui\bower_components\material-design-lite\src\shadow\demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\slider\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\slider\_slider.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\slider\slider.js - - - Resources\dashboard-ui\bower_components\material-design-lite\src\slider\snippets\demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\slider\snippets\slider-default-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\slider\snippets\slider-default.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\slider\snippets\slider-starting-value-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\slider\snippets\slider-starting-value.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\snackbar\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\snackbar\_snackbar.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\snackbar\snackbar.js - - - Resources\dashboard-ui\bower_components\material-design-lite\src\snackbar\snippets\snackbar.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\snackbar\snippets\toast.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\spinner\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\spinner\_spinner.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\spinner\spinner.js - - - Resources\dashboard-ui\bower_components\material-design-lite\src\spinner\snippets\spinner-default.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\spinner\snippets\spinner-single-color.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\switch\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\switch\_switch.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\switch\switch.js - - - Resources\dashboard-ui\bower_components\material-design-lite\src\switch\snippets\switch-off.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\switch\snippets\switch-on.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\tabs\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\tabs\_tabs.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\tabs\tabs.js - - - Resources\dashboard-ui\bower_components\material-design-lite\src\tabs\snippets\tabs.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\textfield\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\textfield\_textfield.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\textfield\textfield.js - - - Resources\dashboard-ui\bower_components\material-design-lite\src\textfield\snippets\textfield-expanding-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\textfield\snippets\textfield-expanding.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\textfield\snippets\textfield-floating-numeric-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\textfield\snippets\textfield-floating-numeric.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\textfield\snippets\textfield-floating-text-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\textfield\snippets\textfield-floating-text.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\textfield\snippets\textfield-multi-line-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\textfield\snippets\textfield-multi-line.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\textfield\snippets\textfield-numeric-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\textfield\snippets\textfield-numeric.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\textfield\snippets\textfield-text-demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\textfield\snippets\textfield-text.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\third_party\rAF.js - - - Resources\dashboard-ui\bower_components\material-design-lite\src\tooltip\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\tooltip\_tooltip.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\tooltip\tooltip.js - - - Resources\dashboard-ui\bower_components\material-design-lite\src\tooltip\snippets\tooltip-large.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\tooltip\snippets\tooltip-multiline.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\tooltip\snippets\tooltip-rich.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\tooltip\snippets\tooltip-simple.html - - - Resources\dashboard-ui\bower_components\material-design-lite\src\typography\README.md - - - Resources\dashboard-ui\bower_components\material-design-lite\src\typography\_typography.scss - - - Resources\dashboard-ui\bower_components\material-design-lite\src\typography\demo.css - - - Resources\dashboard-ui\bower_components\material-design-lite\src\typography\demo.html - - - Resources\dashboard-ui\bower_components\material-design-lite\utils\uniffe.js - - - Resources\dashboard-ui\bower_components\material-design-lite\utils\jscs-rules\closure-camel-case.js - Resources\dashboard-ui\bower_components\native-promise-only\.bower.json @@ -4758,6 +4113,9 @@ Resources\dashboard-ui\bower_components\paper-button\paper-button.html + + Resources\dashboard-ui\bower_components\paper-button\.github\ISSUE_TEMPLATE.md + Resources\dashboard-ui\bower_components\paper-button\demo\index.html @@ -4803,48 +4161,6 @@ Resources\dashboard-ui\bower_components\paper-checkbox\test\index.html - - Resources\dashboard-ui\bower_components\paper-drawer-panel\.bower.json - - - Resources\dashboard-ui\bower_components\paper-drawer-panel\.gitignore - - - Resources\dashboard-ui\bower_components\paper-drawer-panel\.travis.yml - - - Resources\dashboard-ui\bower_components\paper-drawer-panel\CONTRIBUTING.md - - - Resources\dashboard-ui\bower_components\paper-drawer-panel\README.md - - - Resources\dashboard-ui\bower_components\paper-drawer-panel\bower.json - - - Resources\dashboard-ui\bower_components\paper-drawer-panel\hero.svg - - - Resources\dashboard-ui\bower_components\paper-drawer-panel\index.html - - - Resources\dashboard-ui\bower_components\paper-drawer-panel\paper-drawer-panel.html - - - Resources\dashboard-ui\bower_components\paper-drawer-panel\demo\index.html - - - Resources\dashboard-ui\bower_components\paper-drawer-panel\test\focus.html - - - Resources\dashboard-ui\bower_components\paper-drawer-panel\test\index.html - - - Resources\dashboard-ui\bower_components\paper-drawer-panel\test\positioning.html - - - Resources\dashboard-ui\bower_components\paper-drawer-panel\test\small-devices.html - Resources\dashboard-ui\bower_components\paper-fab\.bower.json @@ -5253,6 +4569,9 @@ Resources\dashboard-ui\bower_components\paper-ripple\paper-ripple.html + + Resources\dashboard-ui\bower_components\paper-ripple\.github\ISSUE_TEMPLATE.md + Resources\dashboard-ui\bower_components\paper-ripple\demo\index.html @@ -5262,45 +4581,6 @@ Resources\dashboard-ui\bower_components\paper-ripple\test\paper-ripple.html - - Resources\dashboard-ui\bower_components\paper-slider\.bower.json - - - Resources\dashboard-ui\bower_components\paper-slider\.gitignore - - - Resources\dashboard-ui\bower_components\paper-slider\.travis.yml - - - Resources\dashboard-ui\bower_components\paper-slider\CONTRIBUTING.md - - - Resources\dashboard-ui\bower_components\paper-slider\README.md - - - Resources\dashboard-ui\bower_components\paper-slider\bower.json - - - Resources\dashboard-ui\bower_components\paper-slider\hero.svg - - - Resources\dashboard-ui\bower_components\paper-slider\index.html - - - Resources\dashboard-ui\bower_components\paper-slider\paper-slider.html - - - Resources\dashboard-ui\bower_components\paper-slider\demo\index.html - - - Resources\dashboard-ui\bower_components\paper-slider\test\a11y.html - - - Resources\dashboard-ui\bower_components\paper-slider\test\basic.html - - - Resources\dashboard-ui\bower_components\paper-slider\test\index.html - Resources\dashboard-ui\bower_components\paper-spinner\.bower.json @@ -5445,30 +4725,6 @@ Resources\dashboard-ui\bower_components\paper-tabs\test\index.html - - Resources\dashboard-ui\bower_components\paper-toast\.bower.json - - - Resources\dashboard-ui\bower_components\paper-toast\.gitignore - - - Resources\dashboard-ui\bower_components\paper-toast\README.md - - - Resources\dashboard-ui\bower_components\paper-toast\bower.json - - - Resources\dashboard-ui\bower_components\paper-toast\hero.svg - - - Resources\dashboard-ui\bower_components\paper-toast\index.html - - - Resources\dashboard-ui\bower_components\paper-toast\paper-toast.html - - - Resources\dashboard-ui\bower_components\paper-toast\demo\index.html - Resources\dashboard-ui\bower_components\paper-toggle-button\.bower.json @@ -6462,6 +5718,9 @@ Resources\dashboard-ui\bower_components\prism-element\prism-import.html + + Resources\dashboard-ui\bower_components\prism-element\prism-theme-default.html + Resources\dashboard-ui\bower_components\query-string\.bower.json @@ -6621,14 +5880,11 @@ Resources\dashboard-ui\components\remotecontrolautoplay.js - - Resources\dashboard-ui\components\scrollthreshold.js - Resources\dashboard-ui\components\viewcontainer-lite.js - - Resources\dashboard-ui\components\collectioneditor\collectioneditor.js + + Resources\dashboard-ui\components\channelmapper\channelmapper.js Resources\dashboard-ui\components\directorybrowser\directorybrowser.js @@ -6672,12 +5928,6 @@ Resources\dashboard-ui\components\imageuploader\imageuploader.template.html - - Resources\dashboard-ui\components\ironcardlist\ironcardlist.js - - - Resources\dashboard-ui\components\ironcardlist\ironcardlist.template.html - Resources\dashboard-ui\components\itemidentifier\itemidentifier.js @@ -6708,14 +5958,11 @@ Resources\dashboard-ui\components\metadataeditor\personeditor.template.html - - Resources\dashboard-ui\components\playlisteditor\playlisteditor.js + + Resources\dashboard-ui\components\navdrawer\navdrawer.css - - Resources\dashboard-ui\components\subtitleeditor\subtitleeditor.js - - - Resources\dashboard-ui\components\subtitleeditor\subtitleeditor.template.html + + Resources\dashboard-ui\components\navdrawer\navdrawer.js Resources\dashboard-ui\components\tvproviders\schedulesdirect.js @@ -6723,12 +5970,21 @@ Resources\dashboard-ui\components\tvproviders\schedulesdirect.template.html + + Resources\dashboard-ui\components\tvproviders\xmltv.js + + + Resources\dashboard-ui\components\tvproviders\xmltv.template.html + Resources\dashboard-ui\css\card.css Resources\dashboard-ui\css\chromecast.css + + Resources\dashboard-ui\css\dashboard.css + Resources\dashboard-ui\css\detailtable.css @@ -7035,9 +6291,6 @@ Resources\dashboard-ui\css\images\userdata\password.png - - Resources\dashboard-ui\css\polymer\paper-icon-button-light.css - Resources\dashboard-ui\devices\android\android.css @@ -7074,9 +6327,6 @@ Resources\dashboard-ui\scripts\addpluginpage.js - - Resources\dashboard-ui\scripts\alphapicker.js - Resources\dashboard-ui\scripts\appservices.js @@ -7209,6 +6459,9 @@ Resources\dashboard-ui\scripts\librarybrowser.js + + Resources\dashboard-ui\scripts\librarydisplay.js + Resources\dashboard-ui\scripts\librarylist.js @@ -7320,9 +6573,6 @@ Resources\dashboard-ui\scripts\movietrailers.js - - Resources\dashboard-ui\scripts\musicalbumartists.js - Resources\dashboard-ui\scripts\musicalbums.js @@ -7386,9 +6636,6 @@ Resources\dashboard-ui\scripts\playlistedit.js - - Resources\dashboard-ui\scripts\playlistmanager.js - Resources\dashboard-ui\scripts\playlists.js @@ -7503,12 +6750,21 @@ Resources\dashboard-ui\scripts\userpassword.js + + Resources\dashboard-ui\scripts\userpasswordpage.js + Resources\dashboard-ui\scripts\userprofilespage.js Resources\dashboard-ui\scripts\wizardagreement.js + + Resources\dashboard-ui\scripts\wizardcomponents.js + + + Resources\dashboard-ui\scripts\wizardcontroller.js + Resources\dashboard-ui\scripts\wizardfinishpage.js diff --git a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs index 0b2f533a40..0474018cf9 100644 --- a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs +++ b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs @@ -10,6 +10,7 @@ using MediaBrowser.Controller.Power; using MediaBrowser.Server.Implementations.Persistence; using MediaBrowser.Server.Startup.Common.FFMpeg; using System.Diagnostics; +using MediaBrowser.Model.System; namespace MediaBrowser.Server.Mac { @@ -166,7 +167,7 @@ namespace MediaBrowser.Server.Mac switch (environment.SystemArchitecture) { - case Architecture.X86_X64: + case Architecture.X64: info.Version = "20160124"; break; case Architecture.X86: @@ -183,7 +184,7 @@ namespace MediaBrowser.Server.Mac { switch (environment.SystemArchitecture) { - case Architecture.X86_X64: + case Architecture.X64: return new[] { "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/osx/ffmpeg-x64-2.8.5.7z" @@ -230,7 +231,7 @@ namespace MediaBrowser.Server.Mac } else if (string.Equals(uname.machine, "x86_64", StringComparison.OrdinalIgnoreCase)) { - info.SystemArchitecture = Architecture.X86_X64; + info.SystemArchitecture = Architecture.X64; } else if (uname.machine.StartsWith("arm", StringComparison.OrdinalIgnoreCase)) { diff --git a/MediaBrowser.Server.Mac/Native/DbConnector.cs b/MediaBrowser.Server.Mac/Native/DbConnector.cs new file mode 100644 index 0000000000..4c19210b81 --- /dev/null +++ b/MediaBrowser.Server.Mac/Native/DbConnector.cs @@ -0,0 +1,24 @@ +using System; +using System.Data; +using System.Data.SQLite; +using System.Threading.Tasks; +using MediaBrowser.Model.Logging; +using MediaBrowser.Server.Implementations.Persistence; + +namespace MediaBrowser.Server.Mac +{ + public class DbConnector : IDbConnector + { + private readonly ILogger _logger; + + public DbConnector(ILogger logger) + { + _logger = logger; + } + + public Task Connect(string dbPath, bool isReadOnly, bool enablePooling = false, int? cacheSize = null) + { + return SqliteExtensions.ConnectToDb(dbPath, isReadOnly, enablePooling, cacheSize, _logger); + } + } +} \ No newline at end of file diff --git a/MediaBrowser.Server.Mac/Native/SqliteExtensions.cs b/MediaBrowser.Server.Mac/Native/SqliteExtensions.cs deleted file mode 100644 index a05bb3f268..0000000000 --- a/MediaBrowser.Server.Mac/Native/SqliteExtensions.cs +++ /dev/null @@ -1,62 +0,0 @@ -using System; -using System.Data; -using System.Data.SQLite; -using System.Threading.Tasks; -using MediaBrowser.Model.Logging; -using MediaBrowser.Server.Implementations.Persistence; - -namespace MediaBrowser.Server.Mac -{ - /// - /// Class SQLiteExtensions - /// - static class SqliteExtensions - { - /// - /// Connects to db. - /// - /// The db path. - /// The logger. - /// Task{IDbConnection}. - /// dbPath - public static async Task ConnectToDb(string dbPath, ILogger logger) - { - if (string.IsNullOrEmpty(dbPath)) - { - throw new ArgumentNullException("dbPath"); - } - - logger.Info("Sqlite {0} opening {1}", SQLiteConnection.SQLiteVersion, dbPath); - - var connectionstr = new SQLiteConnectionStringBuilder - { - PageSize = 4096, - CacheSize = 2000, - SyncMode = SynchronizationModes.Full, - DataSource = dbPath, - JournalMode = SQLiteJournalModeEnum.Wal - }; - - var connection = new SQLiteConnection(connectionstr.ConnectionString); - - await connection.OpenAsync().ConfigureAwait(false); - - return connection; - } - } - - public class DbConnector : IDbConnector - { - private readonly ILogger _logger; - - public DbConnector(ILogger logger) - { - _logger = logger; - } - - public Task Connect(string dbPath) - { - return SqliteExtensions.ConnectToDb(dbPath, _logger); - } - } -} \ No newline at end of file