From 71b7672242a70dcd0588daa9dc734dec02593a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis=20V=C3=A9zina?= <5130500+morpheus65535@users.noreply.github.com> Date: Mon, 27 Nov 2017 21:25:03 -0500 Subject: [PATCH] Path replacement bug under Linux --- list_subtitles.py | 8 +++++--- update.py | 9 --------- 2 files changed, 5 insertions(+), 12 deletions(-) delete mode 100644 update.py diff --git a/list_subtitles.py b/list_subtitles.py index 88e105202..96929d97b 100644 --- a/list_subtitles.py +++ b/list_subtitles.py @@ -39,6 +39,8 @@ def list_subtitles(file): def store_subtitles(file): languages = [] actual_subtitles = [] + if os.name == 'nt': + file = file.decode('utf8') if os.path.exists(file): if os.path.splitext(file)[1] == '.mkv': try: @@ -110,7 +112,7 @@ def full_scan_subtitles(): c_db.close() for episode in episodes: - store_subtitles(path_replace(episode[0]).encode(sys.getfilesystemencoding())) + store_subtitles(path_replace(episode[0]).encode('utf8')) def series_scan_subtitles(no): conn_db = sqlite3.connect(os.path.join(os.path.dirname(__file__), 'data/db/bazarr.db')) @@ -119,7 +121,7 @@ def series_scan_subtitles(no): c_db.close() for episode in episodes: - store_subtitles(path_replace(episode[0]).encode(sys.getfilesystemencoding())) + store_subtitles(path_replace(episode[0]).encode('utf8')) list_missing_subtitles(no) @@ -130,4 +132,4 @@ def new_scan_subtitles(): c_db.close() for episode in episodes: - store_subtitles(path_replace(episode[0]).encode(sys.getfilesystemencoding())) + store_subtitles(path_replace(episode[0]).encode('utf8')) diff --git a/update.py b/update.py deleted file mode 100644 index 02b31f232..000000000 --- a/update.py +++ /dev/null @@ -1,9 +0,0 @@ -# coding: utf-8 -from __future__ import unicode_literals - -from get_general_settings import * - -import git - -g = git.cmd.Git(os.path.dirname(__file__)) -print g.pull('--dry-run', 'origin', branch)