roku_ip_tagger.git

@@ -1,3 +1,3 @@

 ip_tagger.zip

-settings.brs

+settings.xml

 .DS_Store

@@ -6,8 +6,8 @@ all: $(ZIPFILE)

 	-F "mysubmit=Install" --output /dev/null --write-out "%{http_code}" \

 	http://$(ROKU_DEV_TARGET)/plugin_install

-$(ZIPFILE):  manifest source/*.brs images/*.png

-	zip $@ manifest source/*.* images/*.*

+$(ZIPFILE):  manifest source/*.brs components/*.xml images/*.png

+	zip $@ manifest source/*.brs components/*.xml images/*.png

 clean:

 	rm $(ZIPFILE)

@@ -1,7 +1,7 @@

 # IP Tagger

-IP Tagger is a test [channel for Roku devices](http://sdkdocs.roku.com/display/sdkdoc/Getting+Started).

-It uses the BrightScript language.

+IP Tagger is a test [channel for Roku devices](https://sdkdocs.roku.com/display/sdkdoc/SceneGraph+Samples).

+It uses SceneGraph and the BrightScript language.

 # Getting the project

@@ -16,9 +16,9 @@ If you're me, and you want to contribute to the repo, then you can clone it like

 # Building it

-In the source directory, move the file "[settings.brs.sample](http://git.dlma.com/roku_ip_tagger.git/blob/master/source/settings.brs.sample)" to "settings.brs" and update its `url` and `auth` fields.

+In the components directory, move the file "[settings.xml.sample](http://git.dlma.com/roku_ip_tagger.git/blob/master/components/settings.xml.sample)" to "settings.xml" and update its `url` and `auth` fields.

-[Ensure you can sideload a dev channel](http://sdkdocs.roku.com/display/sdkdoc/Loading+and+Running+Your+Application+Walkthrough).

+[Ensure you can sideload a dev channel](https://sdkdocs.roku.com/display/sdkdoc/Loading+and+Running+Your+Application).

 Then see the "build\_systems" command in ip\_tagger.sublime-project to see how the channel is zipped and deployed.

 # Corresponding Server Code

@@ -31,8 +31,7 @@ Here's [the corresponding server code](http://git.dlma.com/kvs.git/).

 # To Do

-1. Try the new SDK

-2. Add splash\_screen\_sd keywords to the manifest file.

+1. Replace roDeviceInfo.GetDeviceUniqueId with GetChannelClientId()

 # Licence

@@ -0,0 +1,58 @@

+<?xml version="1.0" encoding="utf-8" ?>

+<component name="IPTagger" extends="Scene">

+  <children>

+    <Label id="title"

+      text="IP Tagger"

+      width="1200"

+      height="100"

+      horizAlign="right"

+      vertAlign="top" />

+    <Label id="updates"

+      text=""

+      width="1200"

+      height="600"

+      horizAlign="left"

+      vertAlign="bottom"

+      wrap="true" />

+    <Timer

+      id = "textTimer"

+      repeat = "true"

+      duration = "4" />

+  </children>

+<script type="text/brightscript" >

+<![CDATA[

+

+  function init()

+    m.title = m.top.findNode("title")

+    m.title.font.size=92

+    m.title.color="0x72D7EEFF"

+    m.title.translation = [40, 20]

+

+    m.updates = m.top.findNode("updates")

+    m.updates.font.size=46

+    m.updates.color="0x62EE97FF"

+    m.updates.translation = [40, 100]

+

+    m.tagTask = CreateObject("roSGNode", "TagTask")

+    m.tagTask.ObserveField("updateText", "onUpdateText")

+    m.tagTask.control = "RUN"

+

+    texttimer = m.top.findNode("textTimer")

+    texttimer.observeField("fire", "timerUpdate")

+    texttimer.control = "start"

+

+    m.top.setFocus(true)

+  end function

+

+  function onUpdateText() as void

+     m.updates.text = m.updates.text + chr(10) + m.tagTask.updateText

+  end function

+

+  sub timerUpdate()

+    ' Not needed, but nice to have as an example.

+    ' print "timerUpdate called."

+  end sub

+

+]]>

+</script>

+</component>

@@ -0,0 +1,7 @@

+<?xml version="1.0" encoding="utf-8" ?>

+<component name="Settings">

+  <interface>

+    <field id="url" type="string" value="https://yourdomain.com"/>

+    <field id="auth" type="string" value="yourauthorizationhere"/>

+  </interface>

+</component>

@@ -0,0 +1,65 @@

+<?xml version="1.0" encoding="utf-8" ?>

+

+<component name="TagTask" extends="Task">

+

+<interface>

+  <field id="updateText" type="string" value="Tagging from TagTask"/>

+</interface>

+<children>

+  <Settings id="MySettings" />

+</children>

+

+<script type="text/brightscript" >

+<![CDATA[

+

+sub init()

+    m.top.functionName = "executeTask"

+    m.settings = m.top.findNode("MySettings")

+end sub

+

+function executeTask() as void

+    m.port = CreateObject("roMessagePort")

+

+    deviceInfo = CreateObject("roDeviceInfo")

+    deviceID = deviceInfo.GetDeviceUniqueId()

+    aaIPAddrs = deviceInfo.GetIPAddrs()

+

+    for each key in aaIPAddrs

+        ipAddr = aaipAddrs[key]

+        if ipAddr <> invalid and ipAddr.Len() > 0

+            ' m.top.updateText = key + " = " + ipAddr

+        end if

+    end for

+

+    sendRequest(ipAddr, deviceID)

+end function

+

+sub sendRequest(ipAddr as String, deviceID as String)

+    request = CreateObject("roUrlTransfer")

+    request.SetCertificatesFile("common:/certs/ca-bundle.crt")

+    request.SetPort(m.port)

+    request.SetUrl(m.settings.url)

+    params = deviceID+"="+ipAddr+"&auth="+m.settings.auth

+    m.top.updateText = "Tagging "+ipAddr+" for "+deviceID+"..."

+    if request.AsyncPostFromString(params)

+        print "Request was sent!"

+    endif

+

+    while true

+        msg = wait(0, m.port)

+        if type(msg) = "roUrlEvent"

+            if msg.GetInt() = 1

+                if msg.GetResponseCode() = 200

+                    m.top.updateText = "Success!" + chr(10) + "You can get this device's IP address with:"

+                    m.top.updateText = m.settings.url+"?k="+deviceID

+                else

+                    m.top.updateText = "It didn't work. Got code " + str(msg.GetResponseCode())

+                endif

+            endif

+        end if

+    end while

+end sub

+

+]]>

+</script>

+</component>

@@ -1,7 +1,7 @@

 title=IP Tagger

-major_version=1

+major_version=2

 minor_version=0

-build_version=5

+build_version=0

 mm_icon_focus_hd=pkg:/images/mm_icon_focus_hd.png

 mm_icon_focus_sd=pkg:/images/mm_icon_focus_sd.png

 splash_screen_hd=pkg:/images/splash_screen_hd.png

@@ -1,66 +1,19 @@

-sub RunUserInterface(params As Object)

-    if params.contentID <> invalid

-        contentID = params.contentID

-    else

-        contentID = ""

-    end if

-

-    if params.options <> invalid

-        options = params.options

-    else

-        options = ""

-    end if

-

-    showScreen(contentID, options)

-end sub

-

-

-sub showScreen(contentID As String, options As String)

-    screen = CreateObject("roParagraphScreen")

-    port = CreateObject("roMessagePort")

-    screen.SetMessagePort(port)

-

-    deviceInfo = CreateObject("roDeviceInfo")

-    deviceID = deviceInfo.GetDeviceUniqueId()

-    aaIPAddrs = deviceInfo.GetIPAddrs()

-

-    screen.SetTitle("IP Tagger")

-    for each key in aaIPAddrs

-	    ipAddr = aaipAddrs[key]

-	    if ipAddr <> invalid and ipAddr.Len() > 0

-	        screen.addParagraph(key + " = " + ipAddr)

-        end if

-    end for

-

-    settings = GetSettings()

-

-    request = CreateObject("roUrlTransfer")

-    request.SetCertificatesFile("common:/certs/ca-bundle.crt")

-    request.SetPort(port)

-    request.SetUrl(settings.url)

-    params = deviceID+"="+ipAddr+"&auth="+settings.auth

-    screen.addParagraph("Tagging "+ipAddr+" for "+deviceID+"...")

-    if request.AsyncPostFromString(params)

-        print "Post was sent!"

-    endif

-    screen.Show()

-

-    while true

-        msg = wait(0, port)

-        if type(msg) = "roParagraphScreenEvent"

-            if msg.isScreenClosed()

-              exit while

-            end if

-        else if type(msg) = "roUrlEvent"

-            if msg.GetInt() = 1

-                if msg.GetResponseCode() = 200

-                    screen.addParagraph("Success! You can get this device's IP address from the following URL:")

-                    screen.addParagraph(settings.url+"?k="+deviceID)

-                else

-                    screen.addParagraph("It didn't work. Got code " + str(msg.GetResponseCode()))

-                endif

-            endif

+sub Main()

+    ' Indicate this is a Roku SceneGraph application'

+    screen = CreateObject("roSGScreen")

+    m.port = CreateObject("roMessagePort")

+    screen.SetMessagePort(m.port)

+

+    ' Create a scene and load /components/iptagger.xml'

+    m.scene = screen.CreateScene("IPTagger")

+    screen.show()

+

+    while(true)

+        msg = wait(0, m.port)

+        msgType = type(msg)

+        if msgType = "roSGScreenEvent"

+            if msg.isScreenClosed() then return

         end if

     end while

-    screen.Close() ' Wonder if this is needed

 end sub

+

@@ -1,9 +0,0 @@

-Function GetSettings() As Object

-    this = {

-        url:  "https://yourdomain.com"             

-        auth: "yourauthorizationhere" 

-    }

-        

-    return this

-End Function

-