add confirm message if not saved when switch to webdav mode

binux · binux · commit a3df2792754b · 2015-06-05T23:09:53.000+08:00
reload script from database when leaving webdav mode
diff --git a/pyspider/webui/debug.py b/pyspider/webui/debug.py
@@ -206,6 +206,16 @@ def save(project):
     return 'ok', 200
 
 
+@app.route('/debug/<project>/get')
+def get_script(project):
+    if not verify_project_name(project):
+        return 'project name is not allowed!', 400
+    projectdb = app.config['projectdb']
+    info = projectdb.get(project, fields=['name', 'script'])
+    return json.dumps(utils.unicode_obj(info)), \
+           200, {'Content-Type': 'application/json'}
+
+
 @app.route('/helper.js')
 def resizer_js():
     host = request.headers['Host']
diff --git a/pyspider/webui/static/debug.js b/pyspider/webui/static/debug.js
@@ -12,7 +12,7 @@ window.SelectorHelper = (function() {
     features.forEach(function(f) {
       if (f.selected)
         element_name += f.name;
-    })
+    });
     if (element_name === '') {
       return p.tag;
     }
@@ -586,15 +586,39 @@ window.Debugger = (function() {
 
     webdav_mode: false,
     toggle_webdav_mode: function(button) {
-      this.webdav_mode = !this.webdav_mode;
-      if (this.webdav_mode) {
+      if (!this.webdav_mode) {
+        if (this.not_saved) {
+            if (!confirm("You have not saved changes. Ignore changes and switch to WebDav mode.")) {
+            return;
+          }
+          this.not_saved = false;
+        }
         this.python_editor_elem.hide();
         this.splitter.trigger('fullsize', 'prev');
         $(button).addClass('active');
+        this.webdav_mode = !this.webdav_mode;
       } else {
-        this.python_editor_elem.show();
-        this.splitter.trigger('init');
-        $(button).removeClass('active');
+        // leaving webdav mode, reload script
+        var _this = this;
+        $.ajax({
+          type: "GET",
+          url: location.pathname + '/get',
+          success: function (data) {
+            _this.splitter.trigger('init');
+            _this.python_editor_elem.show();
+            _this.python_editor.setValue(data.script);
+            _this.not_saved = false;
+            $(button).removeClass('active');
+            _this.webdav_mode = !_this.webdav_mode;
+          },
+          error: function() {
+            alert('Loading script from database error. Script may out-of-date.');
+            _this.python_editor_elem.show();
+            _this.splitter.trigger('init');
+            $(button).removeClass('active');
+            _this.webdav_mode = !_this.webdav_mode;
+          },
+        });
       }
     },
   };
diff --git a/tests/test_webui.py b/tests/test_webui.py
@@ -153,7 +153,7 @@ def test_35_run_http_task(self):
         })
         self.assertEqual(rv.status_code, 200)
         data = json.loads(utils.text(rv.data))
-        self.assertIn(b'follows', rv.data)
+        self.assertIn('follows', data)
 
     def test_40_save(self):
         rv = self.app.post('/debug/test_project/save', data={
@@ -162,6 +162,13 @@ def test_40_save(self):
         self.assertEqual(rv.status_code, 200)
         self.assertIn(b'ok', rv.data)
 
+    def test_42_get(self):
+        rv = self.app.get('/debug/test_project/get')
+        self.assertEqual(rv.status_code, 200)
+        data = json.loads(utils.text(rv.data))
+        self.assertIn('script', data)
+        self.assertEqual(data['script'], self.script_content)
+
     def test_45_run_with_saved_script(self):
         rv = self.app.post('/debug/test_project/run', data={
             'webdav_mode': 'true',
