Load Protocolhash from PerlModule instead from textfile

CHANGED

@@ -1,3 +1,6 @@
+25.02.2019
+ 00_SIGNALduino: change: load protocolData from another PerlModule instead of
+                         a text file. Fixes update via svn 
 24.02.2019
  00_SIGNALduino: feature: last bit of transmission is tried to be reconstructed
                           if there is enough data available

FHEM/00_SIGNALduino.pm

@@ -29,7 +29,7 @@ eval "use Time::HiRes qw(gettimeofday);1" ;
 
 
 use constant {
-	SDUINO_VERSION            => "v3.4.0-dev_18.02",
+	SDUINO_VERSION            => "v3.4.0-dev_25.02",
 	SDUINO_INIT_WAIT_XQ       => 1.5,       # wait disable device
 	SDUINO_INIT_WAIT          => 2,
 	SDUINO_INIT_MAXRETRY      => 3,
@@ -252,7 +252,7 @@ SIGNALduino_Initialize($)
 
   #ours %attr{};
 
-  %ProtocolListSIGNALduino = SIGNALduino_LoadProtocolHash("$attr{global}{modpath}/FHEM/lib/signalduino_protocols.hash");
+  %ProtocolListSIGNALduino = SIGNALduino_LoadProtocolHash("$attr{global}{modpath}/FHEM/lib/signalduino_protocols.pm");
   if (exists($ProtocolListSIGNALduino{error})  ) {
   	Log3 "SIGNALduino", 1, "Error loading Protocol Hash. Module is in inoperable mode error message:($ProtocolListSIGNALduino{error})";
   	delete($ProtocolListSIGNALduino{error});
@@ -275,25 +275,19 @@ our $FW_detail;
 # First Parameter is for filename (full or relativ path) to be loaded
 #
 # returns a hash with protocols if loaded without error. Returns a hash with {eror} => errormessage if there was an error
-
-sub SIGNALduino_LoadProtocolHash($)
-{
 
+sub SIGNALduino_LoadProtocolHash($)
+{	
 	if (! -e $_[0]) {
 		return %{ {"error" => "File does not exsits"}};
 	}
-
-	my $protocol_data = do {
-	open my $fh, '<', $_[0] ;
-		local $/; # Undefine $/ for this scope...
-   		<$fh>;    # so <> slurps up the entire file
-	};
-
-	my %evalret= eval $protocol_data ;
-	if (!%evalret) {
-		return %{ {"error" => $@}};
-	} 
-	return %evalret;
+	use Symbol 'delete_package';
+	delete_package 'SD_Protocols';
+	delete($INC{$_[0]});
+	if(  ! eval { require "$_[0]"; 1 }  ) {
+		return 	%{ {"error" => $@}};
+	}	
+	return  %{SD_Protocols->getProtocolList};
 }
 
 
@@ -369,6 +363,7 @@ SIGNALduino_Define($$)
   $hash->{LASTDMSG} = "nothing";
   $hash->{TIME}=time();
   $hash->{versionmodul} = SDUINO_VERSION;
+  $hash->{versionProtocols} =SD_Protocols->VERSION();
   #notifyRegexpChanged($hash,"^$name$:^opened\$");  # Auf das Event opened der eigenen Definition reagieren
   #notifyRegexpChanged($hash,"sduino:opened");  # Auf das Event opened der eigenen Definition reagieren
   #$hash->{NOTIFYDEV}="$name";

Makefile

@@ -1,16 +1,14 @@
 /opt/fhem/FHEM/%.pm: FHEM/%.pm
 	sudo cp $< $@ 
-/opt/fhem/FHEM/lib/%.hash: FHEM/lib/%.hash
-	sudo cp $< $@ 
 98_UnitTest.pm: test/98_unittest.pm
 	sudo cp $< /opt/fhem/FHEM/$@
 
 ## deploylocal: /opt/fhem/FHEM/00_SIGNALduino.pm /opt/fhem/FHEM/10_FS10.pm /opt/fhem/FHEM/14_SD_WS.pm 98_UnitTest.pm /opt/fhem/FHEM/90_SIGNALduino_un.pm /opt/fhem/FHEM/lib/signalduino_protocols.hash
 deploylocal : 98_UnitTest.pm
 	sudo cp FHEM/*.pm /opt/fhem/FHEM/
-	sudo cp FHEM/lib/*.hash /opt/fhem/FHEM/lib
-	sudo cp test/*.hash /opt/fhem/FHEM/lib
+	sudo cp FHEM/lib/*.pm /opt/fhem/FHEM/lib
 	sudo cp test/*.json /opt/fhem/FHEM/lib
+	sudo cp test/*.pm /opt/fhem/FHEM/lib
 	sudo timeout 3 killall -qws2 perl || sudo killall -qws9 perl || true
 	sudo rm /opt/fhem/log/fhem-*.log || true
 	sudo cp test/fhem.cfg /opt/fhem/fhem.cfg

controls_signalduino.txt

@@ -1,4 +1,4 @@
-UPD 2019-02-24_23:32:15 198612  FHEM/00_SIGNALduino.pm
+UPD 2019-02-25_20:52:07 198607  FHEM/00_SIGNALduino.pm
 UPD 2017-06-23_17:43:38 14541   FHEM/10_FS10.pm
 UPD 2016-09-18_21:22:06 10111   FHEM/14_BresserTemeo.pm
 UPD 2018-11-11_22:35:33 13616   FHEM/14_FLAMINGO.pm
@@ -14,7 +14,7 @@ UPD 2019-02-12_21:37:35 14297   FHEM/14_SD_WS_Maverick.pm
 UPD 2019-02-12_21:37:35 50246   FHEM/14_SD_WS.pm
 UPD 2018-07-04_21:56:16 37910   FHEM/41_OREGON.pm
 UPD 2019-02-24_22:56:57 17027   FHEM/90_SIGNALduino_un.pm
-UPD 2019-02-24_23:32:15 119622  FHEM/lib/signalduino_protocols.hash
+UPD 2019-02-25_00:33:04 122030  FHEM/lib/signalduino_protocols.pm
 MOV FHEM/firmware/SIGNALduino_nano328.hex unused
 MOV FHEM/firmware/SIGNALduino_nanoCC1101.hex unused
 MOV FHEM/firmware/SIGNALduino_promini328.hex unused

test/test_MS_2-definition.txt

@@ -3,7 +3,7 @@ defmod test_MS_2 UnitTest dummyDuino (
 	my $mock = Mock::Sub->new;
 	my $SD_Dispatch = $mock->mock("SIGNALduno_Dispatch");
 
-	my %ProtocolListTest =  SIGNALduino_LoadProtocolHash("$attr{global}{modpath}/FHEM/lib/test_loadprotohash-ok.hash");
+	my %ProtocolListTest =  SIGNALduino_LoadProtocolHash("$attr{global}{modpath}/FHEM/lib/test_loadprotohash-ok.pm");
 	my $local_ProtocolListSIGNALduino = SIGNALduino_getProtocolList();
 	%{$local_ProtocolListSIGNALduino} = ( %ProtocolListTest);
 
@@ -26,5 +26,8 @@ defmod test_MS_2 UnitTest dummyDuino (
           };
         }
     }
+	CommandReload(undef,"00_SIGNALduino.pm");
+	SIGNALduino_IdList("x:$target","","","");  
+
  }
 );

test/test_defineDefaults-definition.txt

@@ -1,16 +1,17 @@
 defmod test_defineDefaults UnitTest dummyDuino (
  {
 	CommandDefMod(undef,"-temporary testDuino SIGNALduino none");
- 	
+
 
  	subtest 'Check internal defaults ' => sub {
-		plan tests => 4;
+		plan tests => 5;
 		my $name ="testDuino";
 
 	 	is(InternalVal($name,"DeviceName", undef),"none","check DeviceName");
 	 	is(InternalVal($name,"DMSG", undef),"nothing","check DMSG");
 	 	is(InternalVal($name,"LASTDMSG", undef),"nothing","check LASTDMSG");
 	 	is(InternalVal($name,"versionmodul", undef),SDUINO_VERSION,"check versionmodul");
+	 	is(InternalVal($name,"versionProtocols", undef),SD_Protocols->VERSION(),"check versionProtocols");
 	}; 
 
  };

test/test_developid_1-definition.txt

@@ -1,7 +1,7 @@
 defmod test_developid_1 UnitTest dummyDuino (
  { 
 
-	my %ProtocolListTest =  SIGNALduino_LoadProtocolHash("$attr{global}{modpath}/FHEM/lib/test_loadprotohash-ok.hash");
+	my %ProtocolListTest =  SIGNALduino_LoadProtocolHash("$attr{global}{modpath}/FHEM/lib/test_loadprotohash-ok.pm");
 	is($ProtocolListTest{error},undef,"load test protocol hash ");
 
 

test/test_loadprotohash-definition.txt

@@ -1,12 +1,16 @@
 defmod test_loadprotohash UnitTest dummyDuino 
 (
  {
+    plan tests => 3;
     my %ret= SIGNALduino_LoadProtocolHash("dummy.hash");
     ok(exists($ret{error}),"check wrong filename");
-
-    %ret= SIGNALduino_LoadProtocolHash("$attr{global}{modpath}/FHEM/lib/test_loadprotohash-ok.hash");
-    is($ret{error},undef,"check filename and syntax ok ");
 
-    %ret= SIGNALduino_LoadProtocolHash("$attr{global}{modpath}/FHEM/lib/test_loadprotohash-nok.hash");
+    %ret= SIGNALduino_LoadProtocolHash("$attr{global}{modpath}/FHEM/lib/test_loadprotohash-ok.pm");
+    is($ret{error},undef,"check filename and syntax ok ");
+
+    %ret= SIGNALduino_LoadProtocolHash("$attr{global}{modpath}/FHEM/lib/test_loadprotohash-nok.pm");
     ok(exists($ret{error}),"check filename and syntax not ok "); }
+
+    CommandReload(undef,"00_SIGNALduino.pm");
+    SIGNALduino_IdList("x:$target","","","");  
 );

test/test_loadprotohash-nok.hash → test/test_loadprotohash-nok.pm

@@ -1,4 +1,6 @@
-(
+package SD_Protocols;
+{ 
+	my %signalduino_protocols = (
     "9999"    => 
         {
             name			=> 'Unittest MS Protocol',		
@@ -7,4 +9,6 @@
         },
 
 
-);
+	);
+	sub getProtocolList	{	return \%signalduino_protocols;	}
+}