From 34e03625474445b8829a96f9a83a9f65ead2d81c Mon Sep 17 00:00:00 2001 From: Martin Purcell Date: Sun, 20 Aug 2017 22:07:09 +0100 Subject: [PATCH] Updated AngularJS, fixed a typo --- app/manifest.json | 6 ++++- app/views/layouts/classic.html | 13 +++++----- app/views/show/settings.html | 2 +- config.codekit3 | 24 ------------------- package.json | 2 +- .../local_modules/nodetv-helpers/lib/utils.js | 5 ++++ server/models/schema/show.js | 1 + 7 files changed, 20 insertions(+), 33 deletions(-) diff --git a/app/manifest.json b/app/manifest.json index cda7a7b..87ce635 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,4 +1,8 @@ { "name": "NodeTV", - "description": "Media library Manager" + "short_name": "NodeTV", + "description": "Media library Manager", + + "display": "minimal-ui", + "theme_color": "#101010" } \ No newline at end of file diff --git a/app/views/layouts/classic.html b/app/views/layouts/classic.html index f82ff23..df8e7ab 100644 --- a/app/views/layouts/classic.html +++ b/app/views/layouts/classic.html @@ -7,6 +7,7 @@ + @@ -39,12 +40,12 @@ - - - - - - + + + + + + diff --git a/app/views/show/settings.html b/app/views/show/settings.html index 6035ebe..c69aed9 100644 --- a/app/views/show/settings.html +++ b/app/views/show/settings.html @@ -54,7 +54,7 @@
- +
diff --git a/config.codekit3 b/config.codekit3 index 0d803fc..87ccff2 100644 --- a/config.codekit3 +++ b/config.codekit3 @@ -339,18 +339,6 @@ "oAP": "\/app\/views\/components\/alerts.html", "oF": 0 }, - "\/app\/views\/components\/artwork.html": { - "ft": 8192, - "oA": 2, - "oAP": "\/app\/views\/components\/artwork.html", - "oF": 0 - }, - "\/app\/views\/components\/banner.html": { - "ft": 8192, - "oA": 2, - "oAP": "\/app\/views\/components\/banner.html", - "oF": 0 - }, "\/app\/views\/components\/breadcrumbs.html": { "ft": 8192, "oA": 2, @@ -375,12 +363,6 @@ "oAP": "\/app\/views\/components\/navigation.html", "oF": 0 }, - "\/app\/views\/components\/poster.html": { - "ft": 8192, - "oA": 2, - "oAP": "\/app\/views\/components\/poster.html", - "oF": 0 - }, "\/app\/views\/components\/search.html": { "ft": 8192, "oA": 2, @@ -405,12 +387,6 @@ "oAP": "\/app\/views\/layouts\/classic.html", "oF": 1 }, - "\/app\/views\/layouts\/modern.html": { - "ft": 8192, - "oA": 2, - "oAP": "\/app\/views\/layouts\/modern.html", - "oF": 0 - }, "\/app\/views\/movie\/movie.html": { "ft": 8192, "oA": 2, diff --git a/package.json b/package.json index 9620169..1bf83b0 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "passport-trakt": "^1.0.4", "request": "^2.81.0", "request-promise": "^4.2.1", - "rss-parser": "^2.10.1", + "rss-parser": "^2.10.2", "sharp": "^0.18.2", "socket.io": "^2.0.3", "syserrno": "^1.0.1", diff --git a/server/local_modules/nodetv-helpers/lib/utils.js b/server/local_modules/nodetv-helpers/lib/utils.js index d997267..946dfee 100644 --- a/server/local_modules/nodetv-helpers/lib/utils.js +++ b/server/local_modules/nodetv-helpers/lib/utils.js @@ -51,8 +51,13 @@ exports.isHD = (filename)=>{ exports.isRepack = (filename)=>{ return filename.match(/final|proper|repack|rerip/i) ? true : false } +exports.isProper = (filename)=>{ + return filename.match(/proper/i) ? true : false +} exports.getInfoHash = (item)=>{ + // tv:info_hash namespace? + if (item.link.match(/btih\:([\w]{32,40})/i)){ // ShowRSS let match = item.link.match(/btih\:([\w]{32,40})/i) diff --git a/server/models/schema/show.js b/server/models/schema/show.js index eb55818..1e5bef8 100644 --- a/server/models/schema/show.js +++ b/server/models/schema/show.js @@ -215,6 +215,7 @@ showSchema.methods.parseFeed = function(){ linked: result.episodes, quality: helpers.utils.getQuality(entry.title), repack: helpers.utils.isRepack(entry.title), + proper: helpers.utils.isProper(entry.title), added: new Date(entry.pubDate) }) })