Skip to content

Commit

Permalink
Merge pull request #242 from tarasfrompir/master
Browse files Browse the repository at this point in the history 
Доработано очистку мусора из системы
  • Loading branch information
@T-REX-XP
T-REX-XP committed Aug 14, 2018
2 parents ba5612a + f6ac7da commit b860cd4
Show file tree
Hide file tree
Showing 6 changed files with 58 additions and 23 deletions.
4 changes: 4 additions & 0 deletions modules/ssdp_finder/extended_modules.php
View file
@@ -0,0 +1,4 @@
<?php
$modules= array(
'YeelightSmartBulb'=>'Yeelight',
);
42 changes: 32 additions & 10 deletions modules/ssdp_finder/ssdp_devices_clear_trash.inc.php
View file
Expand Up @@ -44,16 +44,38 @@
SQLExec("DELETE FROM devices WHERE TYPE='controllee'");
SQLExec("DELETE FROM devices WHERE TYPE='YeelightSmartBulb'");

// delete all objects from database
SQLExec("DELETE FROM objects WHERE TITLE LIKE 'MediaServer%'");
SQLExec("DELETE FROM objects WHERE TITLE LIKE 'dial%'");
SQLExec("DELETE FROM objects WHERE TITLE LIKE 'Basic%'");
SQLExec("DELETE FROM objects WHERE TITLE LIKE 'DigitalSecurityCamera%'");
SQLExec("DELETE FROM objects WHERE TITLE LIKE 'InternetGatewayDevice%'");
SQLExec("DELETE FROM objects WHERE TITLE LIKE 'MediaRenderer%'");
SQLExec("DELETE FROM objects WHERE TITLE LIKE 'BinaryLight%'");
SQLExec("DELETE FROM objects WHERE TITLE LIKE 'controllee%'");
SQLExec("DELETE FROM objects WHERE TITLE LIKE 'YeelightSmartBulb%'");

// delete all values from database
SQLExec("DELETE FROM pvalues WHERE PROPERTY_NAME LIKE 'MediaServer'");
SQLExec("DELETE FROM pvalues WHERE PROPERTY_NAME LIKE 'dial'");
SQLExec("DELETE FROM pvalues WHERE PROPERTY_NAME LIKE 'Basic'");
SQLExec("DELETE FROM pvalues WHERE PROPERTY_NAME LIKE 'DigitalSecurityCamera'");
SQLExec("DELETE FROM pvalues WHERE PROPERTY_NAME LIKE 'InternetGatewayDevice'");
SQLExec("DELETE FROM pvalues WHERE PROPERTY_NAME LIKE 'MediaRenderer'");
SQLExec("DELETE FROM pvalues WHERE PROPERTY_NAME LIKE 'BinaryLight'");
SQLExec("DELETE FROM pvalues WHERE PROPERTY_NAME LIKE 'controllee'");
SQLExec("DELETE FROM pvalues WHERE PROPERTY_NAME LIKE 'YeelightSmartBulb'");
SQLExec("DELETE FROM pvalues WHERE PROPERTY_NAME LIKE 'MediaServer%'");
SQLExec("DELETE FROM pvalues WHERE PROPERTY_NAME LIKE 'dial%'");
SQLExec("DELETE FROM pvalues WHERE PROPERTY_NAME LIKE 'Basic%'");
SQLExec("DELETE FROM pvalues WHERE PROPERTY_NAME LIKE 'DigitalSecurityCamera%'");
SQLExec("DELETE FROM pvalues WHERE PROPERTY_NAME LIKE 'InternetGatewayDevice%'");
SQLExec("DELETE FROM pvalues WHERE PROPERTY_NAME LIKE 'MediaRenderer%'");
SQLExec("DELETE FROM pvalues WHERE PROPERTY_NAME LIKE 'BinaryLight%'");
SQLExec("DELETE FROM pvalues WHERE PROPERTY_NAME LIKE 'controllee%'");
SQLExec("DELETE FROM pvalues WHERE PROPERTY_NAME LIKE 'YeelightSmartBulb%'");
SQLExec("DELETE FROM pvalues WHERE PROPERTY_NAME=''");

SQLExec("DELETE FROM cached_values WHERE KEYWORD LIKE 'MJD:MediaServer%'");
SQLExec("DELETE FROM cached_values WHERE KEYWORD LIKE 'MJD:dial%'");
SQLExec("DELETE FROM cached_values WHERE KEYWORD LIKE 'MJD:Basic%'");
SQLExec("DELETE FROM cached_values WHERE KEYWORD LIKE 'MJD:DigitalSecurityCamera%'");
SQLExec("DELETE FROM cached_values WHERE KEYWORD LIKE 'MJD:InternetGatewayDevice%'");
SQLExec("DELETE FROM cached_values WHERE KEYWORD LIKE 'MJD:MediaRenderer'%");
SQLExec("DELETE FROM cached_values WHERE KEYWORD LIKE 'MJD:BinaryLight%'");
SQLExec("DELETE FROM cached_values WHERE KEYWORD LIKE 'MJD:controllee%'");
SQLExec("DELETE FROM cached_values WHERE KEYWORD LIKE 'MJD:YeelightSmartBulb%'");

// delete all filles from module

Expand Down Expand Up @@ -143,4 +165,4 @@ function deleteDirectory($dir) {
}

return rmdir($dir);
}
}
12 changes: 9 additions & 3 deletions modules/ssdp_finder/ssdp_devices_scan.inc.php
View file
Expand Up @@ -41,6 +41,7 @@ function Scan(){
$result = [];
$table_name='ssdp_devices';

include_once(DIR_MODULES.'ssdp_finder/extended_modules.php');
foreach ($everything as $deviceInfo) {

// если устройство yeelight
Expand Down Expand Up @@ -71,6 +72,7 @@ function Scan(){
"MANUFACTURER" => 'Yeelight',//Manufacturer
"SERVICES"=> 'RGBWSmartLight',//list services of device
"CONTROLADDRESS"=> $control_url,//list services of device
"EXTENDED_MODULES"=>$modules['YeelightSmartBulb'],
];
$_SESSION[$uuid] = $logo;
//session_write_close();
Expand Down Expand Up @@ -115,8 +117,11 @@ function Scan(){
if (!$device["modelDescription"]){
$descript = $deviceInfo["server"];
}



// ned for chek device type
$device_type = explode(":", $device["deviceType"])[3];//DeviceType


if (!array_search_result($result, 'UUID', $uuid) && !is_null($uuid) && !($existed)) {

$result[] = [
Expand All @@ -126,7 +131,7 @@ function Scan(){
"UUID" => $uuid,
"LOGO" => $logo,//Logo
"DESCRIPTION" => $descript, //description get from xml or field "server"
"TYPE" => explode(":", $device["deviceType"])[3],//DeviceType
"TYPE" => $device_type,//DeviceType
"SERIAL" => $serialnumber, //serialnumber
"MANUFACTURERURL" => $device["manufacturerURL"],//manufacturer url
"UPDATED" => '',
Expand All @@ -135,6 +140,7 @@ function Scan(){
"MANUFACTURER" => $device["manufacturer"],//Manufacturer
"SERVICES"=> getServices($device),//list services of device
"CONTROLADDRESS"=> $control_url,//list services of device
"EXTENDED_MODULES"=>$modules[$device_type],
];
$_SESSION[$uuid] = $logo;
//session_write_close();
Expand Down
6 changes: 5 additions & 1 deletion templates/ssdp_finder/action_admin.html
View file
Expand Up @@ -12,7 +12,11 @@
&nbsp;&nbsp;&nbsp;
<a href="#" class="btn btn-default" onClick="$('#api_settings').toggle();return false;">
<i class="glyphicon glyphicon-cog"></i> <#LANG_SETUP#></a>

<a class="btn btn-default" href="?view_mode=clear_trash" onClick="return confirm('Are you sure? Please confirm.')">
<i class="glyphicon glyphicon-trash"></i>
Очистка ВСЕХ данных и мусора модуля
</a>

</div>

<!-- Modal -->
Expand Down
13 changes: 8 additions & 5 deletions templates/ssdp_finder/ssdp_devices_scan.html
View file
Expand Up @@ -100,13 +100,16 @@ <h4 class="list-group-item-heading">
<td style="vertical-align:middle" width="1%" nowrap>
<div style="width:120px">
<div class="btn-group">[#if ID=""#]

<a href="?data_source=<#DATA_SOURCE#>&mode=add&view_mode=edit_ssdp_devices&title=[#TITLE#]&type=[#TYPE#]&uuid=[#UUID#]&services=[#SERVICES#]&address=[#ADDRESS#]&description=[#DESCRIPTION#]&model=[#MODEL#]&manufacturer=[#MANUFACTURER#]&controladdress=[#CONTROLADDRESS#]"
class="btn btn-success" title="Добавить Модуль для этого устройства">
[#if EXTENDED_MODULES!=""#]
<a onClick="return confirm('Are you sure? Please confirm.')"
href="?md=market&inst=adm&mode=iframe&mode2=install&name=[#EXTENDED_MODULES#]"
class="btn btn-success" title="Добавить Модуль для этого устройства">
<i class="glyphicon glyphicon-compressed"></i>
</a>
<a href="?data_source=<#DATA_SOURCE#>&mode=add&view_mode=edit_ssdp_devices&title=[#TITLE#]&type=[#TYPE#]&uuid=[#UUID#]&services=[#SERVICES#]&address=[#ADDRESS#]&description=[#DESCRIPTION#]&model=[#MODEL#]&manufacturer=[#MANUFACTURER#]&controladdress=[#CONTROLADDRESS#]"
class="btn btn-success" title="Добавить как простое устройство">
[#endif#]
<a onClick="return confirm('Are you sure? Please confirm.')"
href="?data_source=<#DATA_SOURCE#>&mode=add&view_mode=edit_ssdp_devices&title=[#TITLE#]&type=[#TYPE#]&uuid=[#UUID#]&services=[#SERVICES#]&address=[#ADDRESS#]&description=[#DESCRIPTION#]&model=[#MODEL#]&manufacturer=[#MANUFACTURER#]&controladdress=[#CONTROLADDRESS#]"
class="btn btn-success" title="Добавить как простое устройство">
<i class="glyphicon glyphicon-sd-video"></i>
</a>
[#else#]
Expand Down
4 changes: 0 additions & 4 deletions templates/ssdp_finder/ssdp_devices_search_admin.html
View file
Expand Up @@ -10,10 +10,6 @@
<i class="glyphicon glyphicon-search"></i>
<#LANG_RESCAN_DEVICES#>
</a>
<a class="btn btn-default" href="?view_mode=clear_trash">
<i class="glyphicon glyphicon-trash"></i>
Очистка ВСЕХ данных и мусора модуля
</a>
</p>
<table width=100% border=0>
<tr>
Expand Down

0 comments on commit b860cd4

Please sign in to comment.