Fixed default language issues;

Resolves #140
twiddli · Mar 11, 2016 · 503fe38 · 503fe38
1 parent 3de9cdc
commit 503fe38
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/version/app.py b/version/app.py
@@ -407,8 +407,8 @@ def show_in_library(self):
 			fetch_instance.FINISHED.connect(done)
 			fetch_instance.FINISHED.connect(metadata_spinner.before_hide)
 			thread.finished.connect(thread.deleteLater)
-			thread.start()
-			#fetch_instance.auto_web_metadata()
+			#thread.start()
+			fetch_instance.auto_web_metadata()
 			metadata_spinner.show()
 		else:
 			self.notif_bubble.update_text("Oops!", "Auto metadata fetcher is already running...")

diff --git a/version/gallerydialog.py b/version/gallerydialog.py
@@ -209,8 +209,10 @@ def _find_combobox_match(self, combobox, key, default):
 		f_index = combobox.findText(key, Qt.MatchFixedString)
 		if f_index != -1:
 			combobox.setCurrentIndex(f_index)
+			return True
 		else:
 			combobox.setCurrentIndex(default)
+			return False
 
 	def setGallery(self, gallery):
 		"To be used for when editing a gallery"
@@ -225,9 +227,12 @@ def setGallery(self, gallery):
 		self.tags_edit.setText(utils.tag_to_string(gallery.tags))
 
 
-		self._find_combobox_match(self.lang_box, gallery.language, 2)
-		self._find_combobox_match(self.type_box, gallery.type, 0)
-		self._find_combobox_match(self.status_box, gallery.status, 0)
+		if not self._find_combobox_match(self.lang_box, gallery.language, 1):
+			self._find_combobox_match(self.lang_box, app_constants.G_DEF_LANGUAGE, 1)
+		if not self._find_combobox_match(self.type_box, gallery.type, 0):
+			self._find_combobox_match(self.type_box, app_constants.G_DEF_TYPE, 0)
+		if not self._find_combobox_match(self.status_box, gallery.status, 0):
+			self._find_combobox_match(self.status_box, app_constants.G_DEF_STATUS, 0)
 
 		gallery_pub_date = "{}".format(gallery.pub_date).split(' ')
 		try:

diff --git a/version/utils.py b/version/utils.py
@@ -874,7 +874,7 @@ def tags_in_list(br_tags):
 import re as regex
 def title_parser(title):
 	"Receives a title to parse. Returns dict with 'title', 'artist' and language"
-	" ".join(title.split())
+	title = " ".join(title.split())
 	if '/' in title:
 		try:
 			title = os.path.split(title)[1]
@@ -906,9 +906,8 @@ def title_parser(title):
 					break
 			else:
 				parsed_title['language'] = app_constants.G_DEF_LANGUAGE
-
 		except IndexError:
-			pass
+			parsed_title['language'] = app_constants.G_DEF_LANGUAGE
 
 		t = title
 		for x in a: