From 1917a8ad7c3ae3d2b9c5463f3e3f08dab0fa13ef Mon Sep 17 00:00:00 2001 From: kgiszewski Date: Wed, 1 Jul 2015 12:19:35 -0400 Subject: [PATCH 01/33] Hijack the navigation for future search --- .../UmbracoBookshelf/js/directives.js | 41 ++++++++ .../UmbracoBookshelf/js/interceptors.js | 19 ++++ .../UmbracoBookshelf/js/library.controller.js | 4 +- .../UmbracoBookshelf/package.manifest | 3 +- .../UmbracoBookshelf/views/navigation.html | 99 +++++++++++++++++++ .../views/navigation.router.html | 1 + 6 files changed, 164 insertions(+), 3 deletions(-) create mode 100644 src/App_Plugins/UmbracoBookshelf/js/interceptors.js create mode 100644 src/App_Plugins/UmbracoBookshelf/views/navigation.html create mode 100644 src/App_Plugins/UmbracoBookshelf/views/navigation.router.html diff --git a/src/App_Plugins/UmbracoBookshelf/js/directives.js b/src/App_Plugins/UmbracoBookshelf/js/directives.js index cabee43..5ae78e3 100644 --- a/src/App_Plugins/UmbracoBookshelf/js/directives.js +++ b/src/App_Plugins/UmbracoBookshelf/js/directives.js @@ -176,5 +176,46 @@ restrict: "A", link: linker } +}).directive('umbracoBookshelfNavigation', function ($http, $compile) { + + function linker(scope, element, attrs) { + function getView(view) { + $http.get(view, { cache: false }).then(function (data) { + + element.html(data.data).show(); + + $compile(element.contents())(scope); + }); + } + + scope.$on("$routeChangeSuccess", function(event, current, previous) { + + var isComingFromBookshelf = (previous && previous.pathParams.section.toLowerCase().indexOf("umbracobookshelf") != -1); + var isOnBookshelf = (current.pathParams.section.toLowerCase().indexOf("umbracobookshelf") != -1); + + //if on bookshelf but not coming from bookshelf + if (isOnBookshelf) { + if (!isComingFromBookshelf) { + getView("/App_Plugins/UmbracoBookshelf/Views/navigation.html"); + } + } else { + //if first time viewed + if (!previous) { + getView("views/directives/umb-navigation.html?intercepted=1"); + } else { + //if coming from bookshelf + if (isComingFromBookshelf) { + getView("views/directives/umb-navigation.html?intercepted=1"); + } + } + } + }); + } + + return { + restrict: "E", + link: linker, + replace: true + } }); diff --git a/src/App_Plugins/UmbracoBookshelf/js/interceptors.js b/src/App_Plugins/UmbracoBookshelf/js/interceptors.js new file mode 100644 index 0000000..e1c988c --- /dev/null +++ b/src/App_Plugins/UmbracoBookshelf/js/interceptors.js @@ -0,0 +1,19 @@ +angular.module('umbraco').service('umbracoBookshelfInterceptor', function ($location, $templateCache) { + var service = this; + + service.request = function (request) { + if (request.url == "views/directives/umb-navigation.html") { + request.url = "/App_Plugins/UmbracoBookshelf/Views/navigation.router.html"; + } + + return request; + }; + + service.responseError = function (response) { + return response; + }; +}); + +angular.module('umbraco').config(function ($httpProvider) { + $httpProvider.interceptors.push('umbracoBookshelfInterceptor'); +}); \ No newline at end of file diff --git a/src/App_Plugins/UmbracoBookshelf/js/library.controller.js b/src/App_Plugins/UmbracoBookshelf/js/library.controller.js index 6a7aebb..7334484 100644 --- a/src/App_Plugins/UmbracoBookshelf/js/library.controller.js +++ b/src/App_Plugins/UmbracoBookshelf/js/library.controller.js @@ -34,7 +34,7 @@ } $scope.getUpdatedOn = function(item) { - if (item.details) { + if (item.details && item.details.pushed_at) { return item.details.pushed_at.replace('T', ' '); } @@ -49,7 +49,7 @@ umbracoBookshelfResource.getBookFeed().then(function(data) { $scope.model.feed = data; }).then(function () { - angular.forEach($scope.model.feed.gitHub, function(feedItem) { + angular.forEach($scope.model.feed.gitHub, function (feedItem) { umbracoBookshelfResource.getContributors(feedItem).then(function(contributors) { feedItem.authors = contributors; }); diff --git a/src/App_Plugins/UmbracoBookshelf/package.manifest b/src/App_Plugins/UmbracoBookshelf/package.manifest index c9f6572..b89e895 100644 --- a/src/App_Plugins/UmbracoBookshelf/package.manifest +++ b/src/App_Plugins/UmbracoBookshelf/package.manifest @@ -12,7 +12,8 @@ "~/App_Plugins/UmbracoBookshelf/js/marked.min.js", "~/App_Plugins/UmbracoBookshelf/js/highlight.pack.js", "~/App_Plugins/UmbracoBookshelf/js/autogrow.js", - "~/App_Plugins/UmbracoBookshelf/js/imageSelector.controller.js" + "~/App_Plugins/UmbracoBookshelf/js/imageSelector.controller.js", + "~/App_Plugins/UmbracoBookshelf/js/interceptors.js" ], "css": [ "~/App_Plugins/UmbracoBookshelf/css/application.css" diff --git a/src/App_Plugins/UmbracoBookshelf/views/navigation.html b/src/App_Plugins/UmbracoBookshelf/views/navigation.html new file mode 100644 index 0000000..2360fde --- /dev/null +++ b/src/App_Plugins/UmbracoBookshelf/views/navigation.html @@ -0,0 +1,99 @@ +
+ + + + + + +
\ No newline at end of file diff --git a/src/App_Plugins/UmbracoBookshelf/views/navigation.router.html b/src/App_Plugins/UmbracoBookshelf/views/navigation.router.html new file mode 100644 index 0000000..6c2bf86 --- /dev/null +++ b/src/App_Plugins/UmbracoBookshelf/views/navigation.router.html @@ -0,0 +1 @@ + \ No newline at end of file From 673651104c044a3ec387de31eef0a750c56827d9 Mon Sep 17 00:00:00 2001 From: kgiszewski Date: Wed, 1 Jul 2015 12:37:36 -0400 Subject: [PATCH 02/33] Mockup UI for search --- .../UmbracoBookshelf/js/search.controller.js | 34 +++++++++++++++++++ .../UmbracoBookshelf/package.manifest | 3 +- .../UmbracoBookshelf/views/navigation.html | 32 +++++++---------- 3 files changed, 49 insertions(+), 20 deletions(-) create mode 100644 src/App_Plugins/UmbracoBookshelf/js/search.controller.js diff --git a/src/App_Plugins/UmbracoBookshelf/js/search.controller.js b/src/App_Plugins/UmbracoBookshelf/js/search.controller.js new file mode 100644 index 0000000..0320ed2 --- /dev/null +++ b/src/App_Plugins/UmbracoBookshelf/js/search.controller.js @@ -0,0 +1,34 @@ +angular.module('umbraco').controller('umbracoBookshelfSearchController', function ($scope, umbracoBookshelfResource) { + + $scope.model = {}; + $scope.model.keywords = ""; + + $scope.model.books = [ + { + name: "Learn Umbraco 7", + results: [ + { + name: "04 - Surface, RenderMVC and API Controllers", + url: "#" + }, + { + name: "06 - Blah Chapter", + url: "#" + } + ] + }, + { + name: "Official Umbraco Docs", + results: [ + { + name: "Surface Controllers", + url: "#" + }, + { + name: "API Controllers", + url: "#" + } + ] + } + ]; +}); \ No newline at end of file diff --git a/src/App_Plugins/UmbracoBookshelf/package.manifest b/src/App_Plugins/UmbracoBookshelf/package.manifest index b89e895..ea5fa6a 100644 --- a/src/App_Plugins/UmbracoBookshelf/package.manifest +++ b/src/App_Plugins/UmbracoBookshelf/package.manifest @@ -13,7 +13,8 @@ "~/App_Plugins/UmbracoBookshelf/js/highlight.pack.js", "~/App_Plugins/UmbracoBookshelf/js/autogrow.js", "~/App_Plugins/UmbracoBookshelf/js/imageSelector.controller.js", - "~/App_Plugins/UmbracoBookshelf/js/interceptors.js" + "~/App_Plugins/UmbracoBookshelf/js/interceptors.js", + "~/App_Plugins/UmbracoBookshelf/js/search.controller.js" ], "css": [ "~/App_Plugins/UmbracoBookshelf/css/application.css" diff --git a/src/App_Plugins/UmbracoBookshelf/views/navigation.html b/src/App_Plugins/UmbracoBookshelf/views/navigation.html index 2360fde..1c300ca 100644 --- a/src/App_Plugins/UmbracoBookshelf/views/navigation.html +++ b/src/App_Plugins/UmbracoBookshelf/views/navigation.html @@ -10,7 +10,7 @@
-
+
@@ -21,38 +21,32 @@
-
+
  • -
    Search results
    -
    bam!
    +
    Bookshelf Search Results
    -
      -
    • + From 494a2e4ec924e9e780f3246e0cb0fa177c33cde6 Mon Sep 17 00:00:00 2001 From: kgiszewski Date: Thu, 2 Jul 2015 12:24:01 -0400 Subject: [PATCH 03/33] Wireup the client/server search interaction --- .../UmbracoBookshelf/js/resources.js | 5 ++ .../UmbracoBookshelf/js/search.controller.js | 39 ++++---------- .../UmbracoBookshelf/views/navigation.html | 8 +-- src/Controllers/UmbracoBookshelfController.cs | 39 +++++++++++++- src/Events/PackageActions.cs | 8 +-- src/Examine/BookResultModel.cs | 16 ++++++ src/Examine/BookshelfExamineDataService.cs | 51 +++++++++++++++++++ src/Examine/BookshelfSearcher.cs | 34 +++++++++++++ src/UmbracoBookshelf.csproj | 7 +++ 9 files changed, 169 insertions(+), 38 deletions(-) create mode 100644 src/Examine/BookResultModel.cs create mode 100644 src/Examine/BookshelfExamineDataService.cs create mode 100644 src/Examine/BookshelfSearcher.cs diff --git a/src/App_Plugins/UmbracoBookshelf/js/resources.js b/src/App_Plugins/UmbracoBookshelf/js/resources.js index 19f9dee..0fa9ae5 100644 --- a/src/App_Plugins/UmbracoBookshelf/js/resources.js +++ b/src/App_Plugins/UmbracoBookshelf/js/resources.js @@ -44,6 +44,11 @@ return umbRequestHelper.resourcePromise( $http.get("/umbraco/backoffice/umbracobookshelfapi/umbracobookshelf/getsiblingfiles/?filePath=" + filePath), 'Failed to get sibling files' ); + }, + searchFiles: function (keywords) { + return umbRequestHelper.resourcePromise( + $http.get("/umbraco/backoffice/umbracobookshelfapi/umbracobookshelf/searchfiles/?keywords=" + keywords), 'Failed to search files' + ); } } }); \ No newline at end of file diff --git a/src/App_Plugins/UmbracoBookshelf/js/search.controller.js b/src/App_Plugins/UmbracoBookshelf/js/search.controller.js index 0320ed2..86fd40b 100644 --- a/src/App_Plugins/UmbracoBookshelf/js/search.controller.js +++ b/src/App_Plugins/UmbracoBookshelf/js/search.controller.js @@ -1,34 +1,15 @@ -angular.module('umbraco').controller('umbracoBookshelfSearchController', function ($scope, umbracoBookshelfResource) { +angular.module('umbraco').controller('umbracoBookshelfSearchController', function($scope, umbracoBookshelfResource) { $scope.model = {}; $scope.model.keywords = ""; - $scope.model.books = [ - { - name: "Learn Umbraco 7", - results: [ - { - name: "04 - Surface, RenderMVC and API Controllers", - url: "#" - }, - { - name: "06 - Blah Chapter", - url: "#" - } - ] - }, - { - name: "Official Umbraco Docs", - results: [ - { - name: "Surface Controllers", - url: "#" - }, - { - name: "API Controllers", - url: "#" - } - ] - } - ]; + $scope.model.books = []; + + $scope.search = _.debounce(function() { + console.log('Calling server...'); + umbracoBookshelfResource.searchFiles($scope.model.keywords).then(function(data) { + console.log(data); + $scope.model.books = data; + }); + }, 500); }); \ No newline at end of file diff --git a/src/App_Plugins/UmbracoBookshelf/views/navigation.html b/src/App_Plugins/UmbracoBookshelf/views/navigation.html index 1c300ca..9828127 100644 --- a/src/App_Plugins/UmbracoBookshelf/views/navigation.html +++ b/src/App_Plugins/UmbracoBookshelf/views/navigation.html @@ -24,7 +24,7 @@ ng-model="model.keywords" class="umb-search-field search-query" placeholder="Type to search your books..." - ng-keydown="navigateResults($event)" /> + ng-keydown="search()" />
@@ -41,12 +41,12 @@
Bookshelf Search Results
diff --git a/src/Controllers/UmbracoBookshelfController.cs b/src/Controllers/UmbracoBookshelfController.cs index 6d75ab6..ed4dd6c 100644 --- a/src/Controllers/UmbracoBookshelfController.cs +++ b/src/Controllers/UmbracoBookshelfController.cs @@ -7,12 +7,12 @@ using System.IO; using System.Net; using System.Text.RegularExpressions; -using System.Web.Mvc; using ICSharpCode.SharpZipLib.Core; using ICSharpCode.SharpZipLib.Zip; using Newtonsoft.Json.Linq; using Umbraco.Core; using Umbraco.Core.Logging; +using UmbracoBookshelf.Examine; using UmbracoBookshelf.Models; using UmbracoBookshelf.Helpers; using Constants = UmbracoBookshelf.Helpers.Constants; @@ -361,6 +361,43 @@ public object GetImages(string currentPath) }); } + [System.Web.Http.HttpGet] + public object SearchFiles(string keywords) + { + var results = BookshelfSearcher.Search(keywords); + + var data = new List(); + + if (results.Any()) + { + var books = results.GroupBy(x => x.Fields["book"]); + + foreach (var book in books) + { + var bookData = new BookResultModel() + { + Name = book.Key + }; + + var resultsList = new List(); + + foreach(var result in book) + { + resultsList.Add(new BookResultModel.BookEntry() + { + Title = result.Fields["title"], + Url = result.Fields["url"] + }); + } + + bookData.Results = resultsList; + data.Add(bookData); + } + } + + return data; + } + private void ExtractZipFile(string archiveFilenameIn, string outFolder, string password = "") { ZipFile zf = null; diff --git a/src/Events/PackageActions.cs b/src/Events/PackageActions.cs index 2950f2b..54a0ff3 100644 --- a/src/Events/PackageActions.cs +++ b/src/Events/PackageActions.cs @@ -1,11 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Collections.Specialized; -using System.Configuration; +using System.Configuration; using System.Xml; using umbraco.cms.businesslogic.packager; using Umbraco.Core; using Umbraco.Core.Logging; +using UmbracoBookshelf.Examine; namespace UmbracoBookshelf.Events { @@ -15,6 +13,8 @@ protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplica { base.ApplicationStarted(umbracoApplication, applicationContext); + LogHelper.Info(typeof(BookshelfExamineDataService).FullName); + if(string.IsNullOrEmpty(ConfigurationManager.AppSettings["UmbracoBookshelf:customFolder"])) { addDashboard(); diff --git a/src/Examine/BookResultModel.cs b/src/Examine/BookResultModel.cs new file mode 100644 index 0000000..4f5cbe9 --- /dev/null +++ b/src/Examine/BookResultModel.cs @@ -0,0 +1,16 @@ +using System.Collections.Generic; + +namespace UmbracoBookshelf.Examine +{ + public class BookResultModel + { + public string Name { get; set; } + public IEnumerable Results { get; set; } + + public class BookEntry + { + public string Title { get; set; } + public string Url { get; set; } + } + } +} \ No newline at end of file diff --git a/src/Examine/BookshelfExamineDataService.cs b/src/Examine/BookshelfExamineDataService.cs new file mode 100644 index 0000000..89bd08c --- /dev/null +++ b/src/Examine/BookshelfExamineDataService.cs @@ -0,0 +1,51 @@ +using System.Collections.Generic; +using Examine; +using Examine.LuceneEngine; +using Umbraco.Core.Logging; + +namespace UmbracoBookshelf.Examine +{ + public class BookshelfExamineDataService : ISimpleDataService + { + public IEnumerable GetAllData(string indexType) + { + LogHelper.Info("Building the Bookshelf index..."); + + var data = new List(); + + data.Add(new SimpleDataSet() + { + NodeDefinition = new IndexedNode() + { + Type = "Bookshelf", + NodeId = 1 + }, + RowData = new Dictionary() + { + {"book", "Learn Umbraco 7"}, + {"title", "Developer Tools"}, + {"text", "lorem ipsum"}, + {"url", "/umbraco/#/UmbracoBookshelf/UmbracoBookshelfTree/file/%252FBooks%252FLearnUmbraco7%252FChapter%25200%252F01%2520-%2520Developer%2520Tools.md"} + } + }); + + data.Add(new SimpleDataSet() + { + NodeDefinition = new IndexedNode() + { + Type = "Bookshelf", + NodeId = 2 + }, + RowData = new Dictionary() + { + {"book", "Learn Umbraco 7"}, + {"title", "Orientation"}, + {"text", "foo bar"}, + {"url", "/umbraco/#/UmbracoBookshelf/UmbracoBookshelfTree/folder/%252FBooks%252FLearnUmbraco7%252FChapter%252002%2520-%2520Backoffice%2520Orientation"} + } + }); + + return data; + } + } +} \ No newline at end of file diff --git a/src/Examine/BookshelfSearcher.cs b/src/Examine/BookshelfSearcher.cs new file mode 100644 index 0000000..f0199b2 --- /dev/null +++ b/src/Examine/BookshelfSearcher.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using Examine; +using Umbraco.Core.Logging; + +namespace UmbracoBookshelf.Examine +{ + public static class BookshelfSearcher + { + public static ISearchResults Search(string keywords) + { + var searcher = ExamineManager.Instance.SearchProviderCollection["BookshelfSearcher"]; + var searchCriteria = searcher.CreateSearchCriteria(global::Examine.SearchCriteria.BooleanOperation.Or); + var rawQueries = new List(); + + if (!string.IsNullOrWhiteSpace(keywords)) + { + var words = keywords.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries); + + foreach (var word in words) + { + var contentRawQuery = string.Format("(+__IndexType:bookshelf && (title: {0}~{1} book: {0}~{1} text: {0}~{1}))", word, 0.5); + rawQueries.Add(contentRawQuery); + + LogHelper.Info(contentRawQuery); + } + } + + var query = searchCriteria.RawQuery("(" + String.Join(")(", rawQueries) + ")"); + + return searcher.Search(query); + } + } +} \ No newline at end of file diff --git a/src/UmbracoBookshelf.csproj b/src/UmbracoBookshelf.csproj index 8857679..b3d05d1 100644 --- a/src/UmbracoBookshelf.csproj +++ b/src/UmbracoBookshelf.csproj @@ -230,8 +230,12 @@ + + + + @@ -265,6 +269,9 @@ + + + From 7e74032dd28b9a2abb2d46251a9459416290c733 Mon Sep 17 00:00:00 2001 From: kgiszewski Date: Thu, 2 Jul 2015 15:57:51 -0400 Subject: [PATCH 04/33] Mostly working --- .../UmbracoBookshelf/js/search.controller.js | 15 +++-- .../UmbracoBookshelf/views/navigation.html | 4 +- src/Controllers/UmbracoBookshelfController.cs | 27 ++++++-- src/Examine/BookResultModel.cs | 1 + src/Examine/BookshelfExamineDataService.cs | 66 +++++++++++-------- src/Helpers/FileSystemExtensions.cs | 16 ++++- 6 files changed, 87 insertions(+), 42 deletions(-) diff --git a/src/App_Plugins/UmbracoBookshelf/js/search.controller.js b/src/App_Plugins/UmbracoBookshelf/js/search.controller.js index 86fd40b..c1c3361 100644 --- a/src/App_Plugins/UmbracoBookshelf/js/search.controller.js +++ b/src/App_Plugins/UmbracoBookshelf/js/search.controller.js @@ -6,10 +6,13 @@ $scope.model.books = []; $scope.search = _.debounce(function() { - console.log('Calling server...'); - umbracoBookshelfResource.searchFiles($scope.model.keywords).then(function(data) { - console.log(data); - $scope.model.books = data; - }); - }, 500); + if ($scope.model.keywords) { + console.log('Calling server...' + $scope.model.keywords); + umbracoBookshelfResource.searchFiles($scope.model.keywords).then(function(data) { + console.log(data); + $scope.model.books = data; + }); + } + }, + 500); }); \ No newline at end of file diff --git a/src/App_Plugins/UmbracoBookshelf/views/navigation.html b/src/App_Plugins/UmbracoBookshelf/views/navigation.html index 9828127..2da3ad0 100644 --- a/src/App_Plugins/UmbracoBookshelf/views/navigation.html +++ b/src/App_Plugins/UmbracoBookshelf/views/navigation.html @@ -47,10 +47,12 @@
{{book.Name}}
  • {{result.Title}} +
    + {{result.HintUrl}} +
    • -
    diff --git a/src/Controllers/UmbracoBookshelfController.cs b/src/Controllers/UmbracoBookshelfController.cs index ed4dd6c..ef546ba 100644 --- a/src/Controllers/UmbracoBookshelfController.cs +++ b/src/Controllers/UmbracoBookshelfController.cs @@ -7,11 +7,13 @@ using System.IO; using System.Net; using System.Text.RegularExpressions; +using System.Web; using ICSharpCode.SharpZipLib.Core; using ICSharpCode.SharpZipLib.Zip; using Newtonsoft.Json.Linq; using Umbraco.Core; using Umbraco.Core.Logging; +using Umbraco.Core.Media; using UmbracoBookshelf.Examine; using UmbracoBookshelf.Models; using UmbracoBookshelf.Helpers; @@ -370,6 +372,8 @@ public object SearchFiles(string keywords) if (results.Any()) { + LogHelper.Info("Results=>" + results.Count()); + var books = results.GroupBy(x => x.Fields["book"]); foreach (var book in books) @@ -381,13 +385,26 @@ public object SearchFiles(string keywords) var resultsList = new List(); - foreach(var result in book) + foreach(var result in book.OrderByDescending(x => x.Score).Take(3)) { + var hintUrl = HttpUtility.UrlDecode(HttpUtility.UrlDecode(result.Fields["url"])); + var title = HttpUtility.UrlDecode(HttpUtility.UrlDecode(result.Fields["title"])); + + hintUrl = hintUrl.Substring(0, hintUrl.Length - title.Length - 1); + + var hintWindowLength = 50; + + if (hintUrl.Length - hintWindowLength > 0) + { + hintUrl = "…" + hintUrl.Substring(hintUrl.Length - hintWindowLength); + } + resultsList.Add(new BookResultModel.BookEntry() - { - Title = result.Fields["title"], - Url = result.Fields["url"] - }); + { + Title = title, + Url = result.Fields["url"], + HintUrl = hintUrl + }); } bookData.Results = resultsList; diff --git a/src/Examine/BookResultModel.cs b/src/Examine/BookResultModel.cs index 4f5cbe9..c011d64 100644 --- a/src/Examine/BookResultModel.cs +++ b/src/Examine/BookResultModel.cs @@ -11,6 +11,7 @@ public class BookEntry { public string Title { get; set; } public string Url { get; set; } + public string HintUrl { get; set; } } } } \ No newline at end of file diff --git a/src/Examine/BookshelfExamineDataService.cs b/src/Examine/BookshelfExamineDataService.cs index 89bd08c..f080340 100644 --- a/src/Examine/BookshelfExamineDataService.cs +++ b/src/Examine/BookshelfExamineDataService.cs @@ -1,7 +1,11 @@ using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Web; using Examine; using Examine.LuceneEngine; using Umbraco.Core.Logging; +using UmbracoBookshelf.Helpers; namespace UmbracoBookshelf.Examine { @@ -12,40 +16,48 @@ public IEnumerable GetAllData(string indexType) LogHelper.Info("Building the Bookshelf index..."); var data = new List(); + var count = 1; - data.Add(new SimpleDataSet() + foreach (var bookPath in _getBooksAsDirectories()) { - NodeDefinition = new IndexedNode() - { - Type = "Bookshelf", - NodeId = 1 - }, - RowData = new Dictionary() - { - {"book", "Learn Umbraco 7"}, - {"title", "Developer Tools"}, - {"text", "lorem ipsum"}, - {"url", "/umbraco/#/UmbracoBookshelf/UmbracoBookshelfTree/file/%252FBooks%252FLearnUmbraco7%252FChapter%25200%252F01%2520-%2520Developer%2520Tools.md"} - } - }); + LogHelper.Info("Processing Book... " + bookPath); - data.Add(new SimpleDataSet() - { - NodeDefinition = new IndexedNode() + foreach (var file in bookPath.GetFilesRecursively(false)) { - Type = "Bookshelf", - NodeId = 2 - }, - RowData = new Dictionary() - { - {"book", "Learn Umbraco 7"}, - {"title", "Orientation"}, - {"text", "foo bar"}, - {"url", "/umbraco/#/UmbracoBookshelf/UmbracoBookshelfTree/folder/%252FBooks%252FLearnUmbraco7%252FChapter%252002%2520-%2520Backoffice%2520Orientation"} + LogHelper.Info("Processing... " + file); + + var dataset = new SimpleDataSet() + { + NodeDefinition = new IndexedNode() + { + Type = "Bookshelf", + NodeId = count + } + }; + + dataset.RowData = new Dictionary() + { + {"book", Path.GetFileName(bookPath)}, + {"title", Path.GetFileNameWithoutExtension(file)}, + {"text", File.ReadAllText(file)}, + {"url", "/umbraco/#/UmbracoBookshelf/UmbracoBookshelfTree/file/" + file.ToWebPath().Replace("%2F", "%252F").Replace("%20F", "%2520F")} //total hack job here b/c of some sort of double encoding somewhere + }; + + data.Add(dataset); + count++; + + LogHelper.Info("Added=>" + Path.GetFileName(file)); } - }); + } return data; } + + private IEnumerable _getBooksAsDirectories() + { + var systemPath = Constants.ROOT_DIRECTORY.ToSystemPath(); + + return Directory.GetDirectories(systemPath).Where(x => !(x.EndsWith("TEMP"))); + } } } \ No newline at end of file diff --git a/src/Helpers/FileSystemExtensions.cs b/src/Helpers/FileSystemExtensions.cs index 344cacd..647c9f4 100644 --- a/src/Helpers/FileSystemExtensions.cs +++ b/src/Helpers/FileSystemExtensions.cs @@ -47,7 +47,7 @@ public static string ToWebPath(this string mappedPath, bool preserveSlashes = fa return path; } - public static IEnumerable GetFilesRecursively(this string startingDirectory) + public static IEnumerable GetFilesRecursively(this string startingDirectory, bool onlyImages = true) { var list = new List(); @@ -57,10 +57,20 @@ public static IEnumerable GetFilesRecursively(this string startingDirect { foreach (string file in Directory.GetFiles(dir)) { - if (Constants.ALLOWED_IMAGE_EXTENSIONS.Any(file.EndsWith)) + if (onlyImages) { - list.Add(file); + if(Constants.ALLOWED_IMAGE_EXTENSIONS.Any(file.EndsWith)) + { + list.Add(file); + } } + else + { + if (Constants.ALLOWED_FILE_EXTENSIONS.Any(file.EndsWith) || file.EndsWith(Constants.MARKDOWN_FILE_EXTENSION)) + { + list.Add(file); + } + } } GetFilesRecursively(dir); From 26e90b8cce24d7488508894d36be28a22101483a Mon Sep 17 00:00:00 2001 From: kgiszewski Date: Wed, 8 Jul 2015 10:21:06 -0400 Subject: [PATCH 05/33] Finish up the search/indexer --- .../UmbracoBookshelf/assets/images/loader.gif | Bin 0 -> 3208 bytes .../UmbracoBookshelf/js/search.controller.js | 16 +++++---- .../UmbracoBookshelf/views/navigation.html | 15 +++++++-- src/Controllers/UmbracoBookshelfController.cs | 21 +++++++----- src/Examine/BookResultModel.cs | 3 ++ src/Examine/BookshelfExamineDataService.cs | 16 ++++----- src/Examine/BookshelfSearcher.cs | 5 +-- src/Helpers/Constants.cs | 2 +- src/Helpers/FileSystemExtensions.cs | 31 +++--------------- src/UmbracoBookshelf.csproj | 1 + 10 files changed, 52 insertions(+), 58 deletions(-) create mode 100644 src/App_Plugins/UmbracoBookshelf/assets/images/loader.gif diff --git a/src/App_Plugins/UmbracoBookshelf/assets/images/loader.gif b/src/App_Plugins/UmbracoBookshelf/assets/images/loader.gif new file mode 100644 index 0000000000000000000000000000000000000000..3288d1035d70bb86517e2c233f1a904e41f06b29 GIT binary patch literal 3208 zcmc(iX;4#H9>pJdFE7h`I{IF)0|5<6L}(j=N}5%L009EB2nYfyF)E0PvIqo$u!IC; z4PgyY5|S9AEh38G)(9eq4TbH7_UHg@yWrlIJ$6smIADL7s^P;_O;ykRc9soXl`UC*LwQJXkii*0rx|*7rI2=x7WaRkx_~XZqFJ8R3c=2Kg zf@aSAv8+BJ8+^hyay>(QR@t*blbKzsf0}bscEqRc5Hd3o(-N5RyW=zWB*zQw6Zh>* z2CROCDAbu#D`)S|J_o(lL9Yn3l*+8RdiRD_>iNz$#_IAzCna&Wl5 zSF_(rRCDD!wi#i8oAm&jYtn2_@VB%2-H*G%bN#|(6R6N?wM)3u`PiGzwuX7qmTgyF zpE)h0kuoxQ9?=kW7Y!=R@DmhU9)vwT*EZWzJ zrt+=2tqFts72yIp?|gvdLhs8Hfku^Z(){gmN%Y=K#P|%fkvgUj~HfIp3CuXqCtYGtJ#me+n+-LmP( z*XNuk%!aH8bIE@_Bj46>M*dSro|7<6vZ7WUHh5YQzN$>IJFqCb|CT!wj~R2C2%=q{ zpt8rzY$aw?W?=Ustv{jo?Ow@ZRkLe<)NItY>Cyhle*wR59dTdF6(@{5^ zAQBOB*hNtc3bkY-8{Cm$nFS@elbTtSqrt7MB{h_4y+~`!mVa}?c&N>&?P}GqdMuhQ z&@TD5Czd((DcG_Su~dKKV)Pj$-qi1WHM8_vc^O4?^!oY|tmK~i!{fjd&@_1E(T~r7 z_REZy&hMT^ySJB3W7l$4YhR`M(J7S5S~+4Q&3HPa)z%zPpisOp$^ zTEe99ig2$5_qFr!$;7A6CJ}PJmRhli>w?LC}Y`#HLGy6 zMU4EhL~dKCN5Ut;U2jd*83ShBNiu zcJB0l9>1Modc?-oM<R4?}3g}UJ%@K);kriq>)e*rh%hdqM)5Q)*+O8 zXm;SEbs@koiYS!9YXIclSg+5m_s~yrW#kKMdiRszg(gCP5HPmP7L)vCf8@fxUh6qY z@Z#TmkjzAZX{rwE+q|K~F2v5{_@vt%>yT_a#fF03SFt{0RXvDAiaY~K9CgS1O>frXgAjBCS}mEd4mIWZ$=ovd5| zR?GRdU}d6+Q`+JRW)|=v7$)XNkn3yE`!nAiSCvOB1jKT zG<1aK3s<0b0m==egTD#8i(Of=1pGDTOCho0XpIOMQ&P87cVKY1W=C6kIg z9cH=@a&zbm2+`|{(_?YC9fdm?1TY~-pwlBn?>=(~1pDKbco6jloP;0-cqRiwV1A_S zEyV0Dj8Pwy!nekzaN>{)7rgZ&_QLxK{~1yRe865^yx>}+a!ECd>#MMwddow z@CU{l+Rt$xuXuf}?ga{3IAr?Raql^c@a%sI0U5m}HvJ5O1#I%_MMPt#BH>OqUZ{-k zt>4Xzz=%jT*FVW(uYkWyx}9Gw$HdN*qU?Bit#ji(Wi7p-u|_8?h^%szIS^s^fNM}b zgGy>|=cbEufpguY5_6w~&ZLv=Bo06UF9EYIY;Er-1VK)SyF&!|J{axiE1z^(hXwVq zsFS=K-#zC}CcOs^8W{KAt+kK)jYDgDYbCXv{{rwsgqtIU3<910$CJi)s?? z_t8k{>7*0~4l~LLF7$WXT5OSq5QCTbP_l!SN|{R}3D&eWA8~0ltWh1IL+ZBX4rRSt zWF6Om3WDMu4xK^1(BF`2cL}rUCzhHAB`@j5&R-yk_l*t;mPGY|u2^o|myvcOdrg0W z%=lX;f^Vkqfp?u7*4qQq%A3Mpf!xspWBSKS@O%r*TSM}?dl(@*%{0Jm_8;(h{R__M Bt 2) { + + $scope.isLoading = true; + umbracoBookshelfResource.searchFiles($scope.model.keywords).then(function(data) { - console.log(data); $scope.model.books = data; + $scope.isLoading = false; }); } - }, - 500); + } }); \ No newline at end of file diff --git a/src/App_Plugins/UmbracoBookshelf/views/navigation.html b/src/App_Plugins/UmbracoBookshelf/views/navigation.html index 2da3ad0..ba802ff 100644 --- a/src/App_Plugins/UmbracoBookshelf/views/navigation.html +++ b/src/App_Plugins/UmbracoBookshelf/views/navigation.html @@ -24,7 +24,7 @@ ng-model="model.keywords" class="umb-search-field search-query" placeholder="Type to search your books..." - ng-keydown="search()" /> + ng-keyup="search()" />
    @@ -38,6 +38,18 @@
    Bookshelf Search Results
    +
    + LOADING... +
    + + + - diff --git a/src/Controllers/UmbracoBookshelfController.cs b/src/Controllers/UmbracoBookshelfController.cs index ef546ba..bfa25f6 100644 --- a/src/Controllers/UmbracoBookshelfController.cs +++ b/src/Controllers/UmbracoBookshelfController.cs @@ -8,12 +8,12 @@ using System.Net; using System.Text.RegularExpressions; using System.Web; +using Examine; using ICSharpCode.SharpZipLib.Core; using ICSharpCode.SharpZipLib.Zip; using Newtonsoft.Json.Linq; using Umbraco.Core; using Umbraco.Core.Logging; -using Umbraco.Core.Media; using UmbracoBookshelf.Examine; using UmbracoBookshelf.Models; using UmbracoBookshelf.Helpers; @@ -310,6 +310,8 @@ public object DownloadUrl(string url) Directory.Delete(downloadsDirectory, true); + ExamineManager.Instance.IndexProviderCollection["BookshelfIndexer"].RebuildIndex(); + return new { Status = "Downloaded" @@ -353,7 +355,7 @@ public object GetImages(string currentPath) var systemPath = Path.GetDirectoryName(_ensureRootPath(currentPath).ToSystemPath()); //search for any media files - var imageFiles = systemPath.GetFilesRecursively(); + var imageFiles = systemPath.GetFilesRecursively(Constants.ALLOWED_IMAGE_EXTENSIONS); return imageFiles.Select(x => new ImageModel() { @@ -372,10 +374,10 @@ public object SearchFiles(string keywords) if (results.Any()) { - LogHelper.Info("Results=>" + results.Count()); - var books = results.GroupBy(x => x.Fields["book"]); + var resultsPerBook = 10; + foreach (var book in books) { var bookData = new BookResultModel() @@ -385,12 +387,12 @@ public object SearchFiles(string keywords) var resultsList = new List(); - foreach(var result in book.OrderByDescending(x => x.Score).Take(3)) + foreach(var result in book.OrderByDescending(x => x.Score).Take(resultsPerBook)) { var hintUrl = HttpUtility.UrlDecode(HttpUtility.UrlDecode(result.Fields["url"])); var title = HttpUtility.UrlDecode(HttpUtility.UrlDecode(result.Fields["title"])); - hintUrl = hintUrl.Substring(0, hintUrl.Length - title.Length - 1); + hintUrl = hintUrl.Substring(0, hintUrl.Length - title.Length - 3); var hintWindowLength = 50; @@ -403,8 +405,11 @@ public object SearchFiles(string keywords) { Title = title, Url = result.Fields["url"], - HintUrl = hintUrl + HintUrl = hintUrl, + Score = result.Score.ToString() }); + + bookData.TotalScore += result.Score; } bookData.Results = resultsList; @@ -412,7 +417,7 @@ public object SearchFiles(string keywords) } } - return data; + return data.OrderByDescending(x => x.TotalScore); } private void ExtractZipFile(string archiveFilenameIn, string outFolder, string password = "") diff --git a/src/Examine/BookResultModel.cs b/src/Examine/BookResultModel.cs index c011d64..63ffa70 100644 --- a/src/Examine/BookResultModel.cs +++ b/src/Examine/BookResultModel.cs @@ -7,11 +7,14 @@ public class BookResultModel public string Name { get; set; } public IEnumerable Results { get; set; } + public double TotalScore { get; set; } + public class BookEntry { public string Title { get; set; } public string Url { get; set; } public string HintUrl { get; set; } + public string Score { get; set; } } } } \ No newline at end of file diff --git a/src/Examine/BookshelfExamineDataService.cs b/src/Examine/BookshelfExamineDataService.cs index f080340..f953ead 100644 --- a/src/Examine/BookshelfExamineDataService.cs +++ b/src/Examine/BookshelfExamineDataService.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Web; using Examine; using Examine.LuceneEngine; using Umbraco.Core.Logging; @@ -12,20 +11,18 @@ namespace UmbracoBookshelf.Examine public class BookshelfExamineDataService : ISimpleDataService { public IEnumerable GetAllData(string indexType) - { - LogHelper.Info("Building the Bookshelf index..."); - + { var data = new List(); var count = 1; + LogHelper.Info("Building index..."); + foreach (var bookPath in _getBooksAsDirectories()) { - LogHelper.Info("Processing Book... " + bookPath); + var files = bookPath.GetFilesRecursively(Constants.ALLOWED_FILE_EXTENSIONS); - foreach (var file in bookPath.GetFilesRecursively(false)) + foreach (var file in files) { - LogHelper.Info("Processing... " + file); - var dataset = new SimpleDataSet() { NodeDefinition = new IndexedNode() @@ -38,6 +35,7 @@ public IEnumerable GetAllData(string indexType) dataset.RowData = new Dictionary() { {"book", Path.GetFileName(bookPath)}, + {"path", bookPath.ToWebPath()}, {"title", Path.GetFileNameWithoutExtension(file)}, {"text", File.ReadAllText(file)}, {"url", "/umbraco/#/UmbracoBookshelf/UmbracoBookshelfTree/file/" + file.ToWebPath().Replace("%2F", "%252F").Replace("%20F", "%2520F")} //total hack job here b/c of some sort of double encoding somewhere @@ -45,8 +43,6 @@ public IEnumerable GetAllData(string indexType) data.Add(dataset); count++; - - LogHelper.Info("Added=>" + Path.GetFileName(file)); } } diff --git a/src/Examine/BookshelfSearcher.cs b/src/Examine/BookshelfSearcher.cs index f0199b2..656993e 100644 --- a/src/Examine/BookshelfSearcher.cs +++ b/src/Examine/BookshelfSearcher.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using Examine; -using Umbraco.Core.Logging; namespace UmbracoBookshelf.Examine { @@ -19,10 +18,8 @@ public static ISearchResults Search(string keywords) foreach (var word in words) { - var contentRawQuery = string.Format("(+__IndexType:bookshelf && (title: {0}~{1} book: {0}~{1} text: {0}~{1}))", word, 0.5); + var contentRawQuery = string.Format("(+__IndexType:bookshelf && (title: {0}~{1} path: {0}~{1} book: {0}~{1} text: {0}~{1}))", word, 0.5); rawQueries.Add(contentRawQuery); - - LogHelper.Info(contentRawQuery); } } diff --git a/src/Helpers/Constants.cs b/src/Helpers/Constants.cs index 7bfd9fe..20a5659 100644 --- a/src/Helpers/Constants.cs +++ b/src/Helpers/Constants.cs @@ -13,7 +13,7 @@ public class Constants public const string MARKDOWN_FILE_EXTENSION = ".md"; public static List ALLOWED_FILE_EXTENSIONS = - new List() { ".pdf", ".doc", ".docx", ".xls", ".xlsx", ".csv"}; + new List() { ".pdf", ".doc", ".docx", ".xls", ".xlsx", ".csv", ".md"}; public static List ALLOWED_IMAGE_EXTENSIONS = new List() { ".jpg", ".png", ".gif" }; diff --git a/src/Helpers/FileSystemExtensions.cs b/src/Helpers/FileSystemExtensions.cs index 647c9f4..4b4d184 100644 --- a/src/Helpers/FileSystemExtensions.cs +++ b/src/Helpers/FileSystemExtensions.cs @@ -47,41 +47,18 @@ public static string ToWebPath(this string mappedPath, bool preserveSlashes = fa return path; } - public static IEnumerable GetFilesRecursively(this string startingDirectory, bool onlyImages = true) + public static IEnumerable GetFilesRecursively(this string directory, IEnumerable extensions) { - var list = new List(); - try { - foreach (string dir in Directory.GetDirectories(startingDirectory)) - { - foreach (string file in Directory.GetFiles(dir)) - { - if (onlyImages) - { - if(Constants.ALLOWED_IMAGE_EXTENSIONS.Any(file.EndsWith)) - { - list.Add(file); - } - } - else - { - if (Constants.ALLOWED_FILE_EXTENSIONS.Any(file.EndsWith) || file.EndsWith(Constants.MARKDOWN_FILE_EXTENSION)) - { - list.Add(file); - } - } - } - - GetFilesRecursively(dir); - } + return Directory.GetFiles(directory, "*.*", SearchOption.AllDirectories).Where(x => extensions.Any(x.EndsWith)); } catch (Exception ex) { LogHelper.Error(ex.Message, ex); - } - return list; + return new List(); + } } } } \ No newline at end of file diff --git a/src/UmbracoBookshelf.csproj b/src/UmbracoBookshelf.csproj index b3d05d1..df0101f 100644 --- a/src/UmbracoBookshelf.csproj +++ b/src/UmbracoBookshelf.csproj @@ -222,6 +222,7 @@ + From 0729eedfee26c6b17d8d123c75fc50f66e29817d Mon Sep 17 00:00:00 2001 From: kgiszewski Date: Wed, 8 Jul 2015 12:36:48 -0400 Subject: [PATCH 06/33] Install PackageActions, cleanup hotkey, cleanup css --- .../backoffice/UmbracoBookshelfTree/file.html | 2 +- .../UmbracoBookshelf/js/directives.js | 17 ----- .../UmbracoBookshelf/js/search.controller.js | 4 + .../UmbracoBookshelf/views/navigation.html | 22 +++--- src/Assets/less/application.less | 23 ++++++ src/Events/PackageActions.cs | 76 ++++++++++++++++++- src/Examine/BookshelfSearcher.cs | 2 +- 7 files changed, 111 insertions(+), 35 deletions(-) diff --git a/src/App_Plugins/UmbracoBookshelf/backoffice/UmbracoBookshelfTree/file.html b/src/App_Plugins/UmbracoBookshelf/backoffice/UmbracoBookshelfTree/file.html index e485fe8..314cb1b 100644 --- a/src/App_Plugins/UmbracoBookshelf/backoffice/UmbracoBookshelfTree/file.html +++ b/src/App_Plugins/UmbracoBookshelf/backoffice/UmbracoBookshelfTree/file.html @@ -26,7 +26,7 @@

    {{model.filePath}}

    - +
    diff --git a/src/App_Plugins/UmbracoBookshelf/js/directives.js b/src/App_Plugins/UmbracoBookshelf/js/directives.js index 5ae78e3..5aedb87 100644 --- a/src/App_Plugins/UmbracoBookshelf/js/directives.js +++ b/src/App_Plugins/UmbracoBookshelf/js/directives.js @@ -118,23 +118,6 @@ restrict: "A", link: linker } -}).directive('umbracoBookshelfCtrlS', function() { - - var linker = function(scope, element, attrs) { - $(document).keydown(function(e) { - if ((e.which == '115' || e.which == '83') && (e.ctrlKey || e.metaKey)) { - e.preventDefault(); - scope.save(); - return false; - } - return true; - }); - } - - return { - restrict: "E", - link: linker - } }).directive('autoGrow', function ($timeout) { var insertAtCaret = function (element, text) { diff --git a/src/App_Plugins/UmbracoBookshelf/js/search.controller.js b/src/App_Plugins/UmbracoBookshelf/js/search.controller.js index 1b40554..1db0bfe 100644 --- a/src/App_Plugins/UmbracoBookshelf/js/search.controller.js +++ b/src/App_Plugins/UmbracoBookshelf/js/search.controller.js @@ -19,4 +19,8 @@ }); } } + + $scope.clear = function() { + $scope.model.keywords = ""; + } }); \ No newline at end of file diff --git a/src/App_Plugins/UmbracoBookshelf/views/navigation.html b/src/App_Plugins/UmbracoBookshelf/views/navigation.html index ba802ff..229e7cb 100644 --- a/src/App_Plugins/UmbracoBookshelf/views/navigation.html +++ b/src/App_Plugins/UmbracoBookshelf/views/navigation.html @@ -5,7 +5,7 @@ -