Merge pull request #104 from KevinMidboe/misc

Misc

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.name))
+	deluge = delugeCli.Deluge()
+	response = deluge.remove(ep.name)
+	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/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',