From 149484ff0aab4852556b78ba664833faeb975d13 Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Sat, 20 Jul 2019 20:23:08 +1200
Subject: [PATCH] remove encoding of paths. #1637 #1582

---
 TorrentToMedia.py            | 24 ------------------------
 core/utils/identification.py |  9 ---------
 core/utils/naming.py         |  4 ----
 nzbToMedia.py                |  8 --------
 4 files changed, 45 deletions(-)

diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index 51a257c8..42707b1a 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -70,14 +70,6 @@ def process_torrent(input_directory, input_name, input_category, input_hash, inp
         input_category = 'UNCAT'
 
     usercat = input_category
-    # try:
-    #    input_name = input_name.encode(core.SYS_ENCODING)
-    # except UnicodeError:
-    #    pass
-    # try:
-    #    input_directory = input_directory.encode(core.SYS_ENCODING)
-    # except UnicodeError:
-    #    pass
 
     logger.debug('Determined Directory: {0} | Name: {1} | Category: {2}'.format
                  (input_directory, input_name, input_category))
@@ -135,10 +127,6 @@ def process_torrent(input_directory, input_name, input_category, input_hash, inp
     else:
         output_destination = os.path.normpath(
             core.os.path.join(core.OUTPUT_DIRECTORY, input_category))
-    # try:
-    #    output_destination = output_destination.encode(core.SYS_ENCODING)
-    # except UnicodeError:
-    #    pass
 
     if output_destination in input_directory:
         output_destination = input_directory
@@ -180,10 +168,6 @@ def process_torrent(input_directory, input_name, input_category, input_hash, inp
                     core.os.path.join(output_destination, os.path.basename(file_path)), full_file_name)
                 logger.debug('Setting outputDestination to {0} to preserve folder structure'.format
                              (os.path.dirname(target_file)))
-        # try:
-        #    target_file = target_file.encode(core.SYS_ENCODING)
-        # except UnicodeError:
-        #    pass
         if root == 1:
             if not found_file:
                 logger.debug('Looking for {0} in: {1}'.format(input_name, inputFile))
@@ -362,15 +346,7 @@ def main(args):
                     if client_agent.lower() not in core.TORRENT_CLIENTS:
                         continue
 
-                    # try:
-                    #    dir_name = dir_name.encode(core.SYS_ENCODING)
-                    # except UnicodeError:
-                    #    pass
                     input_name = os.path.basename(dir_name)
-                    # try:
-                    #    input_name = input_name.encode(core.SYS_ENCODING)
-                    # except UnicodeError:
-                    #    pass
 
                     results = process_torrent(dir_name, input_name, subsection, input_hash or None, input_id or None,
                                               client_agent)
diff --git a/core/utils/identification.py b/core/utils/identification.py
index 365ea790..7ea2fdc1 100644
--- a/core/utils/identification.py
+++ b/core/utils/identification.py
@@ -96,15 +96,6 @@ def find_imdbid(dir_name, input_name, omdb_api_key):
 def category_search(input_directory, input_name, input_category, root, categories):
     tordir = False
 
-    # try:
-    #    input_name = input_name.encode(core.SYS_ENCODING)
-    # except Exception:
-    #    pass
-    # try:
-    #    input_directory = input_directory.encode(core.SYS_ENCODING)
-    # except Exception:
-    #    pass
-
     if input_directory is None:  # =Nothing to process here.
         return input_directory, input_name, input_category, root
 
diff --git a/core/utils/naming.py b/core/utils/naming.py
index 4d664036..dfabec3f 100644
--- a/core/utils/naming.py
+++ b/core/utils/naming.py
@@ -26,10 +26,6 @@ def sanitize_name(name):
 
     # remove leading/trailing periods and spaces
     name = name.strip(' .')
-    # try:
-    #    name = name.encode(core.SYS_ENCODING)
-    # except Exception:
-    #    pass
 
     return name
 
diff --git a/nzbToMedia.py b/nzbToMedia.py
index 863dd44a..a6139fe3 100755
--- a/nzbToMedia.py
+++ b/nzbToMedia.py
@@ -973,15 +973,7 @@ def main(args, section=None):
                     if client_agent and client_agent.lower() not in core.NZB_CLIENTS:
                         continue
 
-                    try:
-                        dir_name = dir_name.encode(core.SYS_ENCODING)
-                    except:
-                        pass
                     input_name = os.path.basename(dir_name)
-                    try:
-                        input_name = input_name.encode(core.SYS_ENCODING)
-                    except:
-                        pass
 
                     results = process(dir_name, input_name, 0, client_agent=client_agent,
                                       download_id=download_id or None, input_category=subsection)