From 405a7b740a7b1bbda69d149acb04b7bc1195167b Mon Sep 17 00:00:00 2001 From: q-- Date: Sun, 12 Nov 2017 00:05:55 +0100 Subject: [PATCH] Add Word and Excel detection (#1818) * Add new FrontPage pattern and remove too broad one The removed rule would match all MS Office generated web pages (such as those generated by Word and Excel), not just FrontPage. * Add Microsoft Word * Add Microsoft Excel --- src/apps.json | 28 ++++++++++++++++++++++++++-- src/icons/Microsoft Excel.svg | 22 ++++++++++++++++++++++ src/icons/Microsoft Word.svg | 19 +++++++++++++++++++ 3 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 src/icons/Microsoft Excel.svg create mode 100644 src/icons/Microsoft Word.svg diff --git a/src/apps.json b/src/apps.json index 7c448c279..dd8c6674f 100644 --- a/src/apps.json +++ b/src/apps.json @@ -2854,10 +2854,10 @@ "cats": [ "20" ], - "html": "]+urn:schemas-microsoft-com:office:office", "icon": "FrontPage.png", "meta": { - "generator": "Microsoft FrontPage(?:\\s((?:Express )?[\\d.]+))?\\;version:\\1" + "generator": "Microsoft FrontPage(?:\\s((?:Express )?[\\d.]+))?\\;version:\\1", + "ProgId": "^FrontPage\\." }, "website": "http://office.microsoft.com/frontpage" }, @@ -5229,6 +5229,18 @@ "icon": "Microsoft.svg", "website": "http://microsoft.com" }, + "Microsoft Excel": { + "cats": [ + "20" + ], + "icon": "Microsoft Excel.svg", + "html": "(?:]*xmlns:w=\"urn:schemas-microsoft-com:office:excel\"||
]*x:publishsource=\"?Excel\"?)", + "meta": { + "generator": "Microsoft Excel( [\\d.]+)?\\;version:\\1", + "ProgId": "^Excel\\." + }, + "website": "https://office.microsoft.com/excel" + }, "Microsoft SharePoint": { "cats": [ "1" @@ -5246,6 +5258,18 @@ }, "website": "http://sharepoint.microsoft.com" }, + "Microsoft Word": { + "cats": [ + "20" + ], + "icon": "Microsoft Word.svg", + "html": "(?:]*xmlns:w=\"urn:schemas-microsoft-com:office:word\"||
]*class=\"?WordSection1[\" >]|]*>[^>]*@page WordSection1)", + "meta": { + "generator": "Microsoft Word( [\\d.]+)?\\;version:\\1", + "ProgId": "^Word\\." + }, + "website": "https://office.microsoft.com/word" + }, "Mietshop": { "cats": [ "6" diff --git a/src/icons/Microsoft Excel.svg b/src/icons/Microsoft Excel.svg new file mode 100644 index 000000000..9c912bb4e --- /dev/null +++ b/src/icons/Microsoft Excel.svg @@ -0,0 +1,22 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/Microsoft Word.svg b/src/icons/Microsoft Word.svg new file mode 100644 index 000000000..626051757 --- /dev/null +++ b/src/icons/Microsoft Word.svg @@ -0,0 +1,19 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + \ No newline at end of file