Merge pull request #106 from KevinMidboe/remove_verified

Remove verified

.gitmodules

@@ -1,3 +1,6 @@
+# Docs : https://git-scm.com/book/en/v2/Git-Tools-Submodules
+
 [submodule "torrent_search"]
 	path = torrent_search
 	url = https://github.com/KevinMidboe/torrent_search.git
+	branch = master

README.md

@@ -1,14 +1,133 @@
-# 🌶 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)
-[![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](https://kevinmidboe.com/request)
+<h1 align="center">
+  🌶 seasonedShows
+</h1>
+
+<h4 align="center"> Season your media library with the shows and movies that you and your friends want.</h4>
+
+<p align="center">
+  <a href="https://travis-ci.org/KevinMidboe/seasonedShows">
+    <img src="https://travis-ci.org/KevinMidboe/seasonedShows.svg?branch=master"
+         alt="Travis CI">
+  </a>
+  <a href="https://coveralls.io/github/KevinMidboe/seasonedShows?branch=coverage">
+    <img src="https://coveralls.io/repos/github/KevinMidboe/seasonedShows/badge.svg?branch=coverage" alt="">
+  </a>
+  <a href="https://www.versioneye.com/user/projects/5ac541370fb24f4489396e02">
+    <img src="https://www.versioneye.com/user/projects/5ac541370fb24f4489396e02/badge.svg" alt="">
+  </a>
+  <a href="https://snyk.io/test/github/KevinMidboe/seasonedShows?targetFile=seasoned_api/package.json">
+    <img src="https://snyk.io/test/github/KevinMidboe/seasonedShows/badge.svg?targetFile=seasoned_api/package.json" alt="">
+  </a>
+  <a href="https://opensource.org/licenses/MIT">
+    <img src="https://img.shields.io/badge/License-MIT-yellow.svg" alt="">
+  </a>
+</p>
+
+<p align="center">
+  <a href="#demo-documentation">D & D</a> •
+  <a href="#about">About</a> •
+  <a href="#key-features">Key features</a> •
+  <a href="#installation">Installation</a> •
+  <a href="#setup">Setup</a> •
+  <a href="#running">Running</a> •
+  <a href="#daemon">Setup daemon</a> •
+  <a href="#contributing">Contributing</a>
+</p>
+
+## <a name="demo-documentation"></a> Demo & Documentation
+📺 [DEMO](https://kevinmidboe.com/request)  
+📝 Documentation of the api.  
+💖 Checkout my [fancy vue.js page](https://github.com/KevinMidboe/seasonedRequest) for interfacing the api.  
+
+## <a name="about"></a> About
+This is the backend api for [seasoned request] that allows for uesrs to request movies and shows by fetching movies from themoviedb api and checks them with your plex library to identify if a movie is already present or not. This api allows to search my query, get themoviedb movie lists like popular and now playing, all while checking if the item is already in your plex library. Your friends can create users to see what movies or shows they have requested and searched for.   
+
+The api also uses torrent_search to search for matching torrents and returns results from any site or service available from torrent_search. As a admin of the site you can query torrent_search and return a magnet link that can be added to a autoadd folder of your favorite torrent client. 
+
+## <a name="key-features"></a> Key features
+### Code
+ - Uses [tmdb api](https://www.themoviedb.org/documentation/api) with over 350k movies and 70k tv shows
+ - Written asynchronously
+ - Uses caching for external requests
+ - Test coverage
+ - CI and dependency integrated
+ - Use either config file or env_variables
+### Functionality
+ - Queries plex library to check if items exists
+ - Create admin and normal user accounts
+ - [torrent_search](https://github.com/KevinMidboe/torrent_search) to search for torrents
+ - Fetch curated lists from tmdb
+
+## <a name="installation"></a> Installation
+Before we can use seasonedShows we need to download node and a package manager. For instructions on how to install [yarn](https://yarnpkg.com/en/) or [npm](https://www.npmjs.com) package managers refer to [wiki: install package manager](https://github.com/KevinMidboe/seasonedShows/wiki/Install-package-manager). This api is written with express using node.js as the JavaScript runtime engine. To download node.js head over the the official [node.js download page](https://nodejs.org/en/download/).
+
+### Install seasonedShows
+After you have downloaded a package manager and node.js javascript engine, the following will guide you through how to download, install and run seasonedShows.
+
+### macOS
+- Open terminal
+- Install git. This can be done by running `xcode-select --install` in your favorite terminal.
+- Install a package manager, refer to this [wiki page] for yarn or [wiki page] for npm
+- Type: `git clone https://github.com/KevinMidboe/seasonedShows.git`
+- Type: `cd seasonedShows/`
+- Install required packages
+   * yarn: `yarn install`
+   * npm: `npm install`
+- Start server:
+   * yarn: `yarn start`
+   * npm: `npm run start`
+- seasonedShows will now be running at http://localhost:31459
+- To have seasonedShows run headless on startup, check out this wiki page to [install as a daemon].
+
+### Linux
+- Open terminal
+- Install git
+   * Ubuntu/Debian: `sudo apt-get install git-core`
+   * Fedora: `sudo yum install git`
+- Type: `git clone https://github.com/KevinMidboe/seasonedShows.git`
+- Type: `cd seasonedShows/`
+- Install required packages
+   * yarn: `yarn install`
+   * npm: `npm install`
+- Start server:
+   * yarn: `yarn start`
+   * npm: `npm run start`
+- seasonedShows will now be running at http://localhost:31459
+- To have seasonedShows run headless on startup, check out this wiki page to [install as a daemon].
+
+-- same --
+(install yarn or npm in a different way)
+After you have installed the required packages you will have a node_modules directory with all the packages required in packages.json.
+
+### Requirements
+ - Node 7.6 < [wiki page]
+ - Plex library
+
+## <a name="setup"></a> Setup and/ configuration
+There is a config file template, what the values mean and how to change them. 
+Also show how to hide file from git if not want to show up as uncommitted file. 
+Also set variables in environment.
+
+## <a name="running"></a> Running/using
+yarn/npm start. (can also say this above)
+How to create service on linux. This means that 
+
+## <a name="daemon"></a> Setup a daemon
+The next step is to setup seasonedShows api to run in the background as a daemon. I have written a [wiki page](https://github.com/KevinMidboe/seasonedShows/wiki/Install-as-a-daemon) on how to create a daemon on several unix distors and macOS.  
+*Please don't hesitate to add your own system if you get it running on something that is not yet lists on the formentioned wiki page.*
+
+## <a name="contributing"></a> Contributing
+- Fork it!
+- Create your feature branch: git checkout -b my-new-feature
+- Commit your changes: git commit -am 'Add some feature'
+- Push to the branch: git push origin my-new-feature
+- Submit a pull request
+
+
+## Api documentation
+
 
-## 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. 
 seasonedShows is a intelligent organizer for your tv show episodes. It is made to automate and simplify to process of renaming and moving newly downloaded tv show episodes following Plex file naming and placement. 
 

app/classedStray.py

@@ -3,7 +3,7 @@
 # @Author: KevinMidboe
 # @Date:   2017-04-05 18:40:11
 # @Last Modified by:   KevinMidboe
-# @Last Modified time: 2017-06-18 21:49:33
+# @Last Modified time: 2018-04-03 22:58:20
 import os.path, hashlib, time, glob, sqlite3, re, json, tweepy
 import logging
 from functools import reduce
@@ -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())
@@ -188,6 +188,9 @@ def XOR(list1, list2):
 	return set(list1) ^ set(list2)
 
 def filterChildItems(parent):
+	if (not os.path.isdir(parent)):
+		strayEpisode(parent[:-4], parent)
+		return
 	try:
 		children = getDirContent('/'.join([env.input_dir, parent]))
 		if children:

app/moveSeasoned.py

@@ -3,13 +3,15 @@
 # @Author: KevinMidboe
 # @Date:   2017-04-12 23:27:51
 # @Last Modified by:   KevinMidboe
-# @Last Modified time: 2017-06-27 15:58:09
+# @Last Modified time: 2018-05-13 19:17:17
 
 import sys, sqlite3, json, os.path
 import logging
 import env_variables as env
 import shutil
 
+import delugeClient.deluge_cli as delugeCli
+
 class episode(object):
 	def __init__(self, id):
 		self.id = id
@@ -91,8 +93,18 @@ def moveStray(strayId):
 	except FileNotFoundError:
 		logging.warning('Cannot remove ' + ep.typeDir('parent_input') + ', file no longer exists.')
 
+	# Remove from deluge client
+	logging.info('Removing {} for deluge'.format(ep.parent))
+	deluge = delugeCli.Deluge()
+	response = deluge.remove(ep.parent)
+	logging.info('Deluge response after delete: {}'.format(response))
+
+
+
 if __name__ == '__main__':
-	if (os.path.exists(env.logfile)):
+	abspath = os.path.abspath(__file__)
+	dname = os.path.dirname(abspath)
+	if (os.path.exists(os.path.join(dname, env.logfile))):
 		logging.basicConfig(filename=env.logfile, level=logging.INFO)
 	else:
 		print('Logfile could not be found at ' + env.logfile + '. Verifiy presence or disable logging in config.')

seasoned_api/.eslintrc.json

@@ -7,6 +7,8 @@
 	"prefer-destructuring": 0,
 	"camelcase": 0,
 	"import/no-unresolved": 0,
-	"import/no-extraneous-dependencies": 0
+	"import/no-extraneous-dependencies": 0,
+	"object-shorthand": 0,
+	"comma-dangle": 0
     }
 }

seasoned_api/package.json

@@ -7,10 +7,11 @@
   },
   "main": "webserver/server.js",
   "scripts": {
-    "start": "cross-env SEASONED_CONFIG=conf/development.json NODE_PATH=. node src/webserver/server.js",
+    "start": "cross-env SEASONED_CONFIG=conf/development.json PROD=true 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/"
+    "lint": "./node_modules/.bin/eslint src/",
+    "update": "cross-env SEASONED_CONFIG=conf/development.json NODE_PATH=. node src/plex/updateRequestsInPlex.js"
   },
   "dependencies": {
     "bcrypt-nodejs": "^0.0.3",

seasoned_api/src/plex/plexRepository.js

@@ -15,6 +15,7 @@ class PlexRepository {
    }
 
    search(query) {
+      console.log('searching:', query)
       const options = {
          uri: `http://10.0.0.44:32400/search?query=${query}`,
          headers: {
@@ -39,7 +40,8 @@ class PlexRepository {
             } 
             else {
                plexResult.results.map((plexItem) => {
-                  if (tmdb.title === plexItem.title && tmdb.year === plexItem.year) { tmdb.matchedInPlex = true; }
+                  if (tmdb.title === plexItem.title && tmdb.year === plexItem.year)
+                     tmdb.matchedInPlex = true;
                   return tmdb;
                });
             }
@@ -50,6 +52,7 @@ class PlexRepository {
    mapResults(response) {
       return Promise.resolve()
          .then(() => {
+            console.log('plexResponse:', response)
             if (!response.MediaContainer.hasOwnProperty('Metadata')) return [[], 0];
 
             const mappedResults = response.MediaContainer.Metadata.filter((element) => {
@@ -72,7 +75,7 @@ class PlexRepository {
       return rp(options)
          .then((result) => {
             if (result.MediaContainer.size > 0) {
-               const playing = result.MediaContainer.Video.map(convertPlexToStream);
+               const playing = result.MediaContainer.Metadata.map(convertPlexToStream);
                return { size: Object.keys(playing).length, video: playing };
             }
             return { size: 0, video: [] };

seasoned_api/src/plex/requestRepository.js

@@ -18,7 +18,7 @@ class RequestRepository {
          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 ? ORDER BY date DESC',
       };
       this.cacheTags = {
          search: 'se',

seasoned_api/src/seasoned/strayRepository.js

@@ -43,7 +43,7 @@ class StrayRepository {
          assert.notEqual(row, undefined, `Stray '${strayId}' already verified.`);
 
          const options = {
-            pythonPath: '/usr/bin/python3',
+	    pythonPath: '../app/env/bin/python3',
             args: [strayId],
          };
 

seasoned_api/src/tmdb/tmdb.js

@@ -8,7 +8,7 @@ const TMDB_METHODS = {
    nowplaying: { movie: 'miscNowPlayingMovies', show: 'tvOnTheAir' },
    similar: { movie: 'movieSimilar', show: 'tvSimilar' },
    search: { movie: 'searchMovie', show: 'searchTv', multi: 'searchMulti' },
-   info: { movie: 'movieInfo', show: 'tvInfo' },
+   info: { movie: 'movieInfo', show: 'tvInfo' }
 };
 
 class TMDB {
@@ -65,7 +65,7 @@ class TMDB {
          .catch(() => this.tmdb(TMDB_METHODS['search'][type], query))
          .catch(() => { throw new Error('Could not search for movies/shows at tmdb.'); })
          .then(response => this.cache.set(cacheKey, response))
-         .then(response => this.mapResults(response))
+         .then(response => this.mapResults(response));
    }
 
    /**
@@ -76,15 +76,15 @@ class TMDB {
    * @returns {Promise} dict with query results, current page and total_pages
    */
    listSearch(listName, type = 'movie', page = '1') {
-      const query = { page: page }
-      console.log(query)
+      const query = { page: page };
+      console.log(query);
       const cacheKey = `${this.cacheTags[listName]}:${type}:${page}`;
       return Promise.resolve()
          .then(() => this.cache.get(cacheKey))
          .catch(() => this.tmdb(TMDB_METHODS[listName][type], query))
-         .catch(() => { throw new Error('Error fetching list from tmdb.')})
+         .catch(() => { throw new Error('Error fetching list from tmdb.'); })
          .then(response => this.cache.set(cacheKey, response))
-         .then(response => this.mapResults(response, type))
+         .then(response => this.mapResults(response, type));
    }
 
    /**
@@ -94,13 +94,18 @@ class TMDB {
    * @returns {Promise} dict with tmdb results, mapped as movie/show objects.
    */
    mapResults(response, type) {
-      console.log(response.page)
+      console.log(response.page);
       return Promise.resolve()
          .then(() => {
             const mappedResults = response.results.filter((element) => {
                return (element.media_type === 'movie' || element.media_type === 'tv' || element.media_type === undefined);
             }).map((element) => convertTmdbToSeasoned(element, type));
-            return {results: mappedResults, page: response.page, total_pages: response.total_pages, total_results: response.total_results}
+            return { 
+               results: mappedResults,
+               page: response.page,
+               total_pages: response.total_pages,
+               total_results: response.total_results
+            }
          })
          .catch((error) => { throw new Error(error); });
    }

seasoned_api/src/user/userRepository.js

@@ -41,7 +41,7 @@ class UserRepository {
             assert(row, 'The user does not exist.');
             return row.password;
          })
-         .catch((err) => console.log('there was a error when getting hash', err));
+         .catch((err) => { console.log(error); throw new Error('Unable to find your user.'); });
    }
 
    /**
@@ -57,7 +57,7 @@ class UserRepository {
    checkAdmin(user) {
       return this.database.get(this.queries.getAdminStateByUser, user.username).then((row) => {
          return row.admin;
-      })
+      });
    }
 }
 

seasoned_api/src/webserver/app.js

@@ -17,9 +17,6 @@ app.use(bodyParser.json());
 // router.use(bodyParser.urlencoded({ extended: true }));
 
 
-/* Decode the Authorization header if provided */
-// router.use(tokenToUser);
-
 const router = express.Router();
 const allowedOrigins = ['https://kevinmidboe.com', 'http://localhost:8080'];
 
@@ -27,9 +24,7 @@ const allowedOrigins = ['https://kevinmidboe.com', 'http://localhost:8080'];
 // router.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: true }));
 
-
-// This is probably a correct middleware/router setup
-/* Translate the user token to a user name */
+/* Decode the Authorization header if provided */
 router.use(tokenToUser);
 
 // TODO: Should have a separate middleware/router for handling headers.

seasoned_api/src/webserver/controllers/plex/searchRequest.js

@@ -10,7 +10,7 @@ const searchHistory = new SearchHistory();
 function searchRequestController(req, res) {
    const user = req.loggedInUser;
    const { query, page, type } = req.query;
-   const username = user == undefined ? undefined : user.username;
+   const username = user === undefined ? undefined : user.username;
 
    Promise.resolve()
       .then(() => searchHistory.create(username, query))

seasoned_api/src/webserver/controllers/user/history.js

@@ -10,7 +10,7 @@ const searchHistory = new SearchHistory();
  */
 function historyController(req, res) {
    const user = req.loggedInUser;
-   const username = user == undefined ? undefined : user.username;
+   const username = user === undefined ? undefined : user.username;
 
    searchHistory.read(username)
       .then((searchQueries) => {

seasoned_api/src/webserver/controllers/user/login.js

@@ -22,7 +22,7 @@ function loginController(req, res) {
       .then(() => userRepository.checkAdmin(user))
       .then((checkAdmin) => {
          const token = new Token(user).toString(secret);
-         const admin_state = checkAdmin == 1 ? true : false;
+         const admin_state = checkAdmin === 1 ? true : false;
          res.send({ success: true, token, admin: admin_state });
       })
       .catch((error) => {

seasoned_api/src/webserver/controllers/user/register.js

@@ -22,8 +22,10 @@ function registerController(req, res) {
       .then(() => userRepository.checkAdmin(user))
       .then((checkAdmin) => {
          const token = new Token(user).toString(secret);
-         const admin_state = checkAdmin == 1 ? true : false;
-         res.send({ success: true, message: 'Welcome to Seasoned!', token, admin: admin_state });
+         const admin_state = checkAdmin === 1 ? true : false;
+         res.send({
+            success: true, message: 'Welcome to Seasoned!', token, admin: admin_state,
+         });
       })
       .catch((error) => {
          res.status(401).send({ success: false, error: error.message });