Changing some configuration aspects and refactoring of the files.

- Changed default address to 127.0.0.1
- Fix zoom issue and now default value is 4.
- Lexicographical order of defaultProjectConfig (visual enhancement)
- Refactoring files:
	- Removing duplicates model & models.
	- Removing duplicates services/utils & utils.
	- New folders for structure.
- Other minor changes

src/configuration/config.yaml

@@ -1,16 +1,4 @@
 email-receiver: librescan@gmail.com
-scantailor:
-  l: 1.5
-  margins-left: 2.5
-  margins-right: 2.5
-  margins-top: 2.5
-  margins-bottom: 2.5
-  dewarping: auto
-  despeckle: off
-  dpi-x: 300
-  dpi-y: 300
-  threshold: 0
-  color-mode: black_and_white
 project:
   path: /home/sd/LibreScanProjects
   last-id: 1

src/configuration/defaultProjectConfig.yaml

@@ -1,25 +1,25 @@
 camera:
-  zoom: 10
   iso: 0
   last-pic-number: 0
+  zoom: 0
+general-info:
+  description: description
+  name: name
+  output-formats:
+  - pdfbeads
 scantailor:
+  color-mode: black_and_white
+  despeckle: off
+  dewarping: auto
+  dpi-x: 300
+  dpi-y: 300
   l: 1.5
+  margins-bottom: 2.5
   margins-left: 2.5
   margins-right: 2.5
   margins-top: 2.5
-  margins-bottom: 2.5
-  dewarping: auto
-  despeckle: off
-  dpi-x: 300
-  dpi-y: 300
   threshold: 0
-  color-mode: black_and_white
 tesseract:
-  lang: spa
-  output-format: hocr
   input-extension: tif
-general-info:
-  name: name
-  description: description
-  output-formats:
-  - pdfbeads
+  lang: spa
+  output-format: hocr

src/models/cameraConfig.py

@@ -3,3 +3,12 @@ class CameraConfig:
     def __init__(self, p_zoom, p_iso):
         self.zoom = p_zoom
         self.iso = p_iso
+        '''
+        self.focus_distance = p_focusDistance
+        self.shutter_speed = p_shutterSpeed
+        self.dpi = p_dpi
+        self.sensibility = p_sensibility
+        self.raw = p_raw
+        self.monochromatic = p_monochromatic
+        self.flip = p_flip
+        '''

src/models/mail.py

@@ -2,6 +2,6 @@ class Mail:
 
     def __init__(self, p_name, p_sender, p_phone, p_msg):
         self.name = p_name
-        self.sender_mail = p_sender
+        self.sender = p_sender
         self.phone = p_phone
         self.msg = p_msg

src/services/mailService.py

@@ -7,7 +7,7 @@ class MailService(metaclass=Singleton):
     server = "localhost"
 
     def get_email_receiver(self):
-        return "melvin.aep@hotmail.com"
+        return "librescan@gmail.com"
 
     # Formats the mail msg with the sender information and the body msg.
     def prepare_msg(self, p_name, p_msg, p_phone, p_from):
@@ -16,7 +16,6 @@ def prepare_msg(self, p_name, p_msg, p_phone, p_from):
         Tel: %s
         Cuerpo del mensaje: %s
         """ % (p_name, p_from, p_phone, p_msg)
-        print(msg)
         return msg
 
     def send(self, mail):

src/services/outputService.py

@@ -1,5 +1,5 @@
-from utils.pdfBeads import PDFBeads
-from utils.outputPreparer import OutputPreparer
+from utils.output.impl.pdfBeads import PDFBeads
+from utils.output.outputPreparer import OutputPreparer
 from patterns.singleton import Singleton
 import threading
 

src/services/projectService.py

@@ -8,6 +8,7 @@
 
 
 class ProjectService(metaclass=Singleton):
+
     def __init__(self):
         self.config_folder = os.environ["HOME"] + "/.librescan"
         self.project_path = None
@@ -24,6 +25,7 @@ def create(self, p_project):
         # Creates the project config template with default values.
         src = self.config_folder + "/defaultProjectConfig.yaml"
         destiny = new_project_path + "/.projectConfig.yaml"
+
         os.system("cp " + src + " " + destiny)
         os.system("touch " + new_project_path + "/.pics.ls")
         os.system("touch " + new_project_path + "/.toDelete.ls")
@@ -56,7 +58,6 @@ def remove(self, p_id):
     def load(self, p_project_path):
         self.project_path = p_project_path
         pics_file = self.project_path + '/.pics.ls'
-        print(pics_file)
         f = open(pics_file, "r")
         contents = f.readlines()
         f.close()

src/services/queueService.py

@@ -1,5 +1,5 @@
-from queue import Queue
 import threading
+from queue import Queue
 from patterns.singleton import Singleton
 
 

src/services/scannerService.py

@@ -4,7 +4,7 @@
 
 from models.cameraConfig import CameraConfig
 from patterns.singleton import Singleton
-from utils.chdkptpPT import ChdkptpPT
+from utils.camera.impl.chdkptpPT import ChdkptpPT
 from jpegtran import JPEGImage
 
 
@@ -46,6 +46,7 @@ def take_pictures(self):
         try:
             self.rotate_photos(pic_names[0], pic_names[1])
         except:
+            print("Exception while rotating pictures.")
             return -1
         return pic_names
 
@@ -69,7 +70,7 @@ def rotate_photos(self, p_left_photo, p_right_photo):
             except:
                 print('Pictures not found yet')
                 time.sleep(0.5)
-                if tries > 5:
+                if tries > 20:
                     raise Exception
             tries += 1
 

src/utils/__init__.py

@@ -1 +0,0 @@
-

src/services/utils/chdkptp.py → src/utils/camera/impl/chdkptp.py

@@ -2,9 +2,10 @@
 import subprocess
 from subprocess import call
 from model.camera import Camera
+from utils.cameraDriver import CameraDriver
 
 
-class Chdkptp:
+class Chdkptp(CameraDriver):
 
     # chdk_path to CHDKPTP
     global chdk_path

src/utils/chdkptpPT.py → src/utils/camera/impl/chdkptpPT.py

@@ -1,10 +1,8 @@
 import re
 from subprocess import check_output
 from time import sleep
-
 from pexpect import spawn as shell
-
-from utils.cameraDriver import CameraDriver
+from utils.camera.cameraDriver import CameraDriver
 
 
 class ChdkptpPT(CameraDriver):
@@ -19,7 +17,7 @@ def detect(self):
     def prepare(self, p_cam_config):
         zoom = p_cam_config.zoom
         self.rec_mode()
-        self.set_quality()
+        # self.set_quality()
         self.set_zoom(zoom)
         self.calibrate()
 
@@ -57,9 +55,9 @@ def devices_list(self):
 
     def rec_mode(self):
         self._execute('rec')
-        print("Se puso en rec")
 
     def shoot(self, p_save_path, p_pic_names):
+        # remoteshoot /home/user/lsp00001 -tv=1/25 -sv=80
         cams = self.cams
         cams['right'].sendline('remoteshoot {0}{1} -tv=1/25 -sv={2}'.format(p_save_path, p_pic_names[0], str(80)))
         cams['left'].sendline('remoteshoot {0}{1} -tv=1/25 -sv={2}'.format(p_save_path, p_pic_names[1], str(80)))
@@ -79,11 +77,10 @@ def connect(self, p_cam_info):
         cam.sendline('download orientation.txt /tmp/')
         cam.expect('A/.*', timeout=5)
 
-        print(cam.after.decode())
-
-        orientation = check_output('cat /tmp/orientation.txt', shell=True).decode()
+        orientation = check_output('cat /tmp/orientation.txt', shell=True).decode().strip()
         self.cams[orientation] = cam
 
+    # Figure out why is affecting a2200
     def set_quality(self):
         cams = self.cams
         command = ("luar props=require('propcase'); "
@@ -99,15 +96,12 @@ def set_quality(self):
     def _cameras_wait(self):
         cams = self.cams
         for cam in cams:
-            cams[cam].expect('con .*> ', timeout=5)
+            cams[cam].expect('con .*> ', timeout=10)
 
     def _execute(self, command):
         cams = self.cams
         if not cams:
-            print ('excepcion')
             raise Exception
-
-        print ('sigue')
         for cam in cams:
             cams[cam].sendline(command)
         self._cameras_wait()

src/utils/pdfBeads.py → src/utils/output/impl/pdfBeads.py

@@ -1,7 +1,5 @@
-import os
 import subprocess
-
-from utils.outputMaker import OutputMaker
+from utils.output.outputMaker import OutputMaker
 
 
 class PDFBeads(OutputMaker):