Merge lp:~lynx333/cairo-dock-plug-ins-extras/HDDtemperature into lp:~cairo-dock-team/cairo-dock-plug-ins-extras/third-party

[Reali$t]

This applet implements HDD temperature monitoring

[Matthieu Baerts (matttbe)]

Hello Reali$t and thank you for this merge proposal!

But... there is no change between your branch and the main branch :)
Don't hesitate to have a look to this wiki page: http://www.glx-dock.org/ww_page.php?p=Help%20us%20with%20BZR&lang=en#8-The%20use%20of%20bazaar

So if you want to add a file or directory, launch this command:
  cd cairo-dock-plug-ins-extras
  bzr add SOMETHING

If you want to check if you've added all files and edit the right files:
  bzr status
  bzr cdiff

If you want to "commit" (create a new revision)
  bzr commit -m "My applet: Doing something"

If you want to "push" (upload your branch to a server)
  bzr push lp:~lynx333/cairo-dock-plug-ins-extras/HDDtemperature

Please post a new comment after that ;)

review: Needs Fixing

[Reali$t (lynx333)]

> But... there is no change between your branch and the main branch :)

Hello, Matthieu,

I apologize for the inconvenience, it's my first trial of using Launchpad :)

Many thanks for your detailed instructions, I hope everything is ok now
http://bazaar.launchpad.net/~lynx333/cairo-dock-plug-ins-extras/HDDtemperature/files/head:/HDDtemperature/

Regards

[Matthieu Baerts (matttbe)]

Thank you for sharing this new applet ;)

review: Approve

[lp:~lynx333/cairo-dock-plug-ins-extras/HDDtemperature]

201. By Reali$t on 2011-09-16

HDDtemp: 'no refresh' bug fixed

[Matthieu Baerts (matttbe)]

Hello

If there is any new revisions after the merge of your branch, can you re-submit this merge proposal? There is a "Resubmit proposal" button on this page or you can start a new one ;)

I guess I can add your rev 201 on the main branch. Thank you

=== added directory 'HDDtemperature'
=== added file 'HDDtemperature/HDDtemperature'
--- HDDtemperature/HDDtemperature	1970-01-01 00:00:00 +0000
+++ HDDtemperature/HDDtemperature	2011-09-16 16:54:24 +0000
@@ -0,0 +1,21 @@
+#!/usr/bin/python
+
+# This is a part of the external demo applet for Cairo-Dock
+# Copyright : (C) 2010-2011 by Nochka85, Fabounet and atttbe
+# E-mail : [e-mail]
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# ERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# http://www.gnu.org/licenses/licenses.html#GPL
+
+from CDBashApplet import CDBashApplet
+
+if __name__ == '__main__':
+	CDBashApplet().run()
 
=== added file 'HDDtemperature/HDDtemperature.conf'
--- HDDtemperature/HDDtemperature.conf	1970-01-01 00:00:00 +0000
+++ HDDtemperature/HDDtemperature.conf	2011-09-16 16:54:24 +0000
@@ -0,0 +1,114 @@
+#!en;0.0.1
+
+#[gtk-about]
+[Icon]
+#j+[0;128] Desired icon size for this applet
+#{Set to 0 to use the default applet size}
+icon size = 0;0
+
+#s Name of the icon as it will appear in its label in the dock :
+name = HDD temperature
+
+#S+ Image's filename :
+#{Let empty to use the default one.}
+icon = 
+
+#d Name of the dock it belongs to:
+dock name = 
+
+order=
+
+#F[Applet's Handbook]
+frame_hand=
+#A
+handbook=HDDtemperature
+
+#[gtk-convert]
+[Desklet]
+
+#j+[48;512] Desklet's dimension (width x height) :
+#{Depending on your WindowManager, you can resize it with ALT + middle_click or ALT + left_click for exemple.}
+size = 96;96
+
+#i[-2048;2048] Desklet's position (x ; y) :
+#{Depending on your WindowManager, you can move it with ALT + left_click}
+x position=0
+#i[-2048;2048] ...
+y position=0
+
+#b Is detached from the dock ?
+initially detached=false
+#l[Normal;Keep above;Keep below;On Widget Layer;Reserve space] Accessibility :
+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
+accessibility=0
+#b Should be visible on all desktops ?
+sticky=true
+
+#b Lock position ?
+#{If locked, the desklet can't be moved by simply dragging it with the left mouse button. Of course you can still move it with ALT + left_click.}
+locked = false
+
+#I[-180;180] Rotation :
+#{in degrees.}
+rotation = 0
+
+use size=
+
+#F[Decorations;gtk-orientation-portrait]
+frame_deco=
+
+#o+ Choose a decoration theme for this desklet :
+#{Choose the 'personnal' one to define your own decorations below.}
+decorations = default
+
+#v
+sep_deco =
+
+#S+ Background image :
+#{It's an image that will be displayed below the drawings, like a frame for exemple. Let empty to not use any.}
+bg desklet =
+#e+[0;1] Background tansparency :
+bg alpha = 1
+#i+[0;256] Left offset :
+#{in pixels. Use this to adjust the left position of the drawings.}
+left offset = 0
+#i+[0;256] Top offset :
+#{in pixels. Use this to adjust the top position of the drawings.}
+top offset = 0
+#i+[0;256] Right offset :
+#{in pixels. Use this to adjust the right position of the drawings.}
+right offset = 0
+#i+[0;256] Bottom offset :
+#{in pixels. Use this to adjust the bottom position of the drawings.}
+bottom offset = 0
+#S+ Foreground image :
+#{It's an image that will be displayed above the drawings, like a reflect for exemple. Let empty to not use any.}
+fg desklet =
+#e+[0;1] Foreground tansparency :
+fg alpha = 1
+
+#[gtk-preferences]
+[Configuration]
+
+#s One or more device drive path to monitor:
+para_hdds = /dev/sda /dev/sdb /dev/sdc /dev/sdd
+
+#b Show maximum temperature on icon?
+para_show = true
+
+#i[1;15] Time interval for checking (minutes):
+para_time = 3
+
+#i[20;180] Alert temperature value (°C by default)
+#{It should conform to units used by hddtemp daemon}
+para_alert = 55
+
+#i[0;900] Pop up bubble duration (in seconds)
+#{0 for permanent show}
+para_dur = 5
+
+#i[1024;65535] Port number to listen to hddtemp daemon (7634 by default)
+para_port = 7634
+
+#s Separator between fields used by hddtemp daemon ( | by default)
+para_sep = |
 
=== added file 'HDDtemperature/HDDtemperature.sh'
--- HDDtemperature/HDDtemperature.sh	1970-01-01 00:00:00 +0000
+++ HDDtemperature/HDDtemperature.sh	2011-09-16 16:54:24 +0000
@@ -0,0 +1,140 @@
+#!/bin/bash
+
+# This is a part of the external applets for Cairo-Dock
+#
+# Copyright : (C) 2010-2011 by Nochka85
+#                      modified by matttbe for the new API
+#                      modified by Fabounet for the new interface
+# E-mail : [e-mail]
+#
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# ERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# http://www.gnu.org/licenses/licenses.html#GPL
+
+### This is a part of the external applet HDDtemperature for cairo-dock
+### Author : Reali$t
+### Rev : 14 sep 2011
+
+. /usr/share/cairo-dock/plug-ins/Dbus/CDBashApplet.sh $*
+
+#############################################################################################################
+
+is_daemon()
+{
+if [ -z `pidof hddtemp` ]; then
+  call ShowDialog "string:\"'hddtemp' daemon is not running!\r Type in terminal to run it:\r service hddtemp start\"" "int32:0"
+  call SetQuickInfo "string:"
+  return 1
+fi
+}
+
+#############################################################################################################
+
+on_click()
+{
+
+is_daemon
+ret_val=$?
+if [ "$ret_val" -ne "0" ]; then
+  exit
+fi
+
+DURATION=`get_conf_param "para_dur"`
+
+FULL_INFO=`cat store | tr '\n' "\r "`
+
+call ShowDialog "string:'$FULL_INFO'" "int32:$DURATION"
+}
+
+#############################################################################################################
+
+begin()
+{
+  is_daemon
+  ret_val=$?
+  if [ "$ret_val" -ne "0" ]; then
+    exit
+  fi
+
+HDDS=`get_conf_param "para_hdds"`
+SHOW_ICON=`get_conf_param "para_show"`
+TIME_INT=`get_conf_param "para_time"`
+ALERT_LEVEL=`get_conf_param "para_alert"`
+HDDT_port=`get_conf_param "para_port"`
+SEPARATOR=`get_conf_param "para_sep"`
+SEPARATOR=${SEPARATOR:0:1}
+
+  HDTEMP=$(ncat localhost $HDDT_port | awk -F $SEPARATOR -v HDDS_awk="$HDDS" '{
+    if (NF<5) exit;                # 5 fields per device
+    T=0
+    for(i=0;(i<=NF-5);i+=5) {
+      if (HDDS_awk ~ $(i+2)) {
+        string_awk=string_awk $(i+2) " ("$(i+3)"): " $(i+4) "°" $(5) FS
+        if (T<$(i+4)) T=$(i+4)      # max temperature will be shown
+      }
+    }
+    string_awk=string_awk T
+    print string_awk
+  }')
+
+  set -- "$HDTEMP"
+  IFS="$SEPARATOR"
+  declare -a Array=($*)
+  len_Array=${#Array[@]}
+  let "len_Array-=1"           # numbering from 0
+  unset IFS
+
+  if [ $SHOW_ICON = "true" ]; then
+    call SetQuickInfo "string:'${Array[len_Array]}''°'"
+  fi
+
+  if [ ${Array[len_Array]} -ge $ALERT_LEVEL ]; then
+    call Animate "string:fire" "int32:900"
+  else
+    call Animate "string:fire" "int32:0"
+  fi
+
+  cp /dev/null store
+  for i in "${Array[@]:0:$len_Array}"; do         # to last-but-one (before temperature)
+    echo "$i" >> store
+  done
+
+  echo  "dbus-send --session --dest=org.cairodock.CairoDock /org/cairodock/CairoDock
+         org.cairodock.CairoDock.ReloadModule string:HDDtemperature" \
+        | at now + $TIME_INT min                  # refresh in background
+}
+
+#############################################################################################################
+
+end()
+{
+rm -f store
+}
+
+#############################################################################################################
+
+reload()
+{
+
+SHOW_ICON=`get_conf_param "para_show"`
+
+if [ $SHOW_ICON = "false" ]; then
+  call SetQuickInfo "string:"
+fi
+
+begin
+}
+
+#############################################################################################################
+
+run $*
+
+exit 0
 
=== added file 'HDDtemperature/README'
--- HDDtemperature/README	1970-01-01 00:00:00 +0000
+++ HDDtemperature/README	2011-09-16 16:54:24 +0000
@@ -0,0 +1,43 @@
+HDDtemperature applet for Cairo-Dock shows maximal temperature of your hard disk drives
+getting values from 'hddtemp' daemon (see: man hddtemp )
+
+Author : Reali$t helped by Matttbe and Nochka85's demo script
+E-mail : lynx333[at]mail333.com
+Rev : 14.09.2011
+
+
+INSTALLATION:
+-------------
+
+1) The name of this applet is "HDDtemperature"; it is placed in a folder  "~/.config/cairo-dock/third-party"
+
+So, files in "~/.config/cairo-dock/third-party/HDDtemperature" directory are:
+
+"auto-load.conf"      : the file describing the applet
+"icon"                : the default icon of the applet
+"HDDtemperature"      : the python script, without extension
+"HDDtemperature.sh"   : the script in bash, actually applet's code
+"HDDtemperature.conf" : the config file of the applet
+"preview"             : a preview of the applet
+
+
+2) Make the files "HDDtemperature" and "HDDtemperature.sh" executable:
+
+   chmod a+x ~/.config/cairo-dock/third-party/HDDtemperature/HDDtemperature
+
+   chmod a+x ~/.config/cairo-dock/third-party/HDDtemperature/HDDtemperature.sh
+
+
+3) Check whether 'hddtemp' daemon is running:
+
+   ps -f -C hddtemp
+
+If no, start it:
+
+   service hddtemp start
+
+(Read more about 'hddtemp' utility in its manual)
+
+
+4) Turn the applet on and customize it (if you wish) in the "System" section of "Configure" menu of Cairo-Dock.
+
 
=== added file 'HDDtemperature/auto-load.conf'
--- HDDtemperature/auto-load.conf	1970-01-01 00:00:00 +0000
+++ HDDtemperature/auto-load.conf	2011-09-16 16:54:24 +0000
@@ -0,0 +1,17 @@
+[Register]
+
+# Author of the applet
+author = Reali$t
+
+# A short description of the applet and how to use it.
+description = This applet shows maximal temperature of your hard disk drives \n getting values from 'hddtemp' daemon (see: man hddtemp). \n Left-click shows more information about HD drives.
+
+# Category of the applet : 2 = files, 3 = internet, 4 = Desktop, 5 = accessory, 6 = system, 7 = fun
+category = 6
+
+# Version of the applet; change it everytime you change something in the config file. Don't forget to update the version both in this file and in the config file.
+version = 0.0.1
+
+# Default icon to use if no icon has been defined by the user. If not specified, or if the file is not found, the "icon" file will be used.
+icon = icon
+
 
=== added file 'HDDtemperature/icon'
 Binary files HDDtemperature/icon	1970-01-01 00:00:00 +0000 and HDDtemperature/icon	2011-09-16 16:54:24 +0000 differ
=== added file 'HDDtemperature/preview'
 Binary files HDDtemperature/preview	1970-01-01 00:00:00 +0000 and HDDtemperature/preview	2011-09-16 16:54:24 +0000 differ