From 59a5b6c030032db07291e927364cd5cc7127db06 Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Sat, 23 Aug 2014 12:42:19 -0700
Subject: [PATCH] Fixed: Basic naming settings take existing format into
 consideration

---
 .../Naming/Basic/BasicNamingModel.js          |  9 ++++
 .../Naming/Basic/BasicNamingView.js           | 54 +++++++++++++------
 .../MediaManagement/Naming/NamingModel.js     |  1 -
 3 files changed, 46 insertions(+), 18 deletions(-)
 create mode 100644 src/UI/Settings/MediaManagement/Naming/Basic/BasicNamingModel.js

diff --git a/src/UI/Settings/MediaManagement/Naming/Basic/BasicNamingModel.js b/src/UI/Settings/MediaManagement/Naming/Basic/BasicNamingModel.js
new file mode 100644
index 000000000..c78330f89
--- /dev/null
+++ b/src/UI/Settings/MediaManagement/Naming/Basic/BasicNamingModel.js
@@ -0,0 +1,9 @@
+'use strict';
+define(
+    [
+        'backbone'
+    ], function (Backbone) {
+        return  Backbone.Model.extend({
+
+        });
+    });
diff --git a/src/UI/Settings/MediaManagement/Naming/Basic/BasicNamingView.js b/src/UI/Settings/MediaManagement/Naming/Basic/BasicNamingView.js
index 7517df4b8..f348d1499 100644
--- a/src/UI/Settings/MediaManagement/Naming/Basic/BasicNamingView.js
+++ b/src/UI/Settings/MediaManagement/Naming/Basic/BasicNamingView.js
@@ -5,8 +5,9 @@ define(
         'marionette',
         'Config',
         'Settings/MediaManagement/Naming/NamingSampleModel',
+        'Settings/MediaManagement/Naming/Basic/BasicNamingModel',
         'Mixins/AsModelBoundView'
-    ], function (_, Marionette, Config, NamingSampleModel, AsModelBoundView) {
+    ], function (_, Marionette, Config, NamingSampleModel, BasicNamingModel, AsModelBoundView) {
 
         var view = Marionette.ItemView.extend({
             template: 'Settings/MediaManagement/Naming/Basic/BasicNamingViewTemplate',
@@ -18,20 +19,42 @@ define(
                 dailyEpisodeExample   : '.x-daily-episode-example'
             },
 
-            onRender: function () {
+            initialize: function (options) {
+                this.namingModel = options.model;
+                this.model = new BasicNamingModel();
+
+                this._parseNamingModel();
+
                 this.listenTo(this.model, 'change', this._buildFormat);
-                this._buildFormat();
+                this.listenTo(this.namingModel, 'sync', this._parseNamingModel);
             },
 
-            _updateSamples: function () {
-                var data = {
-                    renameEpisodes: true,
-                    standardEpisodeFormat: this.standardEpisodeFormat,
-                    dailyEpisodeFormat: this.dailyEpisodeFormat,
-                    multiEpisodeStyle: this.model.get('multiEpisodeStyle')
-                };
+            _parseNamingModel: function () {
+                var standardFormat = this.namingModel.get('standardEpisodeFormat');
 
-                this.namingSampleModel.fetch({data: data});
+                var includeSeriesTitle = standardFormat.match(/\{Series[-_. ]Title\}/i);
+                var includeEpisodeTitle = standardFormat.match(/\{Episode[-_. ]Title\}/i);
+                var includeQuality = standardFormat.match(/\{Quality[-_. ]Title\}/i);
+                var numberStyle = standardFormat.match(/s?\{season(?:\:00)?\}[ex]\{episode(?:\:00)?\}/i);
+                var replaceSpaces = standardFormat.indexOf(' ') === -1;
+                var separator = standardFormat.match(/\}( - |\.-\.|\.| )|( - |\.-\.|\.| )\{/i);
+
+                if (separator === null || separator[1] === '.-.') {
+                    separator = ' - ';
+                }
+
+                else {
+                    separator = separator[1];
+                }
+
+                this.model.set({
+                    includeSeriesTitle: includeSeriesTitle !== null,
+                    includeEpisodeTitle: includeEpisodeTitle !== null,
+                    includeQuality: includeQuality !== null,
+                    numberStyle: numberStyle[0],
+                    replaceSpaces: replaceSpaces,
+                    separator: separator
+                }, { silent: true });
             },
 
             _buildFormat: function () {
@@ -39,10 +62,6 @@ define(
                     return;
                 }
 
-                if (_.has(this.model.changed, 'standardEpisodeFormat') || _.has(this.model.changed, 'dailyEpisodeFormat')) {
-                    return;
-                }
-
                 var standardEpisodeFormat = '';
                 var dailyEpisodeFormat = '';
 
@@ -96,8 +115,9 @@ define(
                     dailyEpisodeFormat = dailyEpisodeFormat.replace(/\s/g, '.');
                 }
 
-                this.model.set('standardEpisodeFormat', standardEpisodeFormat);
-                this.model.set('dailyEpisodeFormat', dailyEpisodeFormat);
+                this.namingModel.set('standardEpisodeFormat', standardEpisodeFormat);
+                this.namingModel.set('dailyEpisodeFormat', dailyEpisodeFormat);
+                this.namingModel.set('animeEpisodeFormat', standardEpisodeFormat);
             }
         });
 
diff --git a/src/UI/Settings/MediaManagement/Naming/NamingModel.js b/src/UI/Settings/MediaManagement/Naming/NamingModel.js
index dbb1e0bf7..f12d36735 100644
--- a/src/UI/Settings/MediaManagement/Naming/NamingModel.js
+++ b/src/UI/Settings/MediaManagement/Naming/NamingModel.js
@@ -8,5 +8,4 @@ define(
             successMessage: 'MediaManagement settings saved',
             errorMessage  : 'Couldn\'t save naming settings'
         });
-
     });