Merge branch 'development'

Dockerfile

@@ -7,11 +7,12 @@ VOLUME /tv
 RUN apk add --update build-base python-dev py2-pip py-setuptools jpeg-dev zlib-dev git
 
 ADD . /bazarr
+
+# Install app dependencies
+RUN pip install -r /bazarr/requirements.txt
+
 #RUN git clone -b development --single-branch https://github.com/morpheus65535/bazarr.git
 
 WORKDIR /bazarr
 
-# Install app dependencies
-RUN pip install -r requirements.txt
-
 CMD ["python", "bazarr.py"]

create_db.sql

@@ -35,9 +35,10 @@ CREATE TABLE "table_settings_general" (
 	`ip`	TEXT NOT NULL,
 	`port`	INTEGER NOT NULL,
 	`base_url`	TEXT,
-	`path_mapping`	TEXT
+	`path_mapping`	TEXT,
+	`log_level`	TEXT
 );
-INSERT INTO `table_settings_general` (ip,port,base_url,path_mapping) VALUES ('0.0.0.0',6767,'/',Null);
+INSERT INTO `table_settings_general` (ip,port,base_url,path_mapping,log_level) VALUES ('0.0.0.0',6767,'/',Null,'WARNING');
 CREATE TABLE `table_scheduler` (
 	`id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
 	`name`	TEXT NOT NULL,

list_subtitles.py

@@ -81,8 +81,9 @@ def list_missing_subtitles(*no):
         actual_subtitles = []
         desired_subtitles = []
         missing_subtitles = []
-        actual_subtitles = ast.literal_eval(episode_subtitles[1])
-        desired_subtitles = ast.literal_eval(episode_subtitles[2])
+        if episode_subtitles[1] != None:
+            actual_subtitles = ast.literal_eval(episode_subtitles[1])
+            desired_subtitles = ast.literal_eval(episode_subtitles[2])
         actual_subtitles_list = []
         if desired_subtitles == None:
             pass

views/episodes.tpl

@@ -152,7 +152,11 @@
 										<td>{{episode[3]}}</td>
 										<td>{{episode[0]}}</td>
 										<td>
-										%actual_languages = ast.literal_eval(episode[4])
+										%if episode[4] is not None:
+										%	actual_languages = ast.literal_eval(episode[4])
+										%else:
+											actual_languages = '[]'
+										%end
 										%if actual_languages is not None:
 											%for language in actual_languages:
 											%if language[1] is not None:
@@ -169,7 +173,11 @@
 										%end
 										</td>
 										<td>
-										%missing_languages = ast.literal_eval(episode[6])
+										%if episode[6] is not None:
+										%	missing_languages = ast.literal_eval(episode[6])
+										%else:
+											missing_languages = '[]'
+										%end
 										%if missing_languages is not None:
 											%for language in missing_languages:
 											<a data-episodePath="{{episode[1]}}" data-language="{{pycountry.languages.lookup(str(language)).alpha_3}}" data-hi="{{details[4]}}" data-sonarrSeriesId={{episode[5]}} data-sonarrEpisodeId={{episode[7]}} class="get_subtitle ui tiny label">

views/series.tpl

@@ -98,7 +98,7 @@
 				%import ast
 				%import os
 				%for row in rows:
-					<tr class="selectable" {{!"style='background-color: yellow;'" if row[4] == None else ""}}>
+					<tr class="selectable">
 						<td><a href="{{base_url}}/episodes/{{row[5]}}">{{row[1]}}</a></td>
 						<td>
 						{{row[2]}}
@@ -112,7 +112,7 @@
 							%end
 						</td>
 						<td>{{row[4]}}</td>
-						<td>
+						<td {{!"style='background-color: yellow;'" if row[4] == None else ""}}>
 							<%
 							subs_languages_list = []
 							if subs_languages is not None:

views/settings.tpl

@@ -143,7 +143,7 @@
 					</div>
 				</div>
 
-				<div class="ui dividing header">Remote Path Mappings</div>
+				<div class="ui dividing header">Path Mappings</div>
 				<div class="twelve wide column">
 					<div class="ui grid">
 						%import ast
@@ -152,6 +152,28 @@
 						%else:
 						%	path_substitutions = []
 						%end
+						<div class="middle aligned row">
+					    	<div class="right aligned four wide column">
+					    		
+					    	</div>
+							<div class="four wide column">
+								<div class="ui fluid input">
+									<h4 class="ui header">
+										Path for Sonarr:
+									</h4>
+								</div>
+							</div>
+							<div class="center aligned column">
+								
+							</div>
+							<div class="four wide column">
+								<div class="ui fluid input">
+									<h4 class="ui header">
+										Path for Bazarr:
+									</h4>
+								</div>
+							</div>
+						</div>
 						%for x in range(0, 5):
 						%	path = []
 						%	try: