From b31953b52692e6061c4a986570620124e2ee355f Mon Sep 17 00:00:00 2001
From: pepperpepperpepper <pepper@scannerjammer.com>
Date: Wed, 9 Mar 2016 18:55:15 -0800
Subject: ok awesome

---
 photoblaster/_file.py                     |  9 ++-
 photoblaster/modules/pbconcat/__init__.py | 20 +++++--
 photoblaster/server.py                    |  1 +
 share/frontend/imconcat/index.html        | 97 +++++++++++++++++++++----------
 4 files changed, 89 insertions(+), 38 deletions(-)

diff --git a/photoblaster/_file.py b/photoblaster/_file.py
index ba8c0a6..3db52b8 100644
--- a/photoblaster/_file.py
+++ b/photoblaster/_file.py
@@ -27,15 +27,20 @@ class File(object):
         self.extension = extension
         self._directory = directory
         self._filename = None
-        self._creation_time = str(int(time.time()))
+        self._make_creation_time()
         self.set_filename(
             namepart=namepart,
             username=username
         )
+        self._storage = "local"
+        self._make_hashdir()
+
+    def _make_creation_time(self):
+        self._creation_time = str(int(time.time()))
+    def _make_hashdir(self):
         self._hashdir = sha.new(
             self.get_filepath()
         ).hexdigest()[:2]
-        self._storage = "local"
 
     @classmethod
     def from_url(cls, url, **kwargs):
diff --git a/photoblaster/modules/pbconcat/__init__.py b/photoblaster/modules/pbconcat/__init__.py
index 586fe43..68ebc6d 100644
--- a/photoblaster/modules/pbconcat/__init__.py
+++ b/photoblaster/modules/pbconcat/__init__.py
@@ -1,9 +1,9 @@
+import os
 from photoblaster.modules import ModuleBase
 from photoblaster.config import BIN_CONVERT, BIN_COMPOSITE, \
     DEFAULT_FINALFORMAT, PBCONCAT_DIMENSIONS_LIMIT, PBCONCAT_FRAMES_LIMIT
 from photoblaster._file import File
 from subprocess import call
-import copy
 _DEFAULT_DIRECTION = 'right'
 
 
@@ -12,11 +12,19 @@ class SizeNotOkError(Exception):
 
 
 class PbConcatFile(File):
+    def __init__(
+        self,
+        filepath=None
+    ):
+        self._make_creation_time()
+        self._filename = os.path.basename(filepath)
+        self._directory = os.path.dirname(filepath)
+        self._make_hashdir()
+        self._storage = "local"
 
     @classmethod
     def from_file(cls, _file):
-        obj = copy.copy(_file)
-        obj.__class__ = PbConcatFile
+        obj = cls(filepath=_file.get_filepath())
         return obj
 
     def get_frames(self):
@@ -210,13 +218,17 @@ class PbConcat(ModuleBase):
 
     def _finalize_image(self):
         if len(self.get_output_file().get_frames()) > 1:
-            self.get_output_file().compile_frames(module=self)
+            return self.get_output_file().compile_frames(module=self)
+        self.get_output_file().get_frames()[0].set_filepath(
+            self.get_output_file().get_filepath()
+        )
 
     def create(self):
         self._match_dimensions()
         self._make_frames_count_equal()
         self._merge_frames()
         self._finalize_image()
+
         super(PbConcat, self).create()
 
     def _add_canvas(self, image, canvas_color="transparent"):
diff --git a/photoblaster/server.py b/photoblaster/server.py
index 081e16a..56cdd1b 100644
--- a/photoblaster/server.py
+++ b/photoblaster/server.py
@@ -217,6 +217,7 @@ class Server(object):
             return send_from_directory(WORKING_DIR, path)
 
     def _find_class_by_name(self, pb_classname):
+        sys.stderr.write("looking for %s\n" % pb_classname)
         pb_classname = self._classname_aliases.get(pb_classname, None) or \
             pb_classname
         try:
diff --git a/share/frontend/imconcat/index.html b/share/frontend/imconcat/index.html
index 89a896b..e244c9e 100644
--- a/share/frontend/imconcat/index.html
+++ b/share/frontend/imconcat/index.html
@@ -34,24 +34,6 @@
          margin-bottom: 10px;
          background-color: #222;
        }
-//       .logo-row{
-//         display: inline;
-//       }
-//       div.logo-row{
-//         max-width: 544px;
-//         width: 544px;
-//       }
-//       img.logo-row{
-//         vertical-align: top;
-//       }
-//       #logo-scratch{
-//         position:relative;
-//         top: -52px;
-//       }
-//       #logos{
-//         width: 100%;
-//
-//       }
     .btn{
       margin-top: 10px;
       background-color: gray;
@@ -84,6 +66,15 @@
     #final_image > img{
       width: 100%;
     }
+    #send_to_input{
+      margin-top: 10px;
+    }
+    .dontshowme{
+      display: none;
+    }
+    #error_message{
+      color: red;
+    }
     </style>
   </head>
   <body>
@@ -97,6 +88,7 @@
       <a class="pb_links" href="http://asdf.us/imlandscape">imlandscape</a>
       <a class="pb_links" href="http://asdf.us/imbreak">imbreak</a>
       <a class="pb_links" href="http://asdf.us/shader">shader</a>
+      <a class="pb_links" href="http://asdf.us/ascii">ascii</a>
     </div>
     <h1 id="logos">
       <a href="">
@@ -109,25 +101,31 @@
               <div class="modal-content">
                 <div class="modal-header">
                   <button type="button" class="close" data-dismiss="modal">&times;</button>
-                  <h4 class="modal-title success">Final Image:</h4>
-                  <h4 class="modal-title failure">Request Failed:</h4>
+                  <h4 class="modal-title success dontshowme modal-info">Final Image:</h4>
+                  <h4 class="modal-title failure dontshowme modal-info">Request Failed:</h4>
                 </div>
                 <div class="modal-body">
-                  <div id="final_image">
+                  <div id="final_image" class="dontshowme modal-info">
                     <img src="img/logo-complete.png" / >
                   </div>
-                  <div id="final_width" class="row col-md-10">
+                  <div id="error_message" class="row col-md-10 dontshowme modal-info">
+                  </div>
+
+                  <div id="final_width" class="row col-md-10 dontshowme modal-info">
                     width: <span class="final_value">58</span>px
                   </div>
-                  <div id="final_height" class="row col-md-10">
+                  <div id="final_height" class="row col-md-10 dontshowme modal-info">
                     height: <span class="final_value">58</span>px
                   </div>
-                  <div id="final_size" class="row col-md-10">
+                  <div id="final_size" class="row col-md-10 dontshowme modal-info">
                     size: <span class="final_value">58</span>
                   </div>
-                  <div id="final_url" class="row col-md-10">
+                  <div id="final_url" class="row col-md-10 dontshowme modal-info">
                     url: <input type="text" class="final_value"></input>
                   </div>
+                  <div id="send_to_input" class="row col-md-10 dontshowme modal-info">
+									<span id="sendtoinput" style="border: 1px solid gray; cursor: pointer;">&nbsp;send to input <img src="img/arrow_pointing_left.png">&nbsp;</span>
+                  </div>
                 </div>
                 <div class="modal-footer">
                   <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
@@ -142,14 +140,13 @@
     <script type="text/javascript" src="lib/jsonform.js"></script>
     <script type="text/javascript">
       $(document).ready(function(){
-			  $('.modal').modal();
 				$('form').jsonForm({
 					"schema": {
-						"image_url1": {
+						"img_url1": {
 							"type": "string",
 							"title": "Image Url 1:"
 						},
-						"image_url2": {
+						"img_url2": {
 							"type": "string",
 							"title": "Image Url 2:"
 						},
@@ -186,29 +183,65 @@
 						}    
 					],
 					"onSubmitValid": function (values) {
-            is_generating() 
 						$.ajax({
-							url: 'some-url',
+							url: '/im/api/pbconcat',
 							type: 'post',
 							dataType: 'json',
 							data: $('form').serialize(),
 							success: function(data) {
 								showSuccess(data)   
 							},
-							failure: showFaliure(data)
+              error: function(data){
+                showFailure(data)
+              }
 						});
 					} 
 				});
         function showSuccess(data){
+          console.log("in show success function")
 					$('.modal').modal();
         }
         function showFailure(data){
-          $('.modal').modal();
+            var msg;
+            switch(data.status) {
+						case 405:
+								msg = "This type of request is not allowed."
+								break;
+						case 500:
+								msg = "Problem with the request. Please check your input parameters."
+								break;
+						default:
+								msg = "Problem with request."
+						}
+						console.log(msg)
+						reportError(msg)
         }
         function generatingOn(){ 
         };
         function generatingOff(){ 
         };
+        function reportError(msg){
+          $('h4.failure').toggleClass("dontshowme")
+          $('#error_message').html(msg)
+          $('#error_message').toggleClass("dontshowme")
+          generatingOff()
+          $('.modal').modal();
+        }
+        function resetModal(){
+          $('.modal-info').each(
+              function(el){ 
+                if (!$(this).hasClass("dontshowme")){ 
+                  $(this).addClass("dontshowme")
+                } 
+              }
+          )
+        }
+        $('.modal-content').find("button").click(function(){
+          resetModal()
+        })
+        $('#myModal').on('hidden.bs.modal', function () {
+          resetModal()
+        })
       })
 
     </script>
-- 
cgit v1.2.3-70-g09d2