add archive path and name as sv_preferences member (#2139)

* add archive path and name as sv_preferences member * adds npanel feature to datetime node for getting true Integer from a value that appears to be a float

add archive path and name as sv_preferences member (#2139)
* add archive path and name as sv_preferences member * adds npanel feature to datetime node for getting true Integer from a value that appears to be a float
dd3e23f0 · Dealga McArdle · GitHub · aa502c5a · dd3e23f0 · dd3e23f0
--- a/nodes/text/datetime_strings.py
+++ b/nodes/text/datetime_strings.py
@@ -8,6 +8,7 @@
 import datetime

 import bpy
+from bpy.props import StringProperty, BoolProperty

 from sverchok.node_tree import SverchCustomTreeNode
 from sverchok.data_structure import updateNode, match_long_repeat
@@ -72,15 +73,17 @@ class SvDatetimeStrings(bpy.types.Node, SverchCustomTreeNode):
        texts[doc_name].from_string(reference_table)


-    date_pattern = bpy.props.StringProperty(default="%m/%d/%Y", description="date formatting information", name="Date Time String Formatter")
-    time_offset = bpy.props.StringProperty(default="01/01/2018", description="for graphing purposes you might need to subtract a start date", name='offset')
-    make_reference = bpy.props.BoolProperty(name="Make Reference in Texts", update=show_short_reference)
+    date_pattern = StringProperty(default="%m/%d/%Y", description="date formatting information", name="Date Time String Formatter")
+    time_offset = StringProperty(default="01/01/2018", description="for graphing purposes you might need to subtract a start date", name='offset')
+    make_reference = BoolProperty(name="Make Reference in Texts", update=show_short_reference)

-    calc_subordinal = bpy.props.BoolProperty(
+    calc_subordinal = BoolProperty(
        name="Subordinal", 
        description="produces the ordinal with a subordinal - useful for timeseries with sub day precision"
    )

+    float_to_int = BoolProperty(name="Float to Int")
+
    def sv_init(self, context):
        self.inputs.new("StringsSocket", "times")
        self.inputs.new("StringsSocket", "time offset").prop_name="time_offset"
@@ -92,6 +95,7 @@ class SvDatetimeStrings(bpy.types.Node, SverchCustomTreeNode):

    def draw_buttons_ext(self, context, layout):
        layout.prop(self, "make_reference")
+        layout.prop(self, "float_to_int")

    def sub_ordinal(self, value):
        stamp = datetime.datetime.strptime(value, self.date_pattern)
@@ -120,6 +124,7 @@ class SvDatetimeStrings(bpy.types.Node, SverchCustomTreeNode):
            VC = []
            ordinal_offset = datetime.datetime.strptime(offset[0], self.date_pattern).toordinal()
            for value in V:
+                value = value if not self.float_to_int else str(int(value))
                t = datetime.datetime.strptime(value, self.date_pattern).toordinal()
                m = t - ordinal_offset
                if self.calc_subordinal:

--- a/settings.py
+++ b/settings.py
@@ -208,6 +208,12 @@ class SverchokPreferences(AddonPreferences):
    log_buffer_name = StringProperty(name = "Buffer name", default = "sverchok.log")
    log_file_name = StringProperty(name = "File path", default = os.path.join(datafiles, "sverchok.log"))

+
+    # updating sverchok
+    dload_archive_name = StringProperty(name="archive name", default="master")
+    dload_archive_path = StringProperty(name="archive path", default="https://github.com/nortikin/sverchok/archive/")
+
+
    def draw(self, context):

        layout = self.layout

--- a/utils/sv_update_utils.py
+++ b/utils/sv_update_utils.py
@@ -137,6 +137,12 @@ class SverchokCheckForUpgradesSHA(bpy.types.Operator):
        return {'FINISHED'}


+def get_archive_path():
+    from sverchok.utils.context_managers import sv_preferences
+    with sv_preferences() as prefs:
+        return prefs.dload_archive_path, prefs.dload_archive_name
+
+
 class SverchokUpdateAddon(bpy.types.Operator):
    """ Update Sverchok addon. After completion press F8 to reload addons or restart Blender """
    bl_idname = "node.sverchok_update_addon"
@@ -153,15 +159,20 @@ class SverchokUpdateAddon(bpy.types.Operator):
        wm.progress_begin(0, 100)
        wm.progress_update(20)

+        dload_archive_path, dload_archive_name = get_archive_path()
+
        try:
-            branch_name = 'master'
+            branch_name = dload_archive_name or 'master'
+            branch_origin = dload_archive_path or 'https://github.com/nortikin/sverchok/archive/'
            zipname = '{0}.zip'.format(branch_name)
-            url = 'https://github.com/nortikin/sverchok/archive/' + zipname
+            url = branch_origin + zipname
+
            to_path = os.path.normpath(os.path.join(os.curdir, zipname))
            file = urllib.request.urlretrieve(url, to_path)
            wm.progress_update(50)
-        except:
+        except Exception as err:
            self.report({'ERROR'}, "Cannot get archive from Internet")
+            print(err)
            wm.progress_end()
            return {'CANCELLED'}