Remove scandir lib, use os.walk

couchpotato/core/_base/updater/main.py

@@ -16,7 +16,6 @@ from couchpotato.core.plugins.base import Plugin
 from couchpotato.environment import Env
 from dateutil.parser import parse
 from git.repository import LocalRepository
-from scandir import scandir
 import version
 from six.moves import filter
 
@@ -182,7 +181,7 @@ class BaseUpdater(Plugin):
 
     def deletePyc(self, only_excess = True, show_logs = True):
 
-        for root, dirs, files in scandir.walk(Env.get('app_dir')):
+        for root, dirs, files in os.walk(Env.get('app_dir')):
 
             pyc_files = filter(lambda filename: filename.endswith('.pyc'), files)
             py_files = set(filter(lambda filename: filename.endswith('.py'), files))
@@ -329,11 +328,11 @@ class SourceUpdater(BaseUpdater):
         # Get list of files we want to overwrite
         self.deletePyc()
         existing_files = []
-        for root, subfiles, filenames in scandir.walk(app_dir):
+        for root, subfiles, filenames in os.walk(app_dir):
             for filename in filenames:
                 existing_files.append(os.path.join(root, filename))
 
-        for root, subfiles, filenames in scandir.walk(path):
+        for root, subfiles, filenames in os.walk(path):
             for filename in filenames:
                 fromfile = os.path.join(root, filename)
                 tofile = os.path.join(app_dir, fromfile.replace(path + os.path.sep, ''))

couchpotato/core/downloaders/rtorrent_.py

@@ -12,7 +12,6 @@ from couchpotato.core.helpers.variable import cleanHost, splitString
 from couchpotato.core.logger import CPLog
 from bencode import bencode, bdecode
 from rtorrent import RTorrent
-from scandir import scandir
 
 
 log = CPLog(__name__)
@@ -238,7 +237,7 @@ class rTorrent(DownloaderBase):
             if torrent.is_multi_file() and torrent.directory.endswith(torrent.name):
                 # Remove empty directories bottom up
                 try:
-                    for path, _, _ in scandir.walk(sp(torrent.directory), topdown = False):
+                    for path, _, _ in os.walk(sp(torrent.directory), topdown = False):
                         os.rmdir(path)
                 except OSError:
                     log.info('Directory "%s" contains extra files, unable to remove', torrent.directory)

couchpotato/core/plugins/base.py

@@ -16,7 +16,6 @@ from couchpotato.environment import Env
 import requests
 from requests.packages.urllib3 import Timeout
 from requests.packages.urllib3.exceptions import MaxRetryError
-from scandir import scandir
 from tornado import template
 from tornado.web import StaticFileHandler
 
@@ -144,7 +143,7 @@ class Plugin(object):
     def deleteEmptyFolder(self, folder, show_error = True):
         folder = sp(folder)
 
-        for root, dirs, files in scandir.walk(folder):
+        for root, dirs, files in os.walk(folder):
 
             for dir_name in dirs:
                 full_path = os.path.join(root, dir_name)

couchpotato/core/plugins/file.py

@@ -9,7 +9,6 @@ from couchpotato.core.helpers.variable import md5, getExt
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.environment import Env
-from scandir import scandir
 from tornado.web import StaticFileHandler
 
 
@@ -49,7 +48,7 @@ class FileManager(Plugin):
                 for x in file_dict.keys():
                     files.extend(file_dict[x])
 
-            for f in scandir.scandir(cache_dir):
+            for f in os.listdir(cache_dir):
                 if os.path.splitext(f.name)[1] in ['.png', '.jpg', '.jpeg']:
                     file_path = os.path.join(cache_dir, f.name)
                     if toUnicode(file_path) not in files:

couchpotato/core/plugins/renamer.py

@@ -14,7 +14,6 @@ from couchpotato.core.helpers.variable import getExt, mergeDicts, getTitle, \
 from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from couchpotato.environment import Env
-from scandir import scandir
 from unrar2 import RarFile
 import six
 from six.moves import filter
@@ -195,7 +194,7 @@ class Renamer(Plugin):
             else:
                 # Get all files from the specified folder
                 try:
-                    for root, folders, names in scandir.walk(media_folder):
+                    for root, folders, names in os.walk(media_folder):
                         files.extend([sp(os.path.join(root, name)) for name in names])
                 except:
                     log.error('Failed getting files from %s: %s', (media_folder, traceback.format_exc()))
@@ -664,7 +663,7 @@ Remove it if you want it to be renamed (again, or at least let it try again)
 
             # Tag all files in release folder
             elif release_download['folder']:
-                for root, folders, names in scandir.walk(sp(release_download['folder'])):
+                for root, folders, names in os.walk(sp(release_download['folder'])):
                     tag_files.extend([os.path.join(root, name) for name in names])
 
         for filename in tag_files:
@@ -704,7 +703,7 @@ Remove it if you want it to be renamed (again, or at least let it try again)
 
             # Untag all files in release folder
             else:
-                for root, folders, names in scandir.walk(folder):
+                for root, folders, names in os.walk(folder):
                     tag_files.extend([sp(os.path.join(root, name)) for name in names if not os.path.splitext(name)[1] == '.ignore'])
 
         if not folder:
@@ -712,7 +711,7 @@ Remove it if you want it to be renamed (again, or at least let it try again)
 
         # Find all .ignore files in folder
         ignore_files = []
-        for root, dirnames, filenames in scandir.walk(folder):
+        for root, dirnames, filenames in os.walk(folder):
             ignore_files.extend(fnmatch.filter([sp(os.path.join(root, filename)) for filename in filenames], '*%s.ignore' % tag))
 
         # Match all found ignore files with the tag_files and delete if found
@@ -741,11 +740,11 @@ Remove it if you want it to be renamed (again, or at least let it try again)
 
         # Find tag on all files in release folder
         else:
-            for root, folders, names in scandir.walk(folder):
+            for root, folders, names in os.walk(folder):
                 tag_files.extend([sp(os.path.join(root, name)) for name in names if not os.path.splitext(name)[1] == '.ignore'])
 
         # Find all .ignore files in folder
-        for root, dirnames, filenames in scandir.walk(folder):
+        for root, dirnames, filenames in os.walk(folder):
             ignore_files.extend(fnmatch.filter([sp(os.path.join(root, filename)) for filename in filenames], '*%s.ignore' % tag))
 
         # Match all found ignore files with the tag_files and return True found
@@ -1102,7 +1101,7 @@ Remove it if you want it to be renamed (again, or at least let it try again)
             check_file_date = False
 
         if not files:
-            for root, folders, names in scandir.walk(folder):
+            for root, folders, names in os.walk(folder):
                 files.extend([sp(os.path.join(root, name)) for name in names])
 
         # Find all archive files

couchpotato/core/plugins/scanner.py

@@ -13,7 +13,6 @@ from couchpotato.core.logger import CPLog
 from couchpotato.core.plugins.base import Plugin
 from enzyme.exceptions import NoParserError, ParseError
 from guessit import guess_movie_info
-from scandir import scandir
 from subliminal.videos import Video
 import enzyme
 from six.moves import filter, map, zip
@@ -150,7 +149,7 @@ class Scanner(Plugin):
             check_file_date = True
             try:
                 files = []
-                for root, dirs, walk_files in scandir.walk(folder, followlinks=True):
+                for root, dirs, walk_files in os.walk(folder, followlinks=True):
                     files.extend([sp(os.path.join(sp(root), ss(filename))) for filename in walk_files])
 
                     # Break if CP wants to shut down

couchpotato/runner.py

@@ -18,7 +18,6 @@ from couchpotato.api import NonBlockHandler, ApiHandler
 from couchpotato.core.event import fireEventAsync, fireEvent
 from couchpotato.core.helpers.encoding import sp
 from couchpotato.core.helpers.variable import getDataDir, tryInt
-from scandir import scandir
 from tornado.httpserver import HTTPServer
 from tornado.web import Application, StaticFileHandler, RedirectHandler
 
@@ -99,7 +98,7 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
         existing_backups = []
         if not os.path.isdir(backup_path): os.makedirs(backup_path)
 
-        for root, dirs, files in scandir.walk(backup_path):
+        for root, dirs, files in os.walk(backup_path):
             for backup_file in files:
                 ints = re.findall('\d+', backup_file)
 
@@ -116,7 +115,7 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
         # Create new backup
         new_backup = sp(os.path.join(backup_path, '%s.tar.gz' % int(time.time())))
         zipf = tarfile.open(new_backup, 'w:gz')
-        for root, dirs, files in scandir.walk(db_path):
+        for root, dirs, files in os.walk(db_path):
             for zfilename in files:
                 zipf.add(os.path.join(root, zfilename), arcname = 'database/%s' % os.path.join(root[len(db_path) + 1:], zfilename))
         zipf.close()