Close all

couchpotato/core/media/_base/media/main.py

@@ -101,6 +101,8 @@ class MediaPlugin(MediaBase):
             def handler():
                 fireEvent(event, identifier = identifier, default_title = default_title, on_complete = self.createOnComplete(id))
 
+        db.close()
+
         if handler:
             return handler
 
@@ -124,6 +126,7 @@ class MediaPlugin(MediaBase):
         if m:
             results = m.to_dict(self.default_dict)
 
+        db.close()
         return results
 
     def getView(self, id = None, **kwargs):
@@ -259,6 +262,7 @@ class MediaPlugin(MediaBase):
                 'releases_count': releases_count.get(media_id),
             }))
 
+        db.close()
         return total_count, movies
 
     def listView(self, **kwargs):
@@ -352,6 +356,7 @@ class MediaPlugin(MediaBase):
             if len(chars) == 25:
                 break
 
+        db.close()
         return ''.join(sorted(chars))
 
     def charView(self, **kwargs):

couchpotato/core/media/movie/searcher/main.py

@@ -117,6 +117,7 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
             pass
 
         self.in_progress = False
+        db.close()
 
     def single(self, movie, search_protocols = None, manual = False):
 
@@ -207,6 +208,7 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
 
         fireEvent('notify.frontend', type = 'movie.searcher.ended', data = {'id': movie['id']})
 
+        db.close()
         return ret
 
     def correctRelease(self, nzb = None, media = None, quality = None, **kwargs):

couchpotato/core/media/movie/suggestion/main.py

@@ -33,6 +33,7 @@ class Suggestion(Plugin):
                     .options(joinedload_all('library')) \
                     .filter(or_(*[Media.status.has(identifier = s) for s in ['active', 'done']])).all()
                 movies = [x.library.identifier for x in active_movies]
+                db.close()
 
             if not ignored or len(ignored) == 0:
                 ignored = splitString(Env.prop('suggest_ignore', default = ''))
@@ -97,6 +98,7 @@ class Suggestion(Plugin):
                 .filter(Media.status_id.in_([active_status.get('id'), done_status.get('id')])).all()
             movies = [x[0] for x in active_movies]
             movies.extend(seen)
+            db.close()
 
             ignored.extend([x.get('imdb') for x in cached_suggestion])
             suggestions = fireEvent('movie.suggest', movies = movies, ignore = removeDuplicate(ignored), single = True)

couchpotato/core/notifications/core/main.py

@@ -126,6 +126,7 @@ class CoreNotifier(Notification):
             ndict['type'] = 'notification'
             notifications.append(ndict)
 
+        db.close()
         return {
             'success': True,
             'empty': len(notifications) == 0,
@@ -172,6 +173,7 @@ class CoreNotifier(Notification):
 
             self.frontend(type = listener, data = data)
 
+            db.close()
             return True
         except:
             log.error('Failed notify: %s', traceback.format_exc())
@@ -287,6 +289,8 @@ class CoreNotifier(Notification):
                 ndict['type'] = 'notification'
                 messages.append(ndict)
 
+            db.close()
+
         return {
             'success': True,
             'result': messages,

couchpotato/core/plugins/category/main.py

@@ -42,6 +42,7 @@ class CategoryPlugin(Plugin):
         for category in categories:
             temp.append(category.to_dict())
 
+        db.close()
         return temp
 
     def save(self, **kwargs):
@@ -65,6 +66,7 @@ class CategoryPlugin(Plugin):
 
             category_dict = c.to_dict()
 
+            db.close()
             return {
                 'success': True,
                 'category': category_dict
@@ -94,6 +96,7 @@ class CategoryPlugin(Plugin):
 
             db.commit()
 
+            db.close()
             return {
                 'success': True
             }
@@ -126,6 +129,7 @@ class CategoryPlugin(Plugin):
             except Exception as e:
                 message = log.error('Failed deleting category: %s', e)
 
+            db.close()
             return {
                 'success': success,
                 'message': message

couchpotato/core/plugins/dashboard/main.py

@@ -119,6 +119,7 @@ class Dashboard(Plugin):
                         'files': {},
                     }))
 
+        db.close()
         return {
             'success': True,
             'empty': len(movies) == 0,

couchpotato/core/plugins/file/main.py

@@ -166,6 +166,7 @@ class FileManager(Plugin):
         for type_object in results:
             types.append(type_object.to_dict())
 
+        db.close()
         return types
 
     def getTypesView(self, **kwargs):

couchpotato/core/plugins/profile/main.py

@@ -71,6 +71,7 @@ class ProfilePlugin(Plugin):
         for profile in profiles:
             temp.append(profile.to_dict(self.to_dict))
 
+        db.close()
         return temp
 
     def save(self, **kwargs):
@@ -127,6 +128,7 @@ class ProfilePlugin(Plugin):
             .options(joinedload_all('types')) \
             .first()
         default_dict = default.to_dict(self.to_dict)
+        db.close()
 
         return default_dict
 

couchpotato/core/plugins/quality/main.py

@@ -78,6 +78,8 @@ class QualityPlugin(Plugin):
             temp.append(q)
 
         self.cached_qualities = temp
+
+        db.close()
         return temp
 
     def single(self, identifier = ''):
@@ -89,6 +91,7 @@ class QualityPlugin(Plugin):
         if quality:
             quality_dict = dict(self.getQuality(quality.identifier), **quality.to_dict())
 
+        db.close()
         return quality_dict
 
     def getQuality(self, identifier):

couchpotato/core/plugins/release/main.py

@@ -88,6 +88,8 @@ class Release(Plugin):
                 elif rel.status_id in [snatched_status.get('id'), downloaded_status.get('id')]:
                     self.updateStatus(id = rel.id, status = ignored_status)
 
+        db.close()
+
 
     def add(self, group):
 
@@ -176,7 +178,7 @@ class Release(Plugin):
 
             rel = db.query(Relea).filter_by(id = id).first()
             if rel:
-                rel.delete()
+                db.delete(rel)
                 db.commit()
                 return True
         except:
@@ -220,6 +222,7 @@ class Release(Plugin):
             ignored_status, failed_status, available_status = fireEvent('status.get', ['ignored', 'failed', 'available'], single = True)
             self.updateStatus(id, available_status if rel.status_id in [ignored_status.get('id'), failed_status.get('id')] else ignored_status)
 
+        db.close()
         return {
             'success': True
         }
@@ -259,11 +262,10 @@ class Release(Plugin):
             'files': {}
         }), manual = True)
 
-        db.expunge_all()
-
         if success:
             fireEvent('notify.frontend', type = 'release.manual_download', data = True, message = 'Successfully snatched "%s"' % item['name'])
 
+        db.close()
         return {
             'success': success == True
         }
@@ -456,6 +458,7 @@ class Release(Plugin):
         releases = [r.to_dict({'info': {}, 'files': {}}) for r in releases_raw]
         releases = sorted(releases, key = lambda k: k['info'].get('score', 0), reverse = True)
 
+        db.close()
         return releases
 
     def forMovieView(self, id = None, **kwargs):

couchpotato/core/plugins/renamer/main.py

@@ -598,6 +598,7 @@ class Renamer(Plugin):
                 break
 
         self.renaming_started = False
+        db.close()
 
     def getRenameExtras(self, extra_type = '', replacements = None, folder_name = '', file_name = '', destination = '', group = None, current_file = '', remove_multiple = False):
         if not group: group = {}
@@ -851,6 +852,7 @@ Remove it if you want it to be renamed (again, or at least let it try again)
         snatched_status, ignored_status, failed_status, seeding_status, downloaded_status, missing_status = \
             fireEvent('status.get', ['snatched', 'ignored', 'failed', 'seeding', 'downloaded', 'missing'], single = True)
 
+        try:
             db = get_session()
             rels = db.query(Release).filter(
                 Release.status_id.in_([snatched_status.get('id'), seeding_status.get('id'), missing_status.get('id')])
@@ -1042,6 +1044,8 @@ Remove it if you want it to be renamed (again, or at least let it try again)
 
             self.checking_snatched = False
             return True
+        finally:
+            db.close()
 
     def extendReleaseDownload(self, release_download):
 
@@ -1064,6 +1068,8 @@ Remove it if you want it to be renamed (again, or at least let it try again)
             if not rls:
                 log.error('Download ID %s from downloader %s not found in releases', (release_download.get('id'), release_download.get('downloader')))
 
+            db.close()
+
         if rls:
 
             rls_dict = rls.to_dict({'info':{}})

couchpotato/core/plugins/scanner/main.py

@@ -441,6 +441,7 @@ class Scanner(Plugin):
         else:
             log.debug('Found no movies in the folder %s', folder)
 
+        db.close()
         return processed_movies
 
     def getMetaData(self, group, folder = '', release_download = None):
@@ -608,6 +609,7 @@ class Scanner(Plugin):
                     break
                 except:
                     pass
+            db.close()
 
         # Search based on identifiers
         if not imdb_id:

couchpotato/core/plugins/status/main.py

@@ -55,7 +55,7 @@ class StatusPlugin(Plugin):
         db = get_session()
         status = db.query(Status).filter_by(id = id).first()
         status_dict = status.to_dict()
-        #db.close()
+        db.close()
 
         return status_dict
 
@@ -73,6 +73,7 @@ class StatusPlugin(Plugin):
             # Update cache
             self.status_cached[status.identifier] = s
 
+        db.close()
         return temp
 
     def get(self, identifiers):

couchpotato/core/plugins/subtitle/main.py

@@ -41,6 +41,8 @@ class Subtitle(Plugin):
                     # get subtitles for those files
                     subliminal.list_subtitles(files, cache_dir = Env.get('cache_dir'), multi = True, languages = self.getLanguages(), services = self.services)
 
+        db.close()
+
     def searchSingle(self, group):
         if self.isDisabled(): return
 

couchpotato/core/providers/info/_modifier/main.py

@@ -104,6 +104,7 @@ class MovieResultModifier(Plugin):
         except:
             log.error('Tried getting more info on searched movies: %s', traceback.format_exc())
 
+        db.close()
         return temp
 
     def checkLibrary(self, result):

couchpotato/core/settings/__init__.py

@@ -216,6 +216,7 @@ class Settings(object):
         except:
             pass
 
+        db.close()
         return prop
 
     def setProperty(self, identifier, value = ''):