Merge pull request #98 from KevinMidboe/strayParser_fix

Updated when parsing for show name allow names with numbers.

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "torrent_search"]
 	path = torrent_search
-	url = git@github.com:KevinMidboe/torrent_search.git
+	url = https://github.com/KevinMidboe/torrent_search.git

.travis.yml

@@ -1,9 +1,10 @@
 language: node_js
 node_js: '8.7.0'
 git:
-   submodules: false
+   submodules: true
 script:
-   yarn test
+   - yarn test
+   - yarn coverage 
 before_install:
    - cd seasoned_api
 before_script: yarn

README.md

@@ -1,9 +1,12 @@
 # 🌶 seasonedShows
 [![Build Status](https://travis-ci.org/KevinMidboe/seasonedShows.svg?branch=master)](https://travis-ci.org/KevinMidboe/seasonedShows)
+[![Coverage Status](https://coveralls.io/repos/github/KevinMidboe/seasonedShows/badge.svg?branch=coverage)](https://coveralls.io/github/KevinMidboe/seasonedShows?branch=coverage)
+[![Dependency Status](https://www.versioneye.com/user/projects/5ac541370fb24f4489396e02/badge.svg)](https://www.versioneye.com/user/projects/5ac541370fb24f4489396e02)
 [![Known Vulnerabilities](https://snyk.io/test/github/KevinMidboe/seasonedShows/badge.svg?targetFile=seasoned_api/package.json)](https://snyk.io/test/github/KevinMidboe/seasonedShows?targetFile=seasoned_api/package.json)
-[![DUB](https://img.shields.io/dub/l/vibe-d.svg)]()
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
-Your customly *seasoned* movie and show requester, downloader and organizer. Demo page can be viewed [here](https://kevinmidboe.com/request)
+Your customly *seasoned* movie and show requester, downloader and organizer.  
+📺 [Demo](https://kevinmidboe.com/request)
 
 ## About
 The goal of this project is to create a full custom stack that can to everything surround downloading, organizing and notifiyng of new media. From the top down we have a website using [tmdb](https://www.themoviedb.com) api to search for from over 350k movies and 70k tv shows. Using [hjone72](https://github.com/hjone72/PlexAuth) great PHP reverse proxy we can have a secure way of allowing users to login with their plex credentials which limits request capabilites to only users that are authenticated to use your plex library. 

app/classedStray.py

@@ -61,7 +61,7 @@ class strayEpisode(object):
 		return hashlib.md5("b'{}'".format(self.parent).encode()).hexdigest()[:8]
 
 	def findSeriesName(self):
-		find = re.compile("^[a-zA-Z. ]*")
+		find = re.compile("^[a-zA-Z0-9. ]*")
 		m = re.match(find, self.parent)
 		if m:
 			name, hit = process.extractOne(m.group(0), getShowNames().keys())

seasoned_api/package.json

@@ -1,38 +1,42 @@
 {
-    "name": "seasoned-api",
-    "main": "webserver/server.js",
-    "scripts": {
-        "start": "cross-env SEASONED_CONFIG=conf/development.json NODE_PATH=. node src/webserver/server.js",
-        "test": "cross-env SEASONED_CONFIG=conf/test.json NODE_PATH=. mocha --recursive test",
-        "coverage": "cross-env SEASONED_CONFIG=conf/test.json NODE_PATH=. istanbul cover -x script/autogenerate-documentation.js --include-all-sources --dir test/.coverage node_modules/mocha/bin/_mocha --recursive test/**/* -- --report lcovonly && cat test/.coverage/lcov.info | coveralls && rm -rf test/.coverage",
-        "lint": "./node_modules/.bin/eslint src/"
-    },
-    "dependencies": {
-        "bcrypt-nodejs": "^0.0.3",
-        "blanket": "^1.2.3",
-        "body-parser": "~1.0.1",
-        "codecov": "^3.0.0",
-        "cross-env": "^3.1.3",
-        "express": "~4.11.0",
-        "jsonwebtoken": "^8.0.1",
-        "mocha-lcov-reporter": "^1.3.0",
-        "mongoose": "^3.6.13",
-        "moviedb": "^0.2.10",
-        "node-cache": "^4.1.1",
-        "nodemailer": "^4.0.1",
-        "python-shell": "^0.4.0",
-        "raven": "^2.2.1",
-        "request": "^2.81.0",
-        "request-promise": "^4.2",
-        "sqlite3": "3.1.13"
-    },
-    "devDependencies": {
-        "eslint": "^4.9.0",
-        "eslint-config-airbnb-base": "^12.1.0",
-        "eslint-plugin-import": "^2.8.0",
-        "istanbul": "^0.4.5",
-        "mocha": "^5.0.4",
-        "supertest": "^2.0.1",
-        "supertest-as-promised": "^4.0.1"
-    }
+  "name": "seasoned-api",
+  "description": "Packages needed to build and commands to run seasoned api node server.",
+  "license": {
+    "type": "MIT",
+    "url": "https://www.opensource.org/licenses/mit-license.php"
+  },
+  "main": "webserver/server.js",
+  "scripts": {
+    "start": "cross-env SEASONED_CONFIG=conf/development.json NODE_PATH=. node src/webserver/server.js",
+    "test": "cross-env SEASONED_CONFIG=conf/test.json NODE_PATH=. mocha --recursive test",
+    "coverage": "cross-env SEASONED_CONFIG=conf/test.json NODE_PATH=. nyc mocha --recursive test && nyc report --reporter=text-lcov | coveralls",
+    "lint": "./node_modules/.bin/eslint src/"
+  },
+  "dependencies": {
+    "bcrypt-nodejs": "^0.0.3",
+    "body-parser": "~1.18.2",
+    "cross-env": "~5.1.4",
+    "express": "~4.16.0",
+    "jsonwebtoken": "^8.0.1",
+    "mongoose": "~5.0.11",
+    "moviedb": "^0.2.10",
+    "node-cache": "^4.1.1",
+    "python-shell": "^0.5.0",
+    "request": "^2.85.0",
+    "request-promise": "^4.2",
+    "sqlite3": "4.0.0"
+  },
+  "devDependencies": {
+    "coveralls": "^3.0.0",
+    "eslint": "^4.9.0",
+    "eslint-config-airbnb-base": "^12.1.0",
+    "eslint-plugin-import": "^2.8.0",
+    "istanbul": "^0.4.5",
+    "mocha": "^5.0.4",
+    "mocha-lcov-reporter": "^1.3.0",
+    "nyc": "^11.6.0",
+    "raven": "^2.4.2",
+    "supertest": "^3.0.0",
+    "supertest-as-promised": "^4.0.1"
+  }
 }

seasoned_api/src/plex/requestRepository.js

@@ -8,21 +8,17 @@ const plexRepository = new PlexRepository();
 const cache = new Cache();
 const tmdb = new TMDB(cache, configuration.get('tmdb', 'apiKey'));
 
-const MailTemplate = require('src/plex/mailTemplate');
-const nodemailer = require('nodemailer');
-
-
 class RequestRepository {
-   constructor(cache, database) {
+   constructor(database) {
       this.database = database || establishedDatabase;
       this.queries = {
          insertRequest: `INSERT INTO requests(id,title,year,poster_path,background_path,requested_by,ip,user_agent,type)
           VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
          fetchRequestedItems: 'SELECT * FROM requests ORDER BY date DESC LIMIT 25 OFFSET ?*25-25',
-         fetchRequestedItemsByStatus: 'SELECT * FROM requests WHERE status IS ? AND type LIKE ? DESC LIMIT 25 OFFSET ?*25-25',
+         fetchRequestedItemsByStatus: 'SELECT * FROM requests WHERE status IS ? AND type LIKE ? ORDER BY date DESC LIMIT 25 OFFSET ?*25-25',
          updateRequestedById: 'UPDATE requests SET status = ? WHERE id is ? AND type is ?',
          checkIfIdRequested: 'SELECT * FROM requests WHERE id IS ? AND type IS ?',
-         userRequests: 'SELECT * FROM requests WHERE requested_by IS ?'
+         userRequests: 'SELECT * FROM requests WHERE requested_by IS ?',
       };
       this.cacheTags = {
          search: 'se',
@@ -51,10 +47,7 @@ class RequestRepository {
          .then(() => this.database.get(this.queries.checkIfIdRequested, [tmdbMovie.id, tmdbMovie.type]))
          .then((result, error) => {
             if (error) { throw new Error(error); }
-            let already_requested = false;
-            if (result) { already_requested = true; }
-
-            tmdbMovie.requested = already_requested;
+            tmdbMovie.requested = result ? true : false;
             return tmdbMovie;
          });
    }
@@ -85,13 +78,15 @@ class RequestRepository {
    }
 
    userRequests(user) {
-   	return Promise.resolve()
+      return Promise.resolve()
          .then(() => this.database.all(this.queries.userRequests, user.username))
          .catch((error) => {
-            if (String(error).includes('no such column')) { throw new Error('Username not found'); }
-            else { throw new Error('Unable to fetch your requests')}
+            if (String(error).includes('no such column')) {
+               throw new Error('Username not found');
+            }
+            throw new Error('Unable to fetch your requests');
          })
-         .then((result) => { return result })
+         .then((result) => { return result; });
    }
 
    updateRequestedById(id, type, status) {