From 70df74cecf9ad25f402aea3e2b30f0d85139f40b Mon Sep 17 00:00:00 2001
From: Tobias <privat@t-kurze.de>
Date: Fri, 3 May 2019 18:40:43 +0200
Subject: [PATCH] updated recorder model

---
 .idea/backend.iml        |   2 +-
 .idea/misc.xml           |   2 +-
 .idea/workspace.xml      | 123 ++++++++++++++++++++++++++-------------
 api/recorder_api.py      |   4 +-
 app.db                   | Bin 167936 -> 167936 bytes
 models/recorder_model.py |   3 +
 6 files changed, 88 insertions(+), 46 deletions(-)

diff --git a/.idea/backend.iml b/.idea/backend.iml
index e2503eb..dd8c9ae 100644
--- a/.idea/backend.iml
+++ b/.idea/backend.iml
@@ -17,7 +17,7 @@
   </component>
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Pipenv (backend)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TemplatesService">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0284675..890219e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,5 +3,5 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (wassS_backend-Ko2xORm-) (2)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Pipenv (backend)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fb9e5c2..4703e77 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="dbc2bdbd-c8f7-46d2-961a-6a2b77f8f4c5" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/backend.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/backend.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/api/recorder_api.py" beforeDir="false" afterPath="$PROJECT_DIR$/api/recorder_api.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app.db" beforeDir="false" afterPath="$PROJECT_DIR$/app.db" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/models/recorder_model.py" beforeDir="false" afterPath="$PROJECT_DIR$/models/recorder_model.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -12,12 +16,12 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file pinned="false" current-in-tab="true">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/api/recorder_api.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="414">
-              <caret line="23" column="59" selection-start-line="23" selection-start-column="59" selection-end-line="23" selection-end-column="59" />
+            <state relative-caret-position="309">
+              <caret line="24" column="75" selection-start-line="24" selection-start-column="75" selection-end-line="24" selection-end-column="75" />
               <folding>
                 <element signature="e#267#310#0" expanded="true" />
               </folding>
@@ -28,17 +32,29 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/models/room_model.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="450">
+            <state relative-caret-position="375">
               <caret line="33" column="8" selection-start-line="33" selection-start-column="8" selection-end-line="33" selection-end-column="8" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/models/recorder_model.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="810">
-              <caret line="52" column="8" selection-start-line="52" selection-start-column="8" selection-end-line="52" selection-end-column="8" />
+            <state relative-caret-position="313">
+              <caret line="51" column="26" selection-start-line="51" selection-start-column="4" selection-end-line="51" selection-end-column="26" />
+              <folding>
+                <element signature="e#60#71#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/__init__.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="135">
+              <caret line="15" selection-start-line="15" selection-end-line="15" />
             </state>
           </provider>
         </entry>
@@ -46,8 +62,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/api/room_api.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1332">
-              <caret line="80" column="27" selection-start-line="80" selection-start-column="27" selection-end-line="80" selection-end-column="27" />
+            <state relative-caret-position="43">
+              <caret line="70" column="78" selection-start-line="70" selection-start-column="78" selection-end-line="70" selection-end-column="78" />
               <folding>
                 <element signature="e#267#310#0" expanded="true" />
               </folding>
@@ -55,8 +71,18 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/__main__.py">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
     </leaf>
   </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>port</find>
+    </findStrings>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -65,6 +91,7 @@
       <list>
         <option value="$PROJECT_DIR$/api/room_api.py" />
         <option value="$PROJECT_DIR$/api/recorder_api.py" />
+        <option value="$PROJECT_DIR$/models/recorder_model.py" />
       </list>
     </option>
   </component>
@@ -79,6 +106,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -91,11 +119,15 @@
               <item name="backend" type="462c0819:PsiDirectoryNode" />
               <item name="api" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="backend" type="b2602c69:ProjectViewProjectNode" />
+              <item name="backend" type="462c0819:PsiDirectoryNode" />
+              <item name="models" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -150,21 +182,15 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="14572000" />
+    <option name="totallyTimeSpent" value="15694000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="3840" y="146" width="1200" height="1894" extended-state="6" />
+    <frame x="0" y="0" width="1680" height="1050" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Favorites" side_tool="true" />
       <window_info content_ui="combo" id="Project" order="0" weight="0.25" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Docker" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Database Changes" />
-      <window_info anchor="bottom" id="Version Control" />
-      <window_info anchor="bottom" id="Python Console" />
-      <window_info anchor="bottom" id="Terminal" />
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
@@ -172,35 +198,55 @@
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="right" id="SciView" />
-      <window_info anchor="right" id="Database" />
+      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="8" />
+      <window_info anchor="bottom" id="Database Changes" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="Python Console" order="11" />
+      <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" />
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="SciView" order="3" />
+      <window_info anchor="right" id="Database" order="4" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="com.intellij.coverage.CoverageDataManagerImpl">
+    <SUITE FILE_PATH="coverage/backend$backend.coverage" NAME="backend Coverage Results" MODIFIED="1556810339611" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
+  </component>
   <component name="editorHistoryManager">
-    <entry file="file://$USER_HOME$/.virtualenvs/wassS_backend-Ko2xORm-/lib/python3.7/site-packages/flask_restplus/fields.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2368">
-          <caret line="364" column="8" selection-start-line="364" selection-start-column="8" selection-end-line="364" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$USER_HOME$/.virtualenvs/wassS_backend-Ko2xORm-/lib/python3.7/site-packages/flask_restplus/fields.py" />
     <entry file="file://$PROJECT_DIR$/models/room_model.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
+        <state relative-caret-position="375">
           <caret line="33" column="8" selection-start-line="33" selection-start-column="8" selection-end-line="33" selection-end-column="8" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/api/room_api.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1332">
-          <caret line="80" column="27" selection-start-line="80" selection-start-column="27" selection-end-line="80" selection-end-column="27" />
+        <state relative-caret-position="43">
+          <caret line="70" column="78" selection-start-line="70" selection-start-column="78" selection-end-line="70" selection-end-column="78" />
+          <folding>
+            <element signature="e#267#310#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="15" selection-start-line="15" selection-end-line="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/api/recorder_api.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="309">
+          <caret line="24" column="75" selection-start-line="24" selection-start-column="75" selection-end-line="24" selection-end-column="75" />
           <folding>
             <element signature="e#267#310#0" expanded="true" />
           </folding>
@@ -209,17 +255,10 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/models/recorder_model.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="810">
-          <caret line="52" column="8" selection-start-line="52" selection-start-column="8" selection-end-line="52" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/api/recorder_api.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="23" column="59" selection-start-line="23" selection-start-column="59" selection-end-line="23" selection-end-column="59" />
+        <state relative-caret-position="313">
+          <caret line="51" column="26" selection-start-line="51" selection-start-column="4" selection-end-line="51" selection-end-column="26" />
           <folding>
-            <element signature="e#267#310#0" expanded="true" />
+            <element signature="e#60#71#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/api/recorder_api.py b/api/recorder_api.py
index d4796b4..09f6c23 100644
--- a/api/recorder_api.py
+++ b/api/recorder_api.py
@@ -20,8 +20,8 @@ recorder_model = api_recorder.model('Recorder', {
     'description': fields.String(required=False, description='The recorder\'s description'),
     'ip': fields.String(required=False, description='The recorder\'s IP address'),
     'network_name': fields.String(required=False, description='The recorder\'s network name'),
-    'ssh_port': fields.Integer(required=True, default=443, description='The recorder\'s SSH port number'),
-    'telnet_port': fields.Integer(required=True, default=23, description='The recorder\'s telned port number'),
+    'ssh_port': fields.Integer(required=True, default=22, description='The recorder\'s SSH port number'),
+    'telnet_port': fields.Integer(required=True, default=23, description='The recorder\'s telnet port number'),
     'use_telnet_instead_ssh': fields.Boolean(required=False, default=False,
                                              description='If this is set, telnet will be used instead of ssh. '
                                                          'This might require specific commands.'),
diff --git a/app.db b/app.db
index 589aa59764df980b32819779af054a924d923df2..273a3570860a563976984bc2d2a21f4607d0afb9 100644
GIT binary patch
delta 1458
zcmcJPZ)_7~7{K4>`u46pd$;S@_1g8{yOp(_8JpW=MnV`}Qx&(h32Y=lTsK{fBe-H$
z<BT7mV+Q%4vb+gzLI`e)A(0pY?M6FF{KE%K#02@GiIDiw?@JJqEs?u!RWOK1;BwD%
z_x!mhchB#+=kTm}cvd{_25rU@RW;Q5JTW7Lpk_tah}5h|{Y;q!O|=Ml;g~Rths@u>
z&v-K&f*|^7X0D5i*RyaLJm99p)B!FwSq4AU>xPGZYI1YCo$P~4&;Txaom1(@oZmUU
z&mm~43dda8k=GBT-knHg4AF|pWq66>LK?eKh9GuMy;;Xjeg!R{7Do6jU{-l;*CuAq
zgOiqoMwer1P^r}UP^#3)q|<L3VlN)O2oYdEmcc6-j%25y>q50gT@RB>AeuIW>=jF_
zB(xj4@Qd&Vw!Uu`wC*;@+3Ao}Pwz-7@Klm}=%92+%n_5I?a_m=O0Xo`>9j63IY3MD
z7BPpowP*d6@b5MiOnMtMdPc6Ln<Y|MmTka!9eD*GEMR5TpC88LzMJl<CoxZy6SIJA
z4h|uCSx!qotaET3;rH_Gyaj)Thd5N_fO59)XXZLK#Orx2q(XXZd^9yVHi?k1m!9W*
z;L)4k3I7vR1R)+j2vl@uEHV%y1CgG-7%|X2jOfeUKfqzfePCY%cD)R~|0EUon^f(?
z$Zv<jP2tW{1zB7^2Q^Rt<xhW?WI2r#bQ@V$t)E+aEi0BYeA?1&I?8Y3CG#!rDy+h@
z^0#`zy~pjDxv#m-Ap5ld9k@A{*vQlc2ttT$U4XL?V81PZ4}y$e)U8H#VG-(}iCtZU
zFUa&xpP+fY@X>o~GoN}Rof%DKGV9j{w*Nd_>(ZGdv#A5)scdp=d?K3~8BI=1yhVBv
ziN07QPU49H5+CgAYaya_J?&sRlV$oRsTMsk`Ip7|m%z%lU4T!*(N|*8UK0M7(mUcL
z{9FrZZ*FGtC4C88S%NSYo7);#IuA{@&gu(pY$I!)j;bfn<~Ka8xbaB8hkaRsSHVYH
zt!~CjU@r!iU^noud3o)fUgOtqpdRjpXZ&IlvKS5B<)-I2@_6H2T{JEyLip5!=G<6F
lPilNak1)Q`sjW?HE)N94#VdJm!-;PI8w;X)epsoV<SrnNsC)nb

delta 2230
zcmcIlT})F~96$eaE^TkWP79P$3bcTwBT8vYFVM!Rg{c!~bPn8uo1?B>(#Y2?Wtn?X
za35LXgX}Ili4Ti&$u`Nd2g%~YUQA{-=Mu>b$&!%~9_AFILr^MAhdcLH5X|Nt%zEy<
z{h$BW{ePX`J$%A=_=NG88>FGq7Kela!B`$b2<Tn@M5XkurJdQ%g0mo`KTd{q2J$=s
z{3ULKIhY%<+g=3xvWvy%;U!YC$EgfJ1r)RM3lPCC6tOSn!3$3I!#vc3gZ(uRrBKAW
z7NC?hEI<(yvK<TH;S$bjEPi`$zTW9@!27ODVt;3<zb_@LcfrUsY{g1KU&c!Q1fx(m
z_?k^g2<yOpX7n6H0dKUkj&rbK<QM(CU>rbsdgsPE81N|L<`PA*IzXqocPeMCVP%Kq
z5I#thF>`~GZ>>^lEnYI<#mcCqMMqk8Z;rPqLzXh-rp2yovDS>tTFrpn^t4UrHDEf9
z=nXo~GajWO8y1ky(!8y?_PO0Hwe37gI|#_X%!wzv(%nX0K1?SNou(7q>=LcC5g)8H
z!ZzX;ml&GONt^d{htQz|dK}T?-0B!Tlmt8X<Z?=CKM;zGan#ncKb`2?-Y>tE%4lTZ
zfJ$#Vkj?~B$^LLK6s-+LYQvH@R3DQXW1*%%FdC5>!v7+PN|G8a(0hnqtA8V2+ay&Z
zAOwjIwRmjPkFc*IdX=*$Xr+@#;y(qJGrxoA9j<qS78r<A)UwD4vWRB6;5s#m#3kmE
z<Q4hoEC^<*A4k?%>rTtq<LB`k(3vmf{r>uP*6|&<lu3huy_ba|W!hlUh$o#=^93RF
z-&2}bXubf$?EF1g`@hfWnc0g#K{7NWCu&7jX5C|&H;tO!FjX6WG9EOXGPLS?3@-gm
z{r7oa3BL*X_+#=bYQ<f6JvI%+3ynuMROy{%W$^A!HgpRdP|ZHS1wXPIS#YuQ--1_J
zs~1`69JI5(JMgq%tf{MJo3h|D*UPC_d*ozFuBr3oIN>GEQ*~=pPC)PvuCHL{7C8*8
zIdgdt+@Pzk)H%0SsNE@M1v5}2_y%@*S?vr|LltYAfno5l`!i4um8^UghKtHIP#Ang
z1BKq6zKnWTu!&hXRXo^UqDkMeXi~YSr%S!dM!dQ>Kp7iYgbKE65%P%FU#jg4VO7E7
zcdNT<Q#qe&gF5dIFia>pvZI*ES!m_66A<0(XqNYHDhqo6KM}eq9r|(&zg&fn!MQDX
z3C)E3M_}$lEN~F&Mf6kJ%g;!X9tvSSiu;hov3#f-yrFQcJ`#(B1Hq<XQ?yY|^mlo?
z(it!BOJ|}pu@|^Wl|SlRVG?YL1w*k=FwhtdMw+BdPiJRJ_Ntb0raL3^OM9dfsdOSE
zr@GVqnS|V(%9JJ3vdVjSsfQTTNkk{<3=eUPu2TVTWenI#syHw#zaeLF4bf|Knp<$>
z5C{Sd7FWGIr*{R>oAe6T8>b}(;s7-xOo>li8H8m7cHQ@!?67^%p%!co(YsXrPEAp#
zfQbm001-7D!}PW)yv>DIX{AmO0WcN>Q4}roC{JV`qF>W}*3C<c>(yBW`ZKzu*lib8
zqMs8j;dMkragRlvq7`Kg@tR5;djr8pLpU1BB)c<7xjUKRS~WwT_!8SNw{m+#kAI~V
zZ-!JKi$nvFNTgAc`g577mb~~W-U-g(wdX`qrL=v@Nau4OnhARS;o{-GNd+!?mPh%_
zCQcNoAzFwBmV+TC;)Vw=!Ca^v1tb3iU^<296#avaEiLZuGw$vlD(0Bc%>PSNZ>xT4
w?}+AqDNNO;kn?vL(aXHeqf3kXJE{3|4#f*X+@E`uFKweav=cw9N>_9GH)MZmasU7T

diff --git a/models/recorder_model.py b/models/recorder_model.py
index 94a3f11..033f410 100644
--- a/models/recorder_model.py
+++ b/models/recorder_model.py
@@ -47,6 +47,9 @@ class Recorder(db.Model):
     room = db.relationship('Room', uselist=False, back_populates='recorder')  # one-to-one relation (uselist=False)
     ip = db.Column(db.String(15), unique=True, nullable=True, default=None)
     network_name = db.Column(db.String(127), unique=True, nullable=True, default=None)
+    telnet_port = db.Column(db.Integer, unique=False, nullable=False, default=23)
+    ssh_port = db.Column(db.Integer, unique=False, nullable=False, default=22)
+    use_telnet_instead_ssh = db.Column(db.Boolean, nullable=False, default=False)
     recorder_model_id = db.Column(db.Integer, db.ForeignKey('recorder_model.id'))
     recorder_model = db.relationship('RecorderModel', back_populates='recorders')