summarylogtreecommitdiffstats
path: root/remove.updater.patch
blob: a1f6a0a22eecda58404d8beb4af81001bfef5c9b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
diff --git a/__init__.py b/__init__.py
index 9781923..eed0f02 100644
--- a/__init__.py
+++ b/__init__.py
@@ -34,8 +34,6 @@ if "bpy" in locals():
     imp.reload(functions)
     imp.reload(operators)
     imp.reload(ui)
-    imp.reload(addon_updater)
-    imp.reload(addon_updater_ops)
 else:
     from . import constants, functions, operators, ui
 
@@ -44,7 +42,6 @@ import os
 import json
 import bgl
 import blf
-from . import addon_updater_ops
 from collections import OrderedDict
 from math import pi, cos, sin, log
 from mathutils import Vector, Matrix
@@ -55,40 +52,6 @@ from bpy.app.handlers import persistent
 class GafferPreferences(bpy.types.AddonPreferences):
     bl_idname = __package__
 
-    # Add-on Updater Prefs
-    auto_check_update: bpy.props.BoolProperty(
-        name="Auto-check for Update",
-        description="If enabled, auto-check for updates using an interval",
-        default=True,
-    )
-    updater_intrval_months: bpy.props.IntProperty(
-        name='Months',
-        description="Number of months between checking for updates",
-        default=0,
-        min=0
-    )
-    updater_intrval_days: bpy.props.IntProperty(
-        name='Days',
-        description="Number of days between checking for updates",
-        default=1,
-        min=0,
-    )
-    updater_intrval_hours: bpy.props.IntProperty(
-        name='Hours',
-        description="Number of hours between checking for updates",
-        default=0,
-        min=0,
-        max=23
-    )
-    updater_intrval_minutes: bpy.props.IntProperty(
-        name='Minutes',
-        description="Number of minutes between checking for updates",
-        default=0,
-        min=0,
-        max=59
-    )
-    updater_expand_prefs: bpy.props.BoolProperty(default=False)
-
     # Add-on Prefs
     show_hdri_list: bpy.props.BoolProperty(
         name="Show",
@@ -184,7 +147,6 @@ class GafferPreferences(bpy.types.AddonPreferences):
         row.alignment = 'RIGHT'
         row.prop(self, 'include_8bit')
 
-        addon_updater_ops.update_settings_ui(self, context)
 
         box = layout.box()
         col = box.column()
@@ -628,7 +590,6 @@ classes = [
 
 
 def register():
-    addon_updater_ops.register(bl_info)
 
     functions.previews_register()
     functions.cleanup_logs()
diff --git a/addon_updater.py b/addon_updater.py
deleted file mode 100644
index 372aa33..0000000
--- a/addon_updater.py
+++ /dev/null
@@ -1,1664 +0,0 @@
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-#  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
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software Foundation,
-#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-
-"""
-See documentation for usage
-https://github.com/CGCookie/blender-addon-updater
-
-"""
-
-import errno
-import ssl
-import urllib.request
-import urllib
-import os
-import json
-import zipfile
-import shutil
-import threading
-import fnmatch
-from datetime import datetime, timedelta
-
-# blender imports, used in limited cases
-import bpy
-import addon_utils
-
-# -----------------------------------------------------------------------------
-# Define error messages/notices & hard coded globals
-# -----------------------------------------------------------------------------
-
-# currently not used
-DEFAULT_TIMEOUT = 10
-DEFAULT_PER_PAGE = 30
-
-
-# -----------------------------------------------------------------------------
-# The main class
-# -----------------------------------------------------------------------------
-
-class Singleton_updater(object):
-	"""
-	This is the singleton class to reference a copy from,
-	it is the shared module level class
-	"""
-	def __init__(self):
-
-		self._engine = GithubEngine()
-		self._user = None
-		self._repo = None
-		self._website = None
-		self._current_version = None
-		self._subfolder_path = None
-		self._tags = []
-		self._tag_latest = None
-		self._tag_names = []
-		self._latest_release = None
-		self._use_releases = False
-		self._include_branches = False
-		self._include_branch_list = ['master']
-		self._include_branch_autocheck = False
-		self._manual_only = False
-		self._version_min_update = None
-		self._version_max_update = (3, 1, 0)
-
-		# by default, backup current addon if new is being loaded
-		self._backup_current = True
-		self._backup_ignore_patterns = None
-
-		# set patterns for what files to overwrite on update
-		self._overwrite_patterns = ["*.py","*.pyc"]
-		self._remove_pre_update_patterns = []
-
-		# by default, don't auto enable/disable the addon on update
-		# as it is slightly less stable/won't always fully reload module
-		self._auto_reload_post_update = False
-
-		# settings relating to frequency and whether to enable auto background check
-		self._check_interval_enable = False
-		self._check_interval_months = 0
-		self._check_interval_days = 7
-		self._check_interval_hours = 0
-		self._check_interval_minutes = 0
-
-		# runtime variables, initial conditions
-		self._verbose = False
-		self._fake_install = False
-		self._async_checking = False  # only true when async daemon started
-		self._update_ready = None
-		self._update_link = None
-		self._update_version = None
-		self._source_zip = None
-		self._check_thread = None
-		self._select_link = None
-		self.skip_tag = None
-
-		# get from module data
-		self._addon = __package__.lower()
-		self._addon_package = __package__  # must not change
-		self._updater_path = os.path.join(os.path.dirname(__file__),
-										self._addon+"_updater")
-		self._addon_root = os.path.dirname(__file__)
-		self._json = {}
-		self._error = None
-		self._error_msg = None
-		self._prefiltered_tag_count = 0
-
-		# UI code only, ie not used within this module but still useful
-		# properties to have
-
-		# to verify a valid import, in place of placeholder import
-		self.showpopups = True # used in UI to show or not show update popups
-		self.invalidupdater = False
-
-		# pre-assign basic select-link function
-		def select_link_function(self, tag):
-			return tag["zipball_url"]
-
-		self._select_link = select_link_function
-
-
-	# -------------------------------------------------------------------------
-	# Getters and setters
-	# -------------------------------------------------------------------------
-
-
-	@property
-	def addon(self):
-		return self._addon
-	@addon.setter
-	def addon(self, value):
-		self._addon = str(value)
-
-	@property
-	def api_url(self):
-		return self._engine.api_url
-	@api_url.setter
-	def api_url(self, value):
-		if self.check_is_url(value) == False:
-			raise ValueError("Not a valid URL: " + value)
-		self._engine.api_url = value
-
-	@property
-	def async_checking(self):
-		return self._async_checking
-
-	@property
-	def auto_reload_post_update(self):
-		return self._auto_reload_post_update
-	@auto_reload_post_update.setter
-	def auto_reload_post_update(self, value):
-		try:
-			self._auto_reload_post_update = bool(value)
-		except:
-			raise ValueError("Must be a boolean value")
-
-	@property
-	def backup_current(self):
-		return self._backup_current
-	@backup_current.setter
-	def backup_current(self, value):
-		if value == None:
-			self._backup_current = False
-			return
-		else:
-			self._backup_current = value
-
-	@property
-	def backup_ignore_patterns(self):
-		return self._backup_ignore_patterns
-	@backup_ignore_patterns.setter
-	def backup_ignore_patterns(self, value):
-		if value == None:
-			self._backup_ignore_patterns = None
-			return
-		elif type(value) != type(['list']):
-			raise ValueError("Backup pattern must be in list format")
-		else:
-			self._backup_ignore_patterns = value
-
-	@property
-	def check_interval(self):
-		return (self._check_interval_enable,
-				self._check_interval_months,
-				self._check_interval_days,
-				self._check_interval_hours,
-				self._check_interval_minutes)
-
-	@property
-	def current_version(self):
-		return self._current_version
-	@current_version.setter
-	def current_version(self, tuple_values):
-		if tuple_values==None:
-			self._current_version = None
-			return
-		elif type(tuple_values) is not tuple:
-			try:
-				tuple(tuple_values)
-			except:
-				raise ValueError(
-				"Not a tuple! current_version must be a tuple of integers")
-		for i in tuple_values:
-			if type(i) is not int:
-				raise ValueError(
-				"Not an integer! current_version must be a tuple of integers")
-		self._current_version = tuple(tuple_values)
-
-	@property
-	def engine(self):
-		return self._engine.name
-	@engine.setter
-	def engine(self, value):
-		if value.lower()=="github":
-			self._engine = GithubEngine()
-		elif value.lower()=="gitlab":
-			self._engine = GitlabEngine()
-		elif value.lower()=="bitbucket":
-			self._engine = BitbucketEngine()
-		else:
-			raise ValueError("Invalid engine selection")
-
-	@property
-	def error(self):
-		return self._error
-
-	@property
-	def error_msg(self):
-		return self._error_msg
-
-	@property
-	def fake_install(self):
-		return self._fake_install
-	@fake_install.setter
-	def fake_install(self, value):
-		if type(value) != type(False):
-			raise ValueError("fake_install must be a boolean value")
-		self._fake_install = bool(value)
-
-	# not currently used
-	@property
-	def include_branch_autocheck(self):
-		return self._include_branch_autocheck
-	@include_branch_autocheck.setter
-	def include_branch_autocheck(self, value):
-		try:
-			self._include_branch_autocheck = bool(value)
-		except:
-			raise ValueError("include_branch_autocheck must be a boolean value")
-
-	@property
-	def include_branch_list(self):
-		return self._include_branch_list
-	@include_branch_list.setter
-	def include_branch_list(self, value):
-		try:
-			if value == None:
-				self._include_branch_list = ['master']
-			elif type(value) != type(['master']) or value==[]:
-				raise ValueError("include_branch_list should be a list of valid branches")
-			else:
-				self._include_branch_list = value
-		except:
-			raise ValueError("include_branch_list should be a list of valid branches")
-
-	@property
-	def include_branches(self):
-		return self._include_branches
-	@include_branches.setter
-	def include_branches(self, value):
-		try:
-			self._include_branches = bool(value)
-		except:
-			raise ValueError("include_branches must be a boolean value")
-
-	@property
-	def json(self):
-		if self._json == {}:
-			self.set_updater_json()
-		return self._json
-
-	@property
-	def latest_release(self):
-		if self._latest_release == None:
-			return None
-		return self._latest_release
-
-	@property
-	def manual_only(self):
-		return self._manual_only
-	@manual_only.setter
-	def manual_only(self, value):
-		try:
-			self._manual_only = bool(value)
-		except:
-			raise ValueError("manual_only must be a boolean value")
-
-	@property
-	def overwrite_patterns(self):
-		return self._overwrite_patterns
-	@overwrite_patterns.setter
-	def overwrite_patterns(self, value):
-		if value == None:
-			self._overwrite_patterns = ["*.py","*.pyc"]
-		elif type(value) != type(['']):
-			raise ValueError("overwrite_patterns needs to be in a list format")
-		else:
-			self._overwrite_patterns = value
-
-	@property
-	def private_token(self):
-		return self._engine.token
-	@private_token.setter
-	def private_token(self, value):
-		if value==None:
-			self._engine.token = None
-		else:
-			self._engine.token = str(value)
-
-	@property
-	def remove_pre_update_patterns(self):
-		return self._remove_pre_update_patterns
-	@remove_pre_update_patterns.setter
-	def remove_pre_update_patterns(self, value):
-		if value == None:
-			self._remove_pre_update_patterns = []
-		elif type(value) != type(['']):
-			raise ValueError("remove_pre_update_patterns needs to be in a list format")
-		else:
-			self._remove_pre_update_patterns = value
-
-	@property
-	def repo(self):
-		return self._repo
-	@repo.setter
-	def repo(self, value):
-		try:
-			self._repo = str(value)
-		except:
-			raise ValueError("User must be a string")
-
-	@property
-	def select_link(self):
-		return self._select_link
-	@select_link.setter
-	def select_link(self, value):
-		# ensure it is a function assignment, with signature:
-		# input self, tag; returns link name
-		if not hasattr(value, "__call__"):
-			raise ValueError("select_link must be a function")
-		self._select_link = value
-
-	@property
-	def stage_path(self):
-		return self._updater_path
-	@stage_path.setter
-	def stage_path(self, value):
-		if value == None:
-			if self._verbose: print("Aborting assigning stage_path, it's null")
-			return
-		elif value != None and not os.path.exists(value):
-			try:
-				os.makedirs(value)
-			except:
-				if self._verbose: print("Error trying to staging path")
-				return
-		self._updater_path = value
-
-	@property
-	def subfolder_path(self):
-		return self._subfolder_path
-	@subfolder_path.setter
-	def subfolder_path(self, value):
-		self._subfolder_path = value
-
-	@property
-	def tags(self):
-		if self._tags == []:
-			return []
-		tag_names = []
-		for tag in self._tags:
-			tag_names.append(tag["name"])
-		return tag_names
-
-	@property
-	def tag_latest(self):
-		if self._tag_latest == None:
-			return None
-		return self._tag_latest["name"]
-
-	@property
-	def update_link(self):
-		return self._update_link
-
-	@property
-	def update_ready(self):
-		return self._update_ready
-
-	@property
-	def update_version(self):
-		return self._update_version
-
-	@property
-	def use_releases(self):
-		return self._use_releases
-	@use_releases.setter
-	def use_releases(self, value):
-		try:
-			self._use_releases = bool(value)
-		except:
-			raise ValueError("use_releases must be a boolean value")
-
-	@property
-	def user(self):
-		return self._user
-	@user.setter
-	def user(self, value):
-		try:
-			self._user = str(value)
-		except:
-			raise ValueError("User must be a string value")
-
-	@property
-	def verbose(self):
-		return self._verbose
-	@verbose.setter
-	def verbose(self, value):
-		try:
-			self._verbose = bool(value)
-			if self._verbose == True:
-				print(self._addon+" updater verbose is enabled")
-		except:
-			raise ValueError("Verbose must be a boolean value")
-
-	@property
-	def version_max_update(self):
-		return self._version_max_update
-	@version_max_update.setter
-	def version_max_update(self, value):
-		if value == None:
-			self._version_max_update = None
-			return
-		if type(value) != type((1,2,3)):
-			raise ValueError("Version maximum must be a tuple")
-		for subvalue in value:
-			if type(subvalue) != int:
-				raise ValueError("Version elements must be integers")
-		self._version_max_update = value
-
-	@property
-	def version_min_update(self):
-		return self._version_min_update
-	@version_min_update.setter
-	def version_min_update(self, value):
-		if value == None:
-			self._version_min_update = None
-			return
-		if type(value) != type((1,2,3)):
-			raise ValueError("Version minimum must be a tuple")
-		for subvalue in value:
-			if type(subvalue) != int:
-				raise ValueError("Version elements must be integers")
-		self._version_min_update = value
-
-	@property
-	def website(self):
-		return self._website
-	@website.setter
-	def website(self, value):
-		if self.check_is_url(value) == False:
-			raise ValueError("Not a valid URL: " + value)
-		self._website = value
-
-
-	# -------------------------------------------------------------------------
-	# Parameter validation related functions
-	# -------------------------------------------------------------------------
-
-
-	def check_is_url(self, url):
-		if not ("http://" in url or "https://" in url):
-			return False
-		if "." not in url:
-			return False
-		return True
-
-	def get_tag_names(self):
-		tag_names = []
-		self.get_tags()
-		for tag in self._tags:
-			tag_names.append(tag["name"])
-		return tag_names
-
-	def set_check_interval(self,enable=False,months=0,days=14,hours=0,minutes=0):
-		# enabled = False, default initially will not check against frequency
-		# if enabled, default is then 2 weeks
-
-		if type(enable) is not bool:
-			raise ValueError("Enable must be a boolean value")
-		if type(months) is not int:
-			raise ValueError("Months must be an integer value")
-		if type(days) is not int:
-			raise ValueError("Days must be an integer value")
-		if type(hours) is not int:
-			raise ValueError("Hours must be an integer value")
-		if type(minutes) is not int:
-			raise ValueError("Minutes must be an integer value")
-
-		if enable==False:
-			self._check_interval_enable = False
-		else:
-			self._check_interval_enable = True
-
-		self._check_interval_months = months
-		self._check_interval_days = days
-		self._check_interval_hours = hours
-		self._check_interval_minutes = minutes
-
-	# declare how the class gets printed
-
-	def __repr__(self):
-		return "<Module updater from {a}>".format(a=__file__)
-
-	def __str__(self):
-		return "Updater, with user: {a}, repository: {b}, url: {c}".format(
-						a=self._user,
-						b=self._repo, c=self.form_repo_url())
-
-
-	# -------------------------------------------------------------------------
-	# API-related functions
-	# -------------------------------------------------------------------------
-
-	def form_repo_url(self):
-		return self._engine.form_repo_url(self)
-
-	def form_tags_url(self):
-		return self._engine.form_tags_url(self)
-
-	def form_branch_url(self, branch):
-		return self._engine.form_branch_url(branch, self)
-
-	def get_tags(self):
-		request = self.form_tags_url()
-		if self._verbose: print("Getting tags from server")
-
-		# get all tags, internet call
-		all_tags = self._engine.parse_tags(self.get_api(request), self)
-		if all_tags is not None:
-			self._prefiltered_tag_count = len(all_tags)
-		else:
-			self._prefiltered_tag_count = 0
-			all_tags = []
-
-		# pre-process to skip tags
-		if self.skip_tag != None:
-			self._tags = [tg for tg in all_tags if self.skip_tag(self, tg)==False]
-		else:
-			self._tags = all_tags
-
-		# get additional branches too, if needed, and place in front
-		# Does NO checking here whether branch is valid
-		if self._include_branches == True:
-			temp_branches = self._include_branch_list.copy()
-			temp_branches.reverse()
-			for branch in temp_branches:
-				request = self.form_branch_url(branch)
-				include = {
-					"name":branch.title(),
-					"zipball_url":request
-				}
-				self._tags = [include] + self._tags  # append to front
-
-		if self._tags == None:
-			# some error occurred
-			self._tag_latest = None
-			self._tags = []
-			return
-		elif self._prefiltered_tag_count == 0 and self._include_branches == False:
-			self._tag_latest = None
-			if self._error == None: # if not None, could have had no internet
-				self._error = "No releases found"
-				self._error_msg = "No releases or tags found on this repository"
-			if self._verbose: print("No releases or tags found on this repository")
-		elif self._prefiltered_tag_count == 0 and self._include_branches == True:
-			if not self._error: self._tag_latest = self._tags[0]
-			if self._verbose:
-				branch = self._include_branch_list[0]
-				print("{} branch found, no releases".format(branch), self._tags[0])
-		elif (len(self._tags)-len(self._include_branch_list)==0 and self._include_branches==True) \
-				or (len(self._tags)==0 and self._include_branches==False) \
-				and self._prefiltered_tag_count > 0:
-			self._tag_latest = None
-			self._error = "No releases available"
-			self._error_msg = "No versions found within compatible version range"
-			if self._verbose: print("No versions found within compatible version range")
-		else:
-			if self._include_branches == False:
-				self._tag_latest = self._tags[0]
-				if self._verbose: print("Most recent tag found:",self._tags[0]['name'])
-			else:
-				# don't return branch if in list
-				n = len(self._include_branch_list)
-				self._tag_latest = self._tags[n]  # guaranteed at least len()=n+1
-				if self._verbose: print("Most recent tag found:",self._tags[n]['name'])
-
-
-	# all API calls to base url
-	def get_raw(self, url):
-		# print("Raw request:", url)
-		request = urllib.request.Request(url)
-		try:
-			context = ssl._create_unverified_context()
-		except:
-			# some blender packaged python versions don't have this, largely
-			# useful for local network setups otherwise minimal impact
-			context = None
-
-		# setup private request headers if appropriate
-		if self._engine.token != None:
-			if self._engine.name == "gitlab":
-				request.add_header('PRIVATE-TOKEN',self._engine.token)
-			else:
-				if self._verbose: print("Tokens not setup for engine yet")
-
-		# run the request
-		try:
-			if context:
-				result = urllib.request.urlopen(request, context=context)
-			else:
-				result = urllib.request.urlopen(request)
-		except urllib.error.HTTPError as e:
-			if str(e.code) == "403":
-				self._error = "HTTP error (access denied)"
-				self._error_msg = str(e.code) + " - server error response"
-				print(self._error, self._error_msg)
-			else:
-				self._error = "HTTP error"
-				self._error_msg = str(e.code)
-				print(self._error, self._error_msg)
-			self._update_ready = None
-		except urllib.error.URLError as e:
-			reason = str(e.reason)
-			if "TLSV1_ALERT" in reason or "SSL" in reason.upper():
-				self._error = "Connection rejected, download manually"
-				self._error_msg = reason
-				print(self._error, self._error_msg)
-			else:
-				self._error = "URL error, check internet connection"
-				self._error_msg = reason
-				print(self._error, self._error_msg)
-			self._update_ready = None
-			return None
-		else:
-			result_string = result.read()
-			result.close()
-			return result_string.decode()
-
-
-	# result of all api calls, decoded into json format
-	def get_api(self, url):
-		# return the json version
-		get = None
-		get = self.get_raw(url)
-		if get != None:
-			try:
-				return json.JSONDecoder().decode(get)
-			except Exception as e:
-				self._error = "API response has invalid JSON format"
-				self._error_msg = str(e.reason)
-				self._update_ready = None
-				print(self._error, self._error_msg)
-				return None
-		else:
-			return None
-
-
-	# create a working directory and download the new files
-	def stage_repository(self, url):
-
-		local = os.path.join(self._updater_path,"update_staging")
-		error = None
-
-		# make/clear the staging folder
-		# ensure the folder is always "clean"
-		if self._verbose: print("Preparing staging folder for download:\n",local)
-		if os.path.isdir(local) == True:
-			try:
-				shutil.rmtree(local)
-				os.makedirs(local)
-			except:
-				error = "failed to remove existing staging directory"
-		else:
-			try:
-				os.makedirs(local)
-			except:
-				error = "failed to create staging directory"
-
-		if error != None:
-			if self._verbose: print("Error: Aborting update, "+error)
-			self._error = "Update aborted, staging path error"
-			self._error_msg = "Error: {}".format(error)
-			return False
-
-		if self._backup_current==True:
-			self.create_backup()
-		if self._verbose: print("Now retrieving the new source zip")
-
-		self._source_zip = os.path.join(local,"source.zip")
-
-		if self._verbose: print("Starting download update zip")
-		try:
-			request = urllib.request.Request(url)
-			context = ssl._create_unverified_context()
-
-			# setup private token if appropriate
-			if self._engine.token != None:
-				if self._engine.name == "gitlab":
-					request.add_header('PRIVATE-TOKEN',self._engine.token)
-				else:
-					if self._verbose: print("Tokens not setup for selected engine yet")
-			self.urlretrieve(urllib.request.urlopen(request,context=context), self._source_zip)
-			# add additional checks on file size being non-zero
-			if self._verbose: print("Successfully downloaded update zip")
-			return True
-		except Exception as e:
-			self._error = "Error retrieving download, bad link?"
-			self._error_msg = "Error: {}".format(e)
-			if self._verbose:
-				print("Error retrieving download, bad link?")
-				print("Error: {}".format(e))
-			return False
-
-
-	def create_backup(self):
-		if self._verbose: print("Backing up current addon folder")
-		local = os.path.join(self._updater_path,"backup")
-		tempdest = os.path.join(self._addon_root,
-						os.pardir,
-						self._addon+"_updater_backup_temp")
-
-		if self._verbose: print("Backup destination path: ",local)
-
-		if os.path.isdir(local):
-			try:
-				shutil.rmtree(local)
-			except:
-				if self._verbose:print("Failed to removed previous backup folder, contininuing")
-
-		# remove the temp folder; shouldn't exist but could if previously interrupted
-		if os.path.isdir(tempdest):
-			try:
-				shutil.rmtree(tempdest)
-			except:
-				if self._verbose:print("Failed to remove existing temp folder, contininuing")
-		# make the full addon copy, which temporarily places outside the addon folder
-		if self._backup_ignore_patterns != None:
-			shutil.copytree(
-				self._addon_root,tempdest,
-				ignore=shutil.ignore_patterns(*self._backup_ignore_patterns))
-		else:
-			shutil.copytree(self._addon_root,tempdest)
-		shutil.move(tempdest,local)
-
-		# save the date for future ref
-		now = datetime.now()
-		self._json["backup_date"] = "{m}-{d}-{yr}".format(
-				m=now.strftime("%B"),d=now.day,yr=now.year)
-		self.save_updater_json()
-
-	def restore_backup(self):
-		if self._verbose: print("Restoring backup")
-
-		if self._verbose: print("Backing up current addon folder")
-		backuploc = os.path.join(self._updater_path,"backup")
-		tempdest = os.path.join(self._addon_root,
-						os.pardir,
-						self._addon+"_updater_backup_temp")
-		tempdest = os.path.abspath(tempdest)
-
-		# make the copy
-		shutil.move(backuploc,tempdest)
-		shutil.rmtree(self._addon_root)
-		os.rename(tempdest,self._addon_root)
-
-		self._json["backup_date"] = ""
-		self._json["just_restored"] = True
-		self._json["just_updated"] = True
-		self.save_updater_json()
-
-		self.reload_addon()
-
-	def unpack_staged_zip(self,clean=False):
-		"""Unzip the downloaded file, and validate contents"""
-		if os.path.isfile(self._source_zip) == False:
-			if self._verbose: print("Error, update zip not found")
-			self._error = "Install failed"
-			self._error_msg = "Downloaded zip not found"
-			return -1
-
-		# clear the existing source folder in case previous files remain
-		outdir = os.path.join(self._updater_path, "source")
-		try:
-			shutil.rmtree(outdir)
-			os.makedirs(outdir)
-			if self._verbose:
-				print("Source folder cleared and recreated")
-		except:
-			pass
-
-		# Create parent directories if needed, would not be relevant unless
-		# installing addon into another location or via an addon manager
-		try:
-			os.mkdir(outdir)
-		except Exception as err:
-			print("Error occurred while making extract dir:")
-			print(str(err))
-			self._error = "Install failed"
-			self._error_msg = "Failed to make extract directory"
-			return -1
-
-		if not os.path.isdir(outdir):
-			print("Failed to create source directory")
-			self._error = "Install failed"
-			self._error_msg = "Failed to create extract directory"
-			return -1
-
-		if self._verbose:
-			print("Begin extracting source from zip:", self._source_zip)
-		zfile = zipfile.ZipFile(self._source_zip, "r")
-
-		if not zfile:
-			if self._verbose:
-				print("Resulting file is not a zip, cannot extract")
-			self._error = "Install failed"
-			self._error_msg = "Resulting file is not a zip, cannot extract"
-			return -1
-
-		# Now extract directly from the first subfolder (not root)
-		# this avoids adding the first subfolder to the path length,
-		# which can be too long if the download has the SHA in the name
-		zsep = '/'  #os.sep  # might just always be / even on windows
-		for name in zfile.namelist():
-			if zsep not in name:
-				continue
-			top_folder = name[:name.index(zsep)+1]
-			if name == top_folder + zsep:
-				continue  # skip top level folder
-			subpath = name[name.index(zsep)+1:]
-			if name.endswith(zsep):
-				try:
-					os.mkdir(os.path.join(outdir, subpath))
-					if self._verbose:
-						print("Extract - mkdir: ", os.path.join(outdir, subpath))
-				except OSError as exc:
-					if exc.errno != errno.EEXIST:
-						self._error = "Install failed"
-						self._error_msg = "Could not create folder from zip"
-						return -1
-			else:
-				with open(os.path.join(outdir, subpath), "wb") as outfile:
-					data = zfile.read(name)
-					outfile.write(data)
-					if self._verbose:
-						print("Extract - create:", os.path.join(outdir, subpath))
-
-		if self._verbose:
-			print("Extracted source")
-
-		unpath = os.path.join(self._updater_path, "source")
-		if not os.path.isdir(unpath):
-			self._error = "Install failed"
-			self._error_msg = "Extracted path does not exist"
-			print("Extracted path does not exist: ", unpath)
-			return -1
-
-		if self._subfolder_path:
-			self._subfolder_path.replace('/', os.path.sep)
-			self._subfolder_path.replace('\\', os.path.sep)
-
-		# either directly in root of zip/one subfolder, or use specified path
-		if os.path.isfile(os.path.join(unpath,"__init__.py")) == False:
-			dirlist = os.listdir(unpath)
-			if len(dirlist)>0:
-				if self._subfolder_path == "" or self._subfolder_path == None:
-					unpath = os.path.join(unpath, dirlist[0])
-				else:
-					unpath = os.path.join(unpath, self._subfolder_path)
-
-			# smarter check for additional sub folders for a single folder
-			# containing __init__.py
-			if os.path.isfile(os.path.join(unpath,"__init__.py")) == False:
-				if self._verbose:
-					print("not a valid addon found")
-					print("Paths:")
-					print(dirlist)
-				self._error = "Install failed"
-				self._error_msg = "No __init__ file found in new source"
-				return -1
-
-		# merge code with running addon directory, using blender default behavior
-		# plus any modifiers indicated by user (e.g. force remove/keep)
-		self.deepMergeDirectory(self._addon_root, unpath, clean)
-
-		# Now save the json state
-		#  Change to True, to trigger the handler on other side
-		#  if allowing reloading within same blender instance
-		self._json["just_updated"] = True
-		self.save_updater_json()
-		self.reload_addon()
-		self._update_ready = False
-		return 0
-
-
-	def deepMergeDirectory(self,base,merger,clean=False):
-		"""Merge folder 'merger' into folder 'base' without deleting existing"""
-		if not os.path.exists(base):
-			if self._verbose:
-				print("Base path does not exist:", base)
-			return -1
-		elif not os.path.exists(merger):
-			if self._verbose:
-				print("Merger path does not exist")
-			return -1
-
-		# paths to be aware of and not overwrite/remove/etc
-		staging_path = os.path.join(self._updater_path,"update_staging")
-		backup_path = os.path.join(self._updater_path,"backup")
-
-		# If clean install is enabled, clear existing files ahead of time
-		# note: will not delete the update.json, update folder, staging, or staging
-		# but will delete all other folders/files in addon directory
-		error = None
-		if clean==True:
-			try:
-				# implement clearing of all folders/files, except the
-				# updater folder and updater json
-				# Careful, this deletes entire subdirectories recursively...
-				# make sure that base is not a high level shared folder, but
-				# is dedicated just to the addon itself
-				if self._verbose: print("clean=True, clearing addon folder to fresh install state")
-
-				# remove root files and folders (except update folder)
-				files = [f for f in os.listdir(base) if os.path.isfile(os.path.join(base,f))]
-				folders = [f for f in os.listdir(base) if os.path.isdir(os.path.join(base,f))]
-
-				for f in files:
-					os.remove(os.path.join(base,f))
-					print("Clean removing file {}".format(os.path.join(base,f)))
-				for f in folders:
-					if os.path.join(base,f)==self._updater_path: continue
-					shutil.rmtree(os.path.join(base,f))
-					print("Clean removing folder and contents {}".format(os.path.join(base,f)))
-
-			except Exception as err:
-				error = "failed to create clean existing addon folder"
-				print(error, str(err))
-
-		# Walk through the base addon folder for rules on pre-removing
-		# but avoid removing/altering backup and updater file
-		for path, dirs, files in os.walk(base):
-			# prune ie skip updater folder
-			dirs[:] = [d for d in dirs if os.path.join(path,d) not in [self._updater_path]]
-			for file in files:
-				for ptrn in self.remove_pre_update_patterns:
-					if fnmatch.filter([file],ptrn):
-						try:
-							fl = os.path.join(path,file)
-							os.remove(fl)
-							if self._verbose: print("Pre-removed file "+file)
-						except OSError:
-							print("Failed to pre-remove "+file)
-
-		# Walk through the temp addon sub folder for replacements
-		# this implements the overwrite rules, which apply after
-		# the above pre-removal rules. This also performs the
-		# actual file copying/replacements
-		for path, dirs, files in os.walk(merger):
-			# verify this structure works to prune updater sub folder overwriting
-			dirs[:] = [d for d in dirs if os.path.join(path,d) not in [self._updater_path]]
-			relPath = os.path.relpath(path, merger)
-			destPath = os.path.join(base, relPath)
-			if not os.path.exists(destPath):
-				os.makedirs(destPath)
-			for file in files:
-				# bring in additional logic around copying/replacing
-				# Blender default: overwrite .py's, don't overwrite the rest
-				destFile = os.path.join(destPath, file)
-				srcFile = os.path.join(path, file)
-
-				# decide whether to replace if file already exists, and copy new over
-				if os.path.isfile(destFile):
-					# otherwise, check each file to see if matches an overwrite pattern
-					replaced=False
-					for ptrn in self._overwrite_patterns:
-						if fnmatch.filter([destFile],ptrn):
-							replaced=True
-							break
-					if replaced:
-						os.remove(destFile)
-						os.rename(srcFile, destFile)
-						if self._verbose: print("Overwrote file "+os.path.basename(destFile))
-					else:
-						if self._verbose: print("Pattern not matched to "+os.path.basename(destFile)+", not overwritten")
-				else:
-					# file did not previously exist, simply move it over
-					os.rename(srcFile, destFile)
-					if self._verbose: print("New file "+os.path.basename(destFile))
-
-		# now remove the temp staging folder and downloaded zip
-		try:
-			shutil.rmtree(staging_path)
-		except:
-			error = "Error: Failed to remove existing staging directory, consider manually removing "+staging_path
-			if self._verbose: print(error)
-
-
-	def reload_addon(self):
-		# if post_update false, skip this function
-		# else, unload/reload addon & trigger popup
-		if self._auto_reload_post_update == False:
-			print("Restart blender to reload addon and complete update")
-			return
-
-		if self._verbose: print("Reloading addon...")
-		addon_utils.modules(refresh=True)
-		bpy.utils.refresh_script_paths()
-
-		# not allowed in restricted context, such as register module
-		# toggle to refresh
-		bpy.ops.wm.addon_disable(module=self._addon_package)
-		bpy.ops.wm.addon_refresh()
-		bpy.ops.wm.addon_enable(module=self._addon_package)
-
-
-	# -------------------------------------------------------------------------
-	# Other non-api functions and setups
-	# -------------------------------------------------------------------------
-
-	def clear_state(self):
-		self._update_ready = None
-		self._update_link = None
-		self._update_version = None
-		self._source_zip = None
-		self._error = None
-		self._error_msg = None
-
-	# custom urlretrieve implementation
-	def urlretrieve(self, urlfile, filepath):
-		chunk = 1024*8
-		f = open(filepath, "wb")
-		while 1:
-			data = urlfile.read(chunk)
-			if not data:
-				#print("done.")
-				break
-			f.write(data)
-			#print("Read %s bytes"%len(data))
-		f.close()
-
-
-	def version_tuple_from_text(self,text):
-		if text == None: return ()
-
-		# should go through string and remove all non-integers,
-		# and for any given break split into a different section
-		segments = []
-		tmp = ''
-		for l in str(text):
-			if l.isdigit()==False:
-				if len(tmp)>0:
-					segments.append(int(tmp))
-					tmp = ''
-			else:
-				tmp+=l
-		if len(tmp)>0:
-			segments.append(int(tmp))
-
-		if len(segments)==0:
-			if self._verbose: print("No version strings found text: ",text)
-			if self._include_branches == False:
-				return ()
-			else:
-				return (text)
-		return tuple(segments)
-
-	# called for running check in a background thread
-	def check_for_update_async(self, callback=None):
-
-		if self._json != None and "update_ready" in self._json and self._json["version_text"]!={}:
-			if self._json["update_ready"] == True:
-				self._update_ready = True
-				self._update_link = self._json["version_text"]["link"]
-				self._update_version = str(self._json["version_text"]["version"])
-				# cached update
-				callback(True)
-				return
-
-		# do the check
-		if self._check_interval_enable == False:
-			return
-		elif self._async_checking == True:
-			if self._verbose: print("Skipping async check, already started")
-			return  # already running the bg thread
-		elif self._update_ready == None:
-			self.start_async_check_update(False, callback)
-
-
-	def check_for_update_now(self, callback=None):
-
-		self._error = None
-		self._error_msg = None
-
-		if self._verbose:
-			print("Check update pressed, first getting current status")
-		if self._async_checking == True:
-			if self._verbose: print("Skipping async check, already started")
-			return  # already running the bg thread
-		elif self._update_ready == None:
-			self.start_async_check_update(True, callback)
-		else:
-			self._update_ready = None
-			self.start_async_check_update(True, callback)
-
-
-	# this function is not async, will always return in sequential fashion
-	# but should have a parent which calls it in another thread
-	def check_for_update(self, now=False):
-		if self._verbose: print("Checking for update function")
-
-		# clear the errors if any
-		self._error = None
-		self._error_msg = None
-
-		# avoid running again in, just return past result if found
-		# but if force now check, then still do it
-		if self._update_ready != None and now == False:
-			return (self._update_ready,self._update_version,self._update_link)
-
-		if self._current_version == None:
-			raise ValueError("current_version not yet defined")
-		if self._repo == None:
-			raise ValueError("repo not yet defined")
-		if self._user == None:
-			raise ValueError("username not yet defined")
-
-		self.set_updater_json()  # self._json
-
-		if now == False and self.past_interval_timestamp()==False:
-			if self._verbose:
-				print("Aborting check for updated, check interval not reached")
-			return (False, None, None)
-
-		# check if using tags or releases
-		# note that if called the first time, this will pull tags from online
-		if self._fake_install == True:
-			if self._verbose:
-				print("fake_install = True, setting fake version as ready")
-			self._update_ready = True
-			self._update_version = "(999,999,999)"
-			self._update_link = "http://127.0.0.1"
-
-			return (self._update_ready, self._update_version, self._update_link)
-
-		# primary internet call
-		self.get_tags()  # sets self._tags and self._tag_latest
-
-		self._json["last_check"] = str(datetime.now())
-		self.save_updater_json()
-
-		# can be () or ('master') in addition to branches, and version tag
-		new_version = self.version_tuple_from_text(self.tag_latest)
-
-		if len(self._tags)==0:
-			self._update_ready = False
-			self._update_version = None
-			self._update_link = None
-			return (False, None, None)
-		if self._include_branches == False:
-			link = self.select_link(self, self._tags[0])
-		else:
-			n = len(self._include_branch_list)
-			if len(self._tags)==n:
-				# effectively means no tags found on repo
-				# so provide the first one as default
-				link = self.select_link(self, self._tags[0])
-			else:
-				link = self.select_link(self, self._tags[n])
-
-		if new_version == ():
-			self._update_ready = False
-			self._update_version = None
-			self._update_link = None
-			return (False, None, None)
-		elif str(new_version).lower() in self._include_branch_list:
-			# handle situation where master/whichever branch is included
-			# however, this code effectively is not triggered now
-			# as new_version will only be tag names, not branch names
-			if self._include_branch_autocheck == False:
-				# don't offer update as ready,
-				# but set the link for the default
-				# branch for installing
-				self._update_ready = False
-				self._update_version = new_version
-				self._update_link = link
-				self.save_updater_json()
-				return (True, new_version, link)
-			else:
-				raise ValueError("include_branch_autocheck: NOT YET DEVELOPED")
-				# bypass releases and look at timestamp of last update
-				# from a branch compared to now, see if commit values
-				# match or not.
-
-		else:
-			# situation where branches not included
-
-			if new_version > self._current_version:
-
-				self._update_ready = True
-				self._update_version = new_version
-				self._update_link = link
-				self.save_updater_json()
-				return (True, new_version, link)
-
-		# elif new_version != self._current_version:
-		# 	self._update_ready = False
-		# 	self._update_version = new_version
-		# 	self._update_link = link
-		# 	self.save_updater_json()
-		# 	return (True, new_version, link)
-
-		# if no update, set ready to False from None
-		self._update_ready = False
-		self._update_version = None
-		self._update_link = None
-		return (False, None, None)
-
-
-	def set_tag(self, name):
-		"""Assign the tag name and url to update to"""
-		tg = None
-		for tag in self._tags:
-			if name == tag["name"]:
-				tg = tag
-				break
-		if tg:
-			new_version = self.version_tuple_from_text(self.tag_latest)
-			self._update_version = new_version
-			self._update_link = self.select_link(self, tg)
-		elif self._include_branches and name in self._include_branch_list:
-			# scenario if reverting to a specific branch name instead of tag
-			tg = name
-			link = self.form_branch_url(tg)
-			self._update_version = name  # this will break things
-			self._update_link = link
-		if not tg:
-			raise ValueError("Version tag not found: "+name)
-
-
-	def run_update(self,force=False,revert_tag=None,clean=False,callback=None):
-		"""Runs an install, update, or reversion of an addon from online source
-
-		Arguments:
-			force: Install assigned link, even if self.update_ready is False
-			revert_tag: Version to install, if none uses detected update link
-			clean: not used, but in future could use to totally refresh addon
-			callback: used to run function on update completion
-		"""
-		self._json["update_ready"] = False
-		self._json["ignore"] = False  # clear ignore flag
-		self._json["version_text"] = {}
-
-		if revert_tag != None:
-			self.set_tag(revert_tag)
-			self._update_ready = True
-
-		# clear the errors if any
-		self._error = None
-		self._error_msg = None
-
-		if self._verbose: print("Running update")
-
-		if self._fake_install == True:
-			# change to True, to trigger the reload/"update installed" handler
-			if self._verbose:
-				print("fake_install=True")
-				print("Just reloading and running any handler triggers")
-			self._json["just_updated"] = True
-			self.save_updater_json()
-			if self._backup_current == True:
-				self.create_backup()
-			self.reload_addon()
-			self._update_ready = False
-			res = True  # fake "success" zip download flag
-
-		elif force==False:
-			if self._update_ready != True:
-				if self._verbose:
-					print("Update stopped, new version not ready")
-				if callback:
-					callback(
-						self._addon_package,
-						"Update stopped, new version not ready")
-				return "Update stopped, new version not ready"
-			elif self._update_link == None:
-				# this shouldn't happen if update is ready
-				if self._verbose:
-					print("Update stopped, update link unavailable")
-				if callback:
-					callback(
-						self._addon_package,
-						"Update stopped, update link unavailable")
-				return "Update stopped, update link unavailable"
-
-			if self._verbose and revert_tag==None:
-				print("Staging update")
-			elif self._verbose:
-				print("Staging install")
-
-			res = self.stage_repository(self._update_link)
-			if res !=True:
-				print("Error in staging repository: "+str(res))
-				if callback != None:
-					callback(self._addon_package, self._error_msg)
-				return self._error_msg
-			res = self.unpack_staged_zip(clean)
-			if res<0:
-				if callback:
-					callback(self._addon_package, self._error_msg)
-				return res
-
-		else:
-			if self._update_link == None:
-				if self._verbose:
-					print("Update stopped, could not get link")
-				return "Update stopped, could not get link"
-			if self._verbose:
-				print("Forcing update")
-
-			res = self.stage_repository(self._update_link)
-			if res !=True:
-				print("Error in staging repository: "+str(res))
-				if callback:
-					callback(self._addon_package, self._error_msg)
-				return self._error_msg
-			res = self.unpack_staged_zip(clean)
-			if res<0:
-				return res
-			# would need to compare against other versions held in tags
-
-		# run the front-end's callback if provided
-		if callback:
-			callback(self._addon_package)
-
-		# return something meaningful, 0 means it worked
-		return 0
-
-
-	def past_interval_timestamp(self):
-		if self._check_interval_enable == False:
-			return True  # ie this exact feature is disabled
-
-		if "last_check" not in self._json or self._json["last_check"] == "":
-			return True
-		else:
-			now = datetime.now()
-			last_check = datetime.strptime(self._json["last_check"],
-										"%Y-%m-%d %H:%M:%S.%f")
-			next_check = last_check
-			offset = timedelta(
-				days=self._check_interval_days + 30*self._check_interval_months,
-				hours=self._check_interval_hours,
-				minutes=self._check_interval_minutes
-				)
-
-			delta = (now - offset) - last_check
-			if delta.total_seconds() > 0:
-				if self._verbose:
-					print("{} Updater: Time to check for updates!".format(self._addon))
-				return True
-			else:
-				if self._verbose:
-					print("{} Updater: Determined it's not yet time to check for updates".format(self._addon))
-				return False
-
-	def get_json_path(self):
-		"""Returns the full path to the JSON state file used by this updater.
-
-		Will also rename old file paths to addon-specific path if found
-		"""
-		json_path = os.path.join(self._updater_path,
-			"{}_updater_status.json".format(self._addon_package))
-		old_json_path = os.path.join(self._updater_path, "updater_status.json")
-
-		# rename old file if it exists
-		try:
-			os.rename(old_json_path, json_path)
-		except FileNotFoundError:
-			pass
-		except Exception as err:
-			print("Other OS error occurred while trying to rename old JSON")
-			print(err)
-		return json_path
-
-	def set_updater_json(self):
-		"""Load or initialize JSON dictionary data for updater state"""
-		if self._updater_path == None:
-			raise ValueError("updater_path is not defined")
-		elif os.path.isdir(self._updater_path) == False:
-			os.makedirs(self._updater_path)
-
-		jpath = self.get_json_path()
-		if os.path.isfile(jpath):
-			with open(jpath) as data_file:
-				self._json = json.load(data_file)
-				if self._verbose:
-					print("{} Updater: Read in JSON settings from file".format(
-						self._addon))
-		else:
-			# set data structure
-			self._json = {
-				"last_check":"",
-				"backup_date":"",
-				"update_ready":False,
-				"ignore":False,
-				"just_restored":False,
-				"just_updated":False,
-				"version_text":{}
-			}
-			self.save_updater_json()
-
-
-	def save_updater_json(self):
-		# first save the state
-		if self._update_ready == True:
-			if type(self._update_version) == type((0,0,0)):
-				self._json["update_ready"] = True
-				self._json["version_text"]["link"]=self._update_link
-				self._json["version_text"]["version"]=self._update_version
-			else:
-				self._json["update_ready"] = False
-				self._json["version_text"] = {}
-		else:
-			self._json["update_ready"] = False
-			self._json["version_text"] = {}
-
-		jpath = self.get_json_path()
-		outf = open(jpath,'w')
-		data_out = json.dumps(self._json, indent=4)
-		outf.write(data_out)
-		outf.close()
-		if self._verbose:
-			print(self._addon+": Wrote out updater JSON settings to file, with the contents:")
-			print(self._json)
-
-	def json_reset_postupdate(self):
-		self._json["just_updated"] = False
-		self._json["update_ready"] = False
-		self._json["version_text"] = {}
-		self.save_updater_json()
-
-	def json_reset_restore(self):
-		self._json["just_restored"] = False
-		self._json["update_ready"] = False
-		self._json["version_text"] = {}
-		self.save_updater_json()
-		self._update_ready = None  # reset so you could check update again
-
-	def ignore_update(self):
-		self._json["ignore"] = True
-		self.save_updater_json()
-
-
-	# -------------------------------------------------------------------------
-	# ASYNC stuff
-	# -------------------------------------------------------------------------
-
-	def start_async_check_update(self, now=False, callback=None):
-		"""Start a background thread which will check for updates"""
-		if self._async_checking is True:
-			return
-		if self._verbose:
-			print("{} updater: Starting background checking thread".format(
-				self._addon))
-		check_thread = threading.Thread(target=self.async_check_update,
-										args=(now,callback,))
-		check_thread.daemon = True
-		self._check_thread = check_thread
-		check_thread.start()
-
-	def async_check_update(self, now, callback=None):
-		"""Perform update check, run as target of background thread"""
-		self._async_checking = True
-		if self._verbose:
-			print("{} BG thread: Checking for update now in background".format(
-				self._addon))
-
-		try:
-			self.check_for_update(now=now)
-		except Exception as exception:
-			print("Checking for update error:")
-			print(exception)
-			if not self._error:
-				self._update_ready = False
-				self._update_version = None
-				self._update_link = None
-				self._error = "Error occurred"
-				self._error_msg = "Encountered an error while checking for updates"
-
-		self._async_checking = False
-		self._check_thread = None
-
-		if self._verbose:
-			print("{} BG thread: Finished checking for update, doing callback".format(self._addon))
-		if callback:
-			callback(self._update_ready)
-
-	def stop_async_check_update(self):
-		"""Method to give impression of stopping check for update.
-
-		Currently does nothing but allows user to retry/stop blocking UI from
-		hitting a refresh button. This does not actually stop the thread, as it
-		will complete after the connection timeout regardless. If the thread
-		does complete with a successful response, this will be still displayed
-		on next UI refresh (ie no update, or update available).
-		"""
-		if self._check_thread != None:
-			if self._verbose: print("Thread will end in normal course.")
-			# however, "There is no direct kill method on a thread object."
-			# better to let it run its course
-			#self._check_thread.stop()
-		self._async_checking = False
-		self._error = None
-		self._error_msg = None
-
-
-# -----------------------------------------------------------------------------
-# Updater Engines
-# -----------------------------------------------------------------------------
-
-
-class BitbucketEngine(object):
-	"""Integration to Bitbucket API for git-formatted repositories"""
-
-	def __init__(self):
-		self.api_url = 'https://api.bitbucket.org'
-		self.token = None
-		self.name = "bitbucket"
-
-	def form_repo_url(self, updater):
-		return self.api_url+"/2.0/repositories/"+updater.user+"/"+updater.repo
-
-	def form_tags_url(self, updater):
-		return self.form_repo_url(updater) + "/refs/tags?sort=-name"
-
-	def form_branch_url(self, branch, updater):
-		return self.get_zip_url(branch, updater)
-
-	def get_zip_url(self, name, updater):
-		return "https://bitbucket.org/{user}/{repo}/get/{name}.zip".format(
-			user=updater.user,
-			repo=updater.repo,
-			name=name)
-
-	def parse_tags(self, response, updater):
-		if response == None:
-			return []
-		return [{"name": tag["name"], "zipball_url": self.get_zip_url(tag["name"], updater)} for tag in response["values"]]
-
-
-class GithubEngine(object):
-	"""Integration to Github API"""
-
-	def __init__(self):
-		self.api_url = 'https://api.github.com'
-		self.token = None
-		self.name = "github"
-
-	def form_repo_url(self, updater):
-		return "{}{}{}{}{}".format(self.api_url,"/repos/",updater.user,
-								"/",updater.repo)
-
-	def form_tags_url(self, updater):
-		if updater.use_releases:
-			return "{}{}".format(self.form_repo_url(updater),"/releases")
-		else:
-			return "{}{}".format(self.form_repo_url(updater),"/tags")
-
-	def form_branch_list_url(self, updater):
-		return "{}{}".format(self.form_repo_url(updater),"/branches")
-
-	def form_branch_url(self, branch, updater):
-		return "{}{}{}".format(self.form_repo_url(updater),
-							"/zipball/",branch)
-
-	def parse_tags(self, response, updater):
-		if response == None:
-			return []
-		return response
-
-
-class GitlabEngine(object):
-	"""Integration to GitLab API"""
-
-	def __init__(self):
-		self.api_url = 'https://gitlab.com'
-		self.token = None
-		self.name = "gitlab"
-
-	def form_repo_url(self, updater):
-		return "{}{}{}".format(self.api_url,"/api/v4/projects/",updater.repo)
-
-	def form_tags_url(self, updater):
-		return "{}{}".format(self.form_repo_url(updater),"/repository/tags")
-
-	def form_branch_list_url(self, updater):
-		# does not validate branch name.
-		return "{}{}".format(
-			self.form_repo_url(updater),
-			"/repository/branches")
-
-	def form_branch_url(self, branch, updater):
-		# Could clash with tag names and if it does, it will
-		# download TAG zip instead of branch zip to get
-		# direct path, would need.
-		return "{}{}{}".format(
-			self.form_repo_url(updater),
-			"/repository/archive.zip?sha=",
-			branch)
-
-	def get_zip_url(self, sha, updater):
-		return "{base}/repository/archive.zip?sha={sha}".format(
-			base=self.form_repo_url(updater),
-			sha=sha)
-
-	# def get_commit_zip(self, id, updater):
-	# 	return self.form_repo_url(updater)+"/repository/archive.zip?sha:"+id
-
-	def parse_tags(self, response, updater):
-		if response == None:
-			return []
-		return [{"name": tag["name"], "zipball_url": self.get_zip_url(tag["commit"]["id"], updater)} for tag in response]
-
-
-# -----------------------------------------------------------------------------
-# The module-shared class instance,
-# should be what's imported to other files
-# -----------------------------------------------------------------------------
-
-Updater = Singleton_updater()
diff --git a/addon_updater_ops.py b/addon_updater_ops.py
deleted file mode 100644
index 5ac1c9c..0000000
--- a/addon_updater_ops.py
+++ /dev/null
@@ -1,1443 +0,0 @@
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-#  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
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software Foundation,
-#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-import os
-
-import bpy
-from bpy.app.handlers import persistent
-
-# updater import, import safely
-# Prevents popups for users with invalid python installs e.g. missing libraries
-try:
-	from .addon_updater import Updater as updater
-except Exception as e:
-	print("ERROR INITIALIZING UPDATER")
-	print(str(e))
-	class Singleton_updater_none(object):
-		def __init__(self):
-			self.addon = None
-			self.verbose = False
-			self.invalidupdater = True # used to distinguish bad install
-			self.error = None
-			self.error_msg = None
-			self.async_checking = None
-		def clear_state(self):
-			self.addon = None
-			self.verbose = False
-			self.invalidupdater = True
-			self.error = None
-			self.error_msg = None
-			self.async_checking = None
-		def run_update(self): pass
-		def check_for_update(self): pass
-	updater = Singleton_updater_none()
-	updater.error = "Error initializing updater module"
-	updater.error_msg = str(e)
-
-# Must declare this before classes are loaded
-# otherwise the bl_idname's will not match and have errors.
-# Must be all lowercase and no spaces
-updater.addon = "gaffer"
-
-
-# -----------------------------------------------------------------------------
-# Blender version utils
-# -----------------------------------------------------------------------------
-
-
-def make_annotations(cls):
-	"""Add annotation attribute to class fields to avoid Blender 2.8 warnings"""
-	if not hasattr(bpy.app, "version") or bpy.app.version < (2, 80):
-		return cls
-	bl_props = {k: v for k, v in cls.__dict__.items() if isinstance(v, tuple)}
-	if bl_props:
-		if '__annotations__' not in cls.__dict__:
-			setattr(cls, '__annotations__', {})
-		annotations = cls.__dict__['__annotations__']
-		for k, v in bl_props.items():
-			annotations[k] = v
-			delattr(cls, k)
-	return cls
-
-
-def layout_split(layout, factor=0.0, align=False):
-	"""Intermediate method for pre and post blender 2.8 split UI function"""
-	if not hasattr(bpy.app, "version") or bpy.app.version < (2, 80):
-		return layout.split(percentage=factor, align=align)
-	return layout.split(factor=factor, align=align)
-
-
-def get_user_preferences(context=None):
-	"""Intermediate method for pre and post blender 2.8 grabbing preferences"""
-	if not context:
-		context = bpy.context
-	prefs = None
-	if hasattr(context, "user_preferences"):
-		prefs = context.user_preferences.addons.get(__package__, None)
-	elif hasattr(context, "preferences"):
-		prefs = context.preferences.addons.get(__package__, None)
-	if prefs:
-		return prefs.preferences
-	# To make the addon stable and non-exception prone, return None
-	# raise Exception("Could not fetch user preferences")
-	return None
-
-
-# -----------------------------------------------------------------------------
-# Updater operators
-# -----------------------------------------------------------------------------
-
-
-# simple popup for prompting checking for update & allow to install if available
-class addon_updater_install_popup(bpy.types.Operator):
-	"""Check and install update if available"""
-	bl_label = "Update {x} addon".format(x=updater.addon)
-	bl_idname = updater.addon+".updater_install_popup"
-	bl_description = "Popup menu to check and display current updates available"
-	bl_options = {'REGISTER', 'INTERNAL'}
-
-	# if true, run clean install - ie remove all files before adding new
-	# equivalent to deleting the addon and reinstalling, except the
-	# updater folder/backup folder remains
-	clean_install = bpy.props.BoolProperty(
-		name="Clean install",
-		description="If enabled, completely clear the addon's folder before installing new update, creating a fresh install",
-		default=False,
-		options={'HIDDEN'}
-	)
-	ignore_enum = bpy.props.EnumProperty(
-		name="Process update",
-		description="Decide to install, ignore, or defer new addon update",
-		items=[
-			("install","Update Now","Install update now"),
-			("ignore","Ignore", "Ignore this update to prevent future popups"),
-			("defer","Defer","Defer choice till next blender session")
-		],
-		options={'HIDDEN'}
-	)
-
-	def check (self, context):
-		return True
-
-	def invoke(self, context, event):
-		return context.window_manager.invoke_props_dialog(self)
-
-	def draw(self, context):
-		layout = self.layout
-		if updater.invalidupdater == True:
-			layout.label(text="Updater module error")
-			return
-		elif updater.update_ready == True:
-			col = layout.column()
-			col.scale_y = 0.7
-			col.label(text="Update {} ready!".format(str(updater.update_version)),
-						icon="LOOP_FORWARDS")
-			col.label(text="Choose 'Update Now' & press OK to install, ",icon="BLANK1")
-			col.label(text="or click outside window to defer",icon="BLANK1")
-			row = col.row()
-			row.prop(self,"ignore_enum",expand=True)
-			col.split()
-		elif updater.update_ready == False:
-			col = layout.column()
-			col.scale_y = 0.7
-			col.label(text="No updates available")
-			col.label(text="Press okay to dismiss dialog")
-			# add option to force install
-		else:
-			# case: updater.update_ready = None
-			# we have not yet checked for the update
-			layout.label(text="Check for update now?")
-
-		# potentially in future, could have UI for 'check to select old version'
-		# to revert back to.
-
-	def execute(self,context):
-
-		# in case of error importing updater
-		if updater.invalidupdater == True:
-			return {'CANCELLED'}
-
-		if updater.manual_only==True:
-			bpy.ops.wm.url_open(url=updater.website)
-		elif updater.update_ready == True:
-
-			# action based on enum selection
-			if self.ignore_enum=='defer':
-				return {'FINISHED'}
-			elif self.ignore_enum=='ignore':
-				updater.ignore_update()
-				return {'FINISHED'}
-			#else: "install update now!"
-
-			res = updater.run_update(
-							force=False,
-							callback=post_update_callback,
-							clean=self.clean_install)
-			# should return 0, if not something happened
-			if updater.verbose:
-				if res==0:
-					print("Updater returned successful")
-				else:
-					print("Updater returned {}, error occurred".format(res))
-		elif updater.update_ready == None:
-			_ = updater.check_for_update(now=True)
-
-			# re-launch this dialog
-			atr = addon_updater_install_popup.bl_idname.split(".")
-			getattr(getattr(bpy.ops, atr[0]),atr[1])('INVOKE_DEFAULT')
-		else:
-			if updater.verbose:
-				print("Doing nothing, not ready for update")
-		return {'FINISHED'}
-
-
-# User preference check-now operator
-class addon_updater_check_now(bpy.types.Operator):
-	bl_label = "Check now for "+updater.addon+" update"
-	bl_idname = updater.addon+".updater_check_now"
-	bl_description = "Check now for an update to the {x} addon".format(
-														x=updater.addon)
-	bl_options = {'REGISTER', 'INTERNAL'}
-
-	def execute(self,context):
-		if updater.invalidupdater == True:
-			return {'CANCELLED'}
-
-		if updater.async_checking == True and updater.error == None:
-			# Check already happened
-			# Used here to just avoid constant applying settings below
-			# Ignoring if error, to prevent being stuck on the error screen
-			return {'CANCELLED'}
-
-		# apply the UI settings
-		settings = get_user_preferences(context)
-		if not settings:
-			if updater.verbose:
-				print("Could not get {} preferences, update check skipped".format(
-					__package__))
-			return {'CANCELLED'}
-		updater.set_check_interval(enable=settings.auto_check_update,
-					months=settings.updater_intrval_months,
-					days=settings.updater_intrval_days,
-					hours=settings.updater_intrval_hours,
-					minutes=settings.updater_intrval_minutes
-					) # optional, if auto_check_update
-
-		# input is an optional callback function
-		# this function should take a bool input, if true: update ready
-		# if false, no update ready
-		updater.check_for_update_now(ui_refresh)
-
-		return {'FINISHED'}
-
-
-class addon_updater_update_now(bpy.types.Operator):
-	bl_label = "Update "+updater.addon+" addon now"
-	bl_idname = updater.addon+".updater_update_now"
-	bl_description = "Update to the latest version of the {x} addon".format(
-														x=updater.addon)
-	bl_options = {'REGISTER', 'INTERNAL'}
-
-	# if true, run clean install - ie remove all files before adding new
-	# equivalent to deleting the addon and reinstalling, except the
-	# updater folder/backup folder remains
-	clean_install = bpy.props.BoolProperty(
-		name="Clean install",
-		description="If enabled, completely clear the addon's folder before installing new update, creating a fresh install",
-		default=False,
-		options={'HIDDEN'}
-	)
-
-	def execute(self,context):
-
-		# in case of error importing updater
-		if updater.invalidupdater == True:
-			return {'CANCELLED'}
-
-		if updater.manual_only == True:
-			bpy.ops.wm.url_open(url=updater.website)
-		if updater.update_ready == True:
-			# if it fails, offer to open the website instead
-			try:
-				res = updater.run_update(
-								force=False,
-								callback=post_update_callback,
-								clean=self.clean_install)
-
-				# should return 0, if not something happened
-				if updater.verbose:
-					if res==0: print("Updater returned successful")
-					else: print("Updater returned "+str(res)+", error occurred")
-			except Exception as e:
-				updater._error = "Error trying to run update"
-				updater._error_msg = str(e)
-				atr = addon_updater_install_manually.bl_idname.split(".")
-				getattr(getattr(bpy.ops, atr[0]),atr[1])('INVOKE_DEFAULT')
-		elif updater.update_ready == None:
-			(update_ready, version, link) = updater.check_for_update(now=True)
-			# re-launch this dialog
-			atr = addon_updater_install_popup.bl_idname.split(".")
-			getattr(getattr(bpy.ops, atr[0]),atr[1])('INVOKE_DEFAULT')
-
-		elif updater.update_ready == False:
-			self.report({'INFO'}, "Nothing to update")
-		else:
-			self.report({'ERROR'}, "Encountered problem while trying to update")
-
-		return {'FINISHED'}
-
-
-class addon_updater_update_target(bpy.types.Operator):
-	bl_label = updater.addon+" version target"
-	bl_idname = updater.addon+".updater_update_target"
-	bl_description = "Install a targeted version of the {x} addon".format(
-														x=updater.addon)
-	bl_options = {'REGISTER', 'INTERNAL'}
-
-	def target_version(self, context):
-		# in case of error importing updater
-		if updater.invalidupdater == True:
-			ret = []
-
-		ret = []
-		i=0
-		for tag in updater.tags:
-			ret.append( (tag,tag,"Select to install "+tag) )
-			i+=1
-		return ret
-
-	target = bpy.props.EnumProperty(
-		name="Target version to install",
-		description="Select the version to install",
-		items=target_version
-		)
-
-	# if true, run clean install - ie remove all files before adding new
-	# equivalent to deleting the addon and reinstalling, except the
-	# updater folder/backup folder remains
-	clean_install = bpy.props.BoolProperty(
-		name="Clean install",
-		description="If enabled, completely clear the addon's folder before installing new update, creating a fresh install",
-		default=False,
-		options={'HIDDEN'}
-	)
-
-	@classmethod
-	def poll(cls, context):
-		if updater.invalidupdater == True: return False
-		return updater.update_ready != None and len(updater.tags)>0
-
-	def invoke(self, context, event):
-		return context.window_manager.invoke_props_dialog(self)
-
-	def draw(self, context):
-		layout = self.layout
-		if updater.invalidupdater == True:
-			layout.label(text="Updater error")
-			return
-		split = layout_split(layout, factor=0.66)
-		subcol = split.column()
-		subcol.label(text="Select install version")
-		subcol = split.column()
-		subcol.prop(self, "target", text="")
-
-
-	def execute(self,context):
-
-		# in case of error importing updater
-		if updater.invalidupdater == True:
-			return {'CANCELLED'}
-
-		res = updater.run_update(
-						force=False,
-						revert_tag=self.target,
-						callback=post_update_callback,
-						clean=self.clean_install)
-
-		# should return 0, if not something happened
-		if res==0:
-			if updater.verbose:
-				print("Updater returned successful")
-		else:
-			if updater.verbose:
-				print("Updater returned "+str(res)+", error occurred")
-			return {'CANCELLED'}
-
-		return {'FINISHED'}
-
-
-class addon_updater_install_manually(bpy.types.Operator):
-	"""As a fallback, direct the user to download the addon manually"""
-	bl_label = "Install update manually"
-	bl_idname = updater.addon+".updater_install_manually"
-	bl_description = "Proceed to manually install update"
-	bl_options = {'REGISTER', 'INTERNAL'}
-
-	error = bpy.props.StringProperty(
-		name="Error Occurred",
-		default="",
-		options={'HIDDEN'}
-		)
-
-	def invoke(self, context, event):
-		return context.window_manager.invoke_popup(self)
-
-	def draw(self, context):
-		layout = self.layout
-
-		if updater.invalidupdater == True:
-			layout.label(text="Updater error")
-			return
-
-		# use a "failed flag"? it shows this label if the case failed.
-		if self.error!="":
-			col = layout.column()
-			col.scale_y = 0.7
-			col.label(text="There was an issue trying to auto-install",icon="ERROR")
-			col.label(text="Press the download button below and install",icon="BLANK1")
-			col.label(text="the zip file like a normal addon.",icon="BLANK1")
-		else:
-			col = layout.column()
-			col.scale_y = 0.7
-			col.label(text="Install the addon manually")
-			col.label(text="Press the download button below and install")
-			col.label(text="the zip file like a normal addon.")
-
-		# if check hasn't happened, i.e. accidentally called this menu
-		# allow to check here
-
-		row = layout.row()
-
-		if updater.update_link != None:
-			row.operator("wm.url_open",
-				text="Direct download").url=updater.update_link
-		else:
-			row.operator("wm.url_open",
-				text="(failed to retrieve direct download)")
-			row.enabled = False
-
-			if updater.website != None:
-				row = layout.row()
-				row.operator("wm.url_open",text="Open website").url=\
-						updater.website
-			else:
-				row = layout.row()
-				row.label(text="See source website to download the update")
-
-	def execute(self,context):
-
-		return {'FINISHED'}
-
-
-class addon_updater_updated_successful(bpy.types.Operator):
-	"""Addon in place, popup telling user it completed or what went wrong"""
-	bl_label = "Installation Report"
-	bl_idname = updater.addon+".updater_update_successful"
-	bl_description = "Update installation response"
-	bl_options = {'REGISTER', 'INTERNAL', 'UNDO'}
-
-	error = bpy.props.StringProperty(
-		name="Error Occurred",
-		default="",
-		options={'HIDDEN'}
-		)
-
-	def invoke(self, context, event):
-		return context.window_manager.invoke_props_popup(self, event)
-
-	def draw(self, context):
-		layout = self.layout
-
-		if updater.invalidupdater == True:
-			layout.label(text="Updater error")
-			return
-
-		saved = updater.json
-		if self.error != "":
-			col = layout.column()
-			col.scale_y = 0.7
-			col.label(text="Error occurred, did not install", icon="ERROR")
-			if updater.error_msg:
-				msg = updater.error_msg
-			else:
-				msg = self.error
-			col.label(str(msg), icon="BLANK1")
-			rw = col.row()
-			rw.scale_y = 2
-			rw.operator("wm.url_open",
-				text="Click for manual download.",
-				icon="BLANK1"
-				).url=updater.website
-			# manual download button here
-		elif updater.auto_reload_post_update == False:
-			# tell user to restart blender
-			if "just_restored" in saved and saved["just_restored"] == True:
-				col = layout.column()
-				col.scale_y = 0.7
-				col.label(text="Addon restored", icon="RECOVER_LAST")
-				col.label(text="Restart blender to reload.",icon="BLANK1")
-				updater.json_reset_restore()
-			else:
-				col = layout.column()
-				col.scale_y = 0.7
-				col.label(text="Addon successfully installed", icon="FILE_TICK")
-				col.label(text="Restart blender to reload.", icon="BLANK1")
-
-		else:
-			# reload addon, but still recommend they restart blender
-			if "just_restored" in saved and saved["just_restored"] == True:
-				col = layout.column()
-				col.scale_y = 0.7
-				col.label(text="Addon restored", icon="RECOVER_LAST")
-				col.label(text="Consider restarting blender to fully reload.",
-					icon="BLANK1")
-				updater.json_reset_restore()
-			else:
-				col = layout.column()
-				col.scale_y = 0.7
-				col.label(text="Addon successfully installed", icon="FILE_TICK")
-				col.label(text="Consider restarting blender to fully reload.",
-					icon="BLANK1")
-
-	def execute(self, context):
-		return {'FINISHED'}
-
-
-class addon_updater_restore_backup(bpy.types.Operator):
-	"""Restore addon from backup"""
-	bl_label = "Restore backup"
-	bl_idname = updater.addon+".updater_restore_backup"
-	bl_description = "Restore addon from backup"
-	bl_options = {'REGISTER', 'INTERNAL'}
-
-	@classmethod
-	def poll(cls, context):
-		try:
-			return os.path.isdir(os.path.join(updater.stage_path,"backup"))
-		except:
-			return False
-
-	def execute(self, context):
-		# in case of error importing updater
-		if updater.invalidupdater == True:
-			return {'CANCELLED'}
-		updater.restore_backup()
-		return {'FINISHED'}
-
-
-class addon_updater_ignore(bpy.types.Operator):
-	"""Prevent future update notice popups"""
-	bl_label = "Ignore update"
-	bl_idname = updater.addon+".updater_ignore"
-	bl_description = "Ignore update to prevent future popups"
-	bl_options = {'REGISTER', 'INTERNAL'}
-
-	@classmethod
-	def poll(cls, context):
-		if updater.invalidupdater == True:
-			return False
-		elif updater.update_ready == True:
-			return True
-		else:
-			return False
-
-	def execute(self, context):
-		# in case of error importing updater
-		if updater.invalidupdater == True:
-			return {'CANCELLED'}
-		updater.ignore_update()
-		self.report({"INFO"},"Open addon preferences for updater options")
-		return {'FINISHED'}
-
-
-class addon_updater_end_background(bpy.types.Operator):
-	"""Stop checking for update in the background"""
-	bl_label = "End background check"
-	bl_idname = updater.addon+".end_background_check"
-	bl_description = "Stop checking for update in the background"
-	bl_options = {'REGISTER', 'INTERNAL'}
-
-	# @classmethod
-	# def poll(cls, context):
-	# 	if updater.async_checking == True:
-	# 		return True
-	# 	else:
-	# 		return False
-
-	def execute(self, context):
-		# in case of error importing updater
-		if updater.invalidupdater == True:
-			return {'CANCELLED'}
-		updater.stop_async_check_update()
-		return {'FINISHED'}
-
-
-# -----------------------------------------------------------------------------
-# Handler related, to create popups
-# -----------------------------------------------------------------------------
-
-
-# global vars used to prevent duplicate popup handlers
-ran_autocheck_install_popup = False
-ran_update_sucess_popup = False
-
-# global var for preventing successive calls
-ran_background_check = False
-
-@persistent
-def updater_run_success_popup_handler(scene):
-	global ran_update_sucess_popup
-	ran_update_sucess_popup = True
-
-	# in case of error importing updater
-	if updater.invalidupdater == True:
-		return
-
-	try:
-		bpy.app.handlers.scene_update_post.remove(
-				updater_run_success_popup_handler)
-	except:
-		pass
-
-	atr = addon_updater_updated_successful.bl_idname.split(".")
-	getattr(getattr(bpy.ops, atr[0]),atr[1])('INVOKE_DEFAULT')
-
-
-@persistent
-def updater_run_install_popup_handler(scene):
-	global ran_autocheck_install_popup
-	ran_autocheck_install_popup = True
-
-	# in case of error importing updater
-	if updater.invalidupdater == True:
-		return
-
-	try:
-		bpy.app.handlers.scene_update_post.remove(
-				updater_run_install_popup_handler)
-	except:
-		pass
-
-	if "ignore" in updater.json and updater.json["ignore"] == True:
-		return # don't do popup if ignore pressed
-	# elif type(updater.update_version) != type((0,0,0)):
-	# 	# likely was from master or another branch, shouldn't trigger popup
-	# 	updater.json_reset_restore()
-	# 	return
-	elif "version_text" in updater.json and "version" in updater.json["version_text"]:
-		version = updater.json["version_text"]["version"]
-		ver_tuple = updater.version_tuple_from_text(version)
-
-		if ver_tuple < updater.current_version:
-			# user probably manually installed to get the up to date addon
-			# in here. Clear out the update flag using this function
-			if updater.verbose:
-				print("{} updater: appears user updated, clearing flag".format(\
-						updater.addon))
-			updater.json_reset_restore()
-			return
-	atr = addon_updater_install_popup.bl_idname.split(".")
-	getattr(getattr(bpy.ops, atr[0]),atr[1])('INVOKE_DEFAULT')
-
-
-def background_update_callback(update_ready):
-	"""Passed into the updater, background thread updater"""
-	global ran_autocheck_install_popup
-
-	# in case of error importing updater
-	if updater.invalidupdater == True:
-		return
-	if updater.showpopups == False:
-		return
-	if update_ready != True:
-		return
-	if updater_run_install_popup_handler not in \
-				bpy.app.handlers.scene_update_post and \
-				ran_autocheck_install_popup==False:
-		bpy.app.handlers.scene_update_post.append(
-				updater_run_install_popup_handler)
-		ran_autocheck_install_popup = True
-
-
-def post_update_callback(module_name, res=None):
-	"""Callback for once the run_update function has completed
-
-	Only makes sense to use this if "auto_reload_post_update" == False,
-	i.e. don't auto-restart the addon
-
-	Arguments:
-		module_name: returns the module name from updater, but unused here
-		res: If an error occurred, this is the detail string
-	"""
-
-	# in case of error importing updater
-	if updater.invalidupdater == True:
-		return
-
-	if res==None:
-		# this is the same code as in conditional at the end of the register function
-		# ie if "auto_reload_post_update" == True, comment out this code
-		if updater.verbose:
-			print("{} updater: Running post update callback".format(updater.addon))
-		#bpy.app.handlers.scene_update_post.append(updater_run_success_popup_handler)
-
-		atr = addon_updater_updated_successful.bl_idname.split(".")
-		getattr(getattr(bpy.ops, atr[0]),atr[1])('INVOKE_DEFAULT')
-		global ran_update_sucess_popup
-		ran_update_sucess_popup = True
-	else:
-		# some kind of error occurred and it was unable to install,
-		# offer manual download instead
-		atr = addon_updater_updated_successful.bl_idname.split(".")
-		getattr(getattr(bpy.ops, atr[0]),atr[1])('INVOKE_DEFAULT',error=res)
-	return
-
-
-def ui_refresh(update_status):
-	# find a way to just re-draw self?
-	# callback intended for trigger by async thread
-	for windowManager in bpy.data.window_managers:
-		for window in windowManager.windows:
-			for area in window.screen.areas:
-				area.tag_redraw()
-
-
-def check_for_update_background():
-	"""Function for asynchronous background check.
-
-	*Could* be called on register, but would be bad practice.
-	"""
-	if updater.invalidupdater == True:
-		return
-	global ran_background_check
-	if ran_background_check == True:
-		# Global var ensures check only happens once
-		return
-	elif updater.update_ready != None or updater.async_checking == True:
-		# Check already happened
-		# Used here to just avoid constant applying settings below
-		return
-
-	# apply the UI settings
-	settings = get_user_preferences(bpy.context)
-	if not settings:
-		return
-	updater.set_check_interval(enable=settings.auto_check_update,
-				months=settings.updater_intrval_months,
-				days=settings.updater_intrval_days,
-				hours=settings.updater_intrval_hours,
-				minutes=settings.updater_intrval_minutes
-				) # optional, if auto_check_update
-
-	# input is an optional callback function
-	# this function should take a bool input, if true: update ready
-	# if false, no update ready
-	if updater.verbose:
-		print("{} updater: Running background check for update".format(\
-				updater.addon))
-	updater.check_for_update_async(background_update_callback)
-	ran_background_check = True
-
-
-def check_for_update_nonthreaded(self, context):
-	"""Can be placed in front of other operators to launch when pressed"""
-	if updater.invalidupdater == True:
-		return
-
-	# only check if it's ready, ie after the time interval specified
-	# should be the async wrapper call here
-	settings = get_user_preferences(bpy.context)
-	if not settings:
-		if updater.verbose:
-			print("Could not get {} preferences, update check skipped".format(
-				__package__))
-		return
-	updater.set_check_interval(enable=settings.auto_check_update,
-				months=settings.updater_intrval_months,
-				days=settings.updater_intrval_days,
-				hours=settings.updater_intrval_hours,
-				minutes=settings.updater_intrval_minutes
-				) # optional, if auto_check_update
-
-	(update_ready, version, link) = updater.check_for_update(now=False)
-	if update_ready == True:
-		atr = addon_updater_install_popup.bl_idname.split(".")
-		getattr(getattr(bpy.ops, atr[0]),atr[1])('INVOKE_DEFAULT')
-	else:
-		if updater.verbose: print("No update ready")
-		self.report({'INFO'}, "No update ready")
-
-
-def showReloadPopup():
-	"""For use in register only, to show popup after re-enabling the addon
-
-	Must be enabled by developer
-	"""
-	if updater.invalidupdater == True:
-		return
-	saved_state = updater.json
-	global ran_update_sucess_popup
-
-	a = saved_state != None
-	b = "just_updated" in saved_state
-	c = saved_state["just_updated"]
-
-	if a and b and c:
-		updater.json_reset_postupdate() # so this only runs once
-
-		# no handlers in this case
-		if updater.auto_reload_post_update == False: return
-
-		if updater_run_success_popup_handler not in \
-					bpy.app.handlers.scene_update_post \
-					and ran_update_sucess_popup==False:
-			bpy.app.handlers.scene_update_post.append(
-					updater_run_success_popup_handler)
-			ran_update_sucess_popup = True
-
-
-# -----------------------------------------------------------------------------
-# Example UI integrations
-# -----------------------------------------------------------------------------
-
-
-def update_notice_box_ui(self, context):
-	""" Panel - Update Available for placement at end/beginning of panel
-
-	After a check for update has occurred, this function will draw a box
-	saying an update is ready, and give a button for: update now, open website,
-	or ignore popup. Ideal to be placed at the end / beginning of a panel
-	"""
-
-	if updater.invalidupdater == True:
-		return
-
-	saved_state = updater.json
-	if updater.auto_reload_post_update == False:
-		if "just_updated" in saved_state and saved_state["just_updated"] == True:
-			layout = self.layout
-			box = layout.box()
-			col = box.column()
-			col.scale_y = 0.7
-			col.label(text="Restart blender", icon="ERROR")
-			col.label(text="to complete update")
-			return
-
-	# if user pressed ignore, don't draw the box
-	if "ignore" in updater.json and updater.json["ignore"] == True:
-		return
-	if updater.update_ready != True:
-		return
-
-	layout = self.layout
-	box = layout.box()
-	col = box.column(align=True)
-	col.label(text="Update ready!",icon="ERROR")
-	col.separator()
-	row = col.row(align=True)
-	split = row.split(align=True)
-	colL = split.column(align=True)
-	colL.scale_y = 1.5
-	colL.operator(addon_updater_ignore.bl_idname,icon="X",text="Ignore")
-	colR = split.column(align=True)
-	colR.scale_y = 1.5
-	if updater.manual_only==False:
-		colR.operator(addon_updater_update_now.bl_idname,
-						text="Update", icon="LOOP_FORWARDS")
-		col.operator("wm.url_open", text="Open website").url = updater.website
-		#col.operator("wm.url_open",text="Direct download").url=updater.update_link
-		col.operator(addon_updater_install_manually.bl_idname,
-			text="Install manually")
-	else:
-		#col.operator("wm.url_open",text="Direct download").url=updater.update_link
-		col.operator("wm.url_open", text="Get it now").url = updater.website
-
-
-def update_settings_ui(self, context, element=None):
-	"""Preferences - for drawing with full width inside user preferences
-
-	Create a function that can be run inside user preferences panel for prefs UI
-	Place inside UI draw using: addon_updater_ops.updaterSettingsUI(self, context)
-	or by: addon_updater_ops.updaterSettingsUI(context)
-	"""
-
-	# element is a UI element, such as layout, a row, column, or box
-	if element==None:
-		element = self.layout
-	box = element.box()
-
-	# in case of error importing updater
-	if updater.invalidupdater == True:
-		box.label(text="Error initializing updater code:")
-		box.label(text=updater.error_msg)
-		return
-	settings = get_user_preferences(context)
-	if not settings:
-		box.label(text="Error getting updater preferences", icon='ERROR')
-		return
-
-	# auto-update settings
-	row = box.row()
-	row.alignment = 'LEFT'
-	row.prop(settings, 'updater_expand_prefs', text="Updates", icon="TRIA_DOWN" if settings.updater_expand_prefs else "TRIA_RIGHT", emboss=False)
-	
-	if settings.updater_expand_prefs:
-		row = box.row()
-
-		# special case to tell user to restart blender, if set that way
-		if updater.auto_reload_post_update == False:
-			saved_state = updater.json
-			if "just_updated" in saved_state and saved_state["just_updated"] == True:
-				row.label(text="Restart blender to complete update", icon="ERROR")
-				return
-
-		split = layout_split(row, factor=0.3)
-		subcol = split.column()
-		subcol.prop(settings, "auto_check_update")
-		subcol = split.column()
-
-		if settings.auto_check_update==False:
-			subcol.enabled = False
-		subrow = subcol.row()
-		subrow.label(text="Interval between checks")
-		subrow = subcol.row(align=True)
-		checkcol = subrow.column(align=True)
-		checkcol.prop(settings,"updater_intrval_months")
-		checkcol = subrow.column(align=True)
-		checkcol.prop(settings,"updater_intrval_days")
-		checkcol = subrow.column(align=True)
-		checkcol.prop(settings,"updater_intrval_hours")
-		checkcol = subrow.column(align=True)
-		checkcol.prop(settings,"updater_intrval_minutes")
-
-		# checking / managing updates
-		row = box.row()
-		col = row.column()
-		if updater.error != None:
-			subcol = col.row(align=True)
-			subcol.scale_y = 1
-			split = subcol.split(align=True)
-			split.scale_y = 2
-			if "ssl" in updater.error_msg.lower():
-				split.enabled = True
-				split.operator(addon_updater_install_manually.bl_idname,
-							text=updater.error)
-			else:
-				split.enabled = False
-				split.operator(addon_updater_check_now.bl_idname,
-							text=updater.error)
-			split = subcol.split(align=True)
-			split.scale_y = 2
-			split.operator(addon_updater_check_now.bl_idname,
-							text = "", icon="FILE_REFRESH")
-
-		elif updater.update_ready == None and updater.async_checking == False:
-			col.scale_y = 2
-			col.operator(addon_updater_check_now.bl_idname)
-		elif updater.update_ready == None: # async is running
-			subcol = col.row(align=True)
-			subcol.scale_y = 1
-			split = subcol.split(align=True)
-			split.enabled = False
-			split.scale_y = 2
-			split.operator(addon_updater_check_now.bl_idname,
-							text="Checking...")
-			split = subcol.split(align=True)
-			split.scale_y = 2
-			split.operator(addon_updater_end_background.bl_idname,
-							text = "", icon="X")
-
-		elif updater.include_branches==True and \
-				len(updater.tags)==len(updater.include_branch_list) and \
-				updater.manual_only==False:
-			# no releases found, but still show the appropriate branch
-			subcol = col.row(align=True)
-			subcol.scale_y = 1
-			split = subcol.split(align=True)
-			split.scale_y = 2
-			split.operator(addon_updater_update_now.bl_idname,
-						text="Update directly to "+str(updater.include_branch_list[0]))
-			split = subcol.split(align=True)
-			split.scale_y = 2
-			split.operator(addon_updater_check_now.bl_idname,
-							text = "", icon="FILE_REFRESH")
-
-		elif updater.update_ready==True and updater.manual_only==False:
-			subcol = col.row(align=True)
-			subcol.scale_y = 1
-			split = subcol.split(align=True)
-			split.scale_y = 2
-			split.operator(addon_updater_update_now.bl_idname,
-						text="Update now to "+str(updater.update_version))
-			split = subcol.split(align=True)
-			split.scale_y = 2
-			split.operator(addon_updater_check_now.bl_idname,
-							text = "", icon="FILE_REFRESH")
-
-		elif updater.update_ready==True and updater.manual_only==True:
-			col.scale_y = 2
-			col.operator("wm.url_open",
-					text="Download "+str(updater.update_version)).url=updater.website
-		else: # i.e. that updater.update_ready == False
-			subcol = col.row(align=True)
-			subcol.scale_y = 1
-			split = subcol.split(align=True)
-			split.enabled = False
-			split.scale_y = 2
-			split.operator(addon_updater_check_now.bl_idname,
-							text="Addon is up to date")
-			split = subcol.split(align=True)
-			split.scale_y = 2
-			split.operator(addon_updater_check_now.bl_idname,
-							text = "", icon="FILE_REFRESH")
-
-		if updater.manual_only == False:
-			col = row.column(align=True)
-			#col.operator(addon_updater_update_target.bl_idname,
-			if updater.include_branches == True and len(updater.include_branch_list)>0:
-				branch = updater.include_branch_list[0]
-				col.operator(addon_updater_update_target.bl_idname,
-						text="Install latest {} / old version".format(branch))
-			else:
-				col.operator(addon_updater_update_target.bl_idname,
-						text="Reinstall / install old version")
-			lastdate = "none found"
-			backuppath = os.path.join(updater.stage_path,"backup")
-			if "backup_date" in updater.json and os.path.isdir(backuppath):
-				if updater.json["backup_date"] == "":
-					lastdate = "Date not found"
-				else:
-					lastdate = updater.json["backup_date"]
-			backuptext = "Restore addon backup ({})".format(lastdate)
-			col.operator(addon_updater_restore_backup.bl_idname, text=backuptext)
-
-		row = box.row()
-		row.scale_y = 0.7
-		lastcheck = updater.json["last_check"]
-		if updater.error != None and updater.error_msg != None:
-			row.label(text=updater.error_msg)
-		elif lastcheck != "" and lastcheck != None:
-			lastcheck = lastcheck[0: lastcheck.index(".") ]
-			row.label(text="Last update check: " + lastcheck)
-		else:
-			row.label(text="Last update check: Never")
-
-
-def update_settings_ui_condensed(self, context, element=None):
-	"""Preferences - Condensed drawing within preferences
-
-	Alternate draw for user preferences or other places, does not draw a box
-	"""
-
-	# element is a UI element, such as layout, a row, column, or box
-	if element==None:
-		element = self.layout
-	row = element.row()
-
-	# in case of error importing updater
-	if updater.invalidupdater == True:
-		row.label(text="Error initializing updater code:")
-		row.label(text=updater.error_msg)
-		return
-	settings = get_user_preferences(context)
-	if not settings:
-		row.label(text="Error getting updater preferences", icon='ERROR')
-		return
-
-	# special case to tell user to restart blender, if set that way
-	if updater.auto_reload_post_update == False:
-		saved_state = updater.json
-		if "just_updated" in saved_state and saved_state["just_updated"] == True:
-			row.label(text="Restart blender to complete update", icon="ERROR")
-			return
-
-	col = row.column()
-	if updater.error != None:
-		subcol = col.row(align=True)
-		subcol.scale_y = 1
-		split = subcol.split(align=True)
-		split.scale_y = 2
-		if "ssl" in updater.error_msg.lower():
-			split.enabled = True
-			split.operator(addon_updater_install_manually.bl_idname,
-						text=updater.error)
-		else:
-			split.enabled = False
-			split.operator(addon_updater_check_now.bl_idname,
-						text=updater.error)
-		split = subcol.split(align=True)
-		split.scale_y = 2
-		split.operator(addon_updater_check_now.bl_idname,
-						text = "", icon="FILE_REFRESH")
-
-	elif updater.update_ready == None and updater.async_checking == False:
-		col.scale_y = 2
-		col.operator(addon_updater_check_now.bl_idname)
-	elif updater.update_ready == None: # async is running
-		subcol = col.row(align=True)
-		subcol.scale_y = 1
-		split = subcol.split(align=True)
-		split.enabled = False
-		split.scale_y = 2
-		split.operator(addon_updater_check_now.bl_idname,
-						text="Checking...")
-		split = subcol.split(align=True)
-		split.scale_y = 2
-		split.operator(addon_updater_end_background.bl_idname,
-						text = "", icon="X")
-
-	elif updater.include_branches==True and \
-			len(updater.tags)==len(updater.include_branch_list) and \
-			updater.manual_only==False:
-		# no releases found, but still show the appropriate branch
-		subcol = col.row(align=True)
-		subcol.scale_y = 1
-		split = subcol.split(align=True)
-		split.scale_y = 2
-		split.operator(addon_updater_update_now.bl_idname,
-					text="Update directly to "+str(updater.include_branch_list[0]))
-		split = subcol.split(align=True)
-		split.scale_y = 2
-		split.operator(addon_updater_check_now.bl_idname,
-						text = "", icon="FILE_REFRESH")
-
-	elif updater.update_ready==True and updater.manual_only==False:
-		subcol = col.row(align=True)
-		subcol.scale_y = 1
-		split = subcol.split(align=True)
-		split.scale_y = 2
-		split.operator(addon_updater_update_now.bl_idname,
-					text="Update now to "+str(updater.update_version))
-		split = subcol.split(align=True)
-		split.scale_y = 2
-		split.operator(addon_updater_check_now.bl_idname,
-						text = "", icon="FILE_REFRESH")
-
-	elif updater.update_ready==True and updater.manual_only==True:
-		col.scale_y = 2
-		col.operator("wm.url_open",
-				text="Download "+str(updater.update_version)).url=updater.website
-	else: # i.e. that updater.update_ready == False
-		subcol = col.row(align=True)
-		subcol.scale_y = 1
-		split = subcol.split(align=True)
-		split.enabled = False
-		split.scale_y = 2
-		split.operator(addon_updater_check_now.bl_idname,
-						text="Addon is up to date")
-		split = subcol.split(align=True)
-		split.scale_y = 2
-		split.operator(addon_updater_check_now.bl_idname,
-						text = "", icon="FILE_REFRESH")
-
-	row = element.row()
-	row.prop(settings, "auto_check_update")
-
-	row = element.row()
-	row.scale_y = 0.7
-	lastcheck = updater.json["last_check"]
-	if updater.error != None and updater.error_msg != None:
-		row.label(text=updater.error_msg)
-	elif lastcheck != "" and lastcheck != None:
-		lastcheck = lastcheck[0: lastcheck.index(".") ]
-		row.label(text="Last check: " + lastcheck)
-	else:
-		row.label(text="Last check: Never")
-
-
-def skip_tag_function(self, tag):
-	"""A global function for tag skipping
-
-	A way to filter which tags are displayed,
-	e.g. to limit downgrading too far
-	input is a tag text, e.g. "v1.2.3"
-	output is True for skipping this tag number,
-	False if the tag is allowed (default for all)
-	Note: here, "self" is the acting updater shared class instance
-	"""
-
-	# in case of error importing updater
-	if self.invalidupdater == True:
-		return False
-
-	# ---- write any custom code here, return true to disallow version ---- #
-	#
-	# # Filter out e.g. if 'beta' is in name of release
-	# if 'beta' in tag.lower():
-	#	return True
-	# ---- write any custom code above, return true to disallow version --- #
-
-	if self.include_branches == True:
-		for branch in self.include_branch_list:
-			if tag["name"].lower() == branch: return False
-
-	# function converting string to tuple, ignoring e.g. leading 'v'
-	tupled = self.version_tuple_from_text(tag["name"])
-	if type(tupled) != type( (1,2,3) ): return True
-
-	# select the min tag version - change tuple accordingly
-	if self.version_min_update != None:
-		if tupled < self.version_min_update:
-			return True # skip if current version below this
-
-	# select the max tag version
-	if self.version_max_update != None:
-		if tupled >= self.version_max_update:
-			return True # skip if current version at or above this
-
-	# in all other cases, allow showing the tag for updating/reverting
-	return False
-
-
-def select_link_function(self, tag):
-	"""Only customize if trying to leverage "attachments" in *GitHub* releases
-
-	A way to select from one or multiple attached donwloadable files from the
-	server, instead of downloading the default release/tag source code
-	"""
-
-	# -- Default, universal case (and is the only option for GitLab/Bitbucket)
-	link = tag["zipball_url"]
-
-	# -- Example: select the first (or only) asset instead source code --
-	#if "assets" in tag and "browser_download_url" in tag["assets"][0]:
-	#	link = tag["assets"][0]["browser_download_url"]
-
-	# -- Example: select asset based on OS, where multiple builds exist --
-	# # not tested/no error checking, modify to fit your own needs!
-	# # assume each release has three attached builds:
-	# #		release_windows.zip, release_OSX.zip, release_linux.zip
-	# # This also would logically not be used with "branches" enabled
-	# if platform.system() == "Darwin": # ie OSX
-	#	link = [asset for asset in tag["assets"] if 'OSX' in asset][0]
-	# elif platform.system() == "Windows":
-	#	link = [asset for asset in tag["assets"] if 'windows' in asset][0]
-	# elif platform.system() == "Linux":
-	#	link = [asset for asset in tag["assets"] if 'linux' in asset][0]
-
-	return link
-
-
-# -----------------------------------------------------------------------------
-# Register, should be run in the register module itself
-# -----------------------------------------------------------------------------
-
-
-classes = (
-	addon_updater_install_popup,
-	addon_updater_check_now,
-	addon_updater_update_now,
-	addon_updater_update_target,
-	addon_updater_install_manually,
-	addon_updater_updated_successful,
-	addon_updater_restore_backup,
-	addon_updater_ignore,
-	addon_updater_end_background
-)
-
-
-def register(bl_info):
-	"""Registering the operators in this module"""
-	# safer failure in case of issue loading module
-	if updater.error:
-		print("Exiting updater registration, " + updater.error)
-		return
-	updater.clear_state() # clear internal vars, avoids reloading oddities
-
-	# confirm your updater "engine" (Github is default if not specified)
-	updater.engine = "Github"
-	# updater.engine = "GitLab"
-	# updater.engine = "Bitbucket"
-
-	# If using private repository, indicate the token here
-	# Must be set after assigning the engine.
-	# **WARNING** Depending on the engine, this token can act like a password!!
-	# Only provide a token if the project is *non-public*, see readme for
-	# other considerations and suggestions from a security standpoint
-	updater.private_token = None # "tokenstring"
-
-	# choose your own username, must match website (not needed for GitLab)
-	updater.user = "gregzaal"
-
-	# choose your own repository, must match git name
-	updater.repo = "Gaffer"
-
-	#updater.addon = # define at top of module, MUST be done first
-
-	# Website for manual addon download, optional but recommended to set
-	updater.website = "https://blendermarket.com/products/gaffer-light-manager"
-
-	# Addon subfolder path
-	# "sample/path/to/addon"
-	# default is "" or None, meaning root
-	updater.subfolder_path = ""
-
-	# used to check/compare versions
-	updater.current_version = bl_info["version"]
-
-	# Optional, to hard-set update frequency, use this here - however,
-	# this demo has this set via UI properties.
-	# updater.set_check_interval(
-	# 		enable=False,months=0,days=0,hours=0,minutes=2)
-
-	# Optional, consider turning off for production or allow as an option
-	# This will print out additional debugging info to the console
-	updater.verbose = False # make False for production default
-
-	# Optional, customize where the addon updater processing subfolder is,
-	# essentially a staging folder used by the updater on its own
-	# Needs to be within the same folder as the addon itself
-	# Need to supply a full, absolute path to folder
-	# updater.updater_path = # set path of updater folder, by default:
-	#			/addons/{__package__}/{__package__}_updater
-
-	# auto create a backup of the addon when installing other versions
-	updater.backup_current = True # True by default
-
-	# Sample ignore patterns for when creating backup of current during update
-	updater.backup_ignore_patterns = ["__pycache__"]
-	# Alternate example patterns
-	# updater.backup_ignore_patterns = [".git", "__pycache__", "*.bat", ".gitignore", "*.exe"]
-
-	# Patterns for files to actively overwrite if found in new update
-	# file and are also found in the currently installed addon. Note that
-
-	# by default (ie if set to []), updates are installed in the same way as blender:
-	# .py files are replaced, but other file types (e.g. json, txt, blend)
-	# will NOT be overwritten if already present in current install. Thus
-	# if you want to automatically update resources/non py files, add them
-	# as a part of the pattern list below so they will always be overwritten by an
-	# update. If a pattern file is not found in new update, no action is taken
-	# This does NOT detele anything, only defines what is allowed to be overwritten
-	updater.overwrite_patterns = ["*.png","*.jpg","README.md","LICENSE.txt"]
-	# updater.overwrite_patterns = []
-	# other examples:
-	# ["*"] means ALL files/folders will be overwritten by update, was the behavior pre updater v1.0.4
-	# [] or ["*.py","*.pyc"] matches default blender behavior, ie same effect if user installs update manually without deleting the existing addon first
-	#    e.g. if existing install and update both have a resource.blend file, the existing installed one will remain
-	# ["some.py"] means if some.py is found in addon update, it will overwrite any existing some.py in current addon install, if any
-	# ["*.json"] means all json files found in addon update will overwrite those of same name in current install
-	# ["*.png","README.md","LICENSE.txt"] means the readme, license, and all pngs will be overwritten by update
-
-	# Patterns for files to actively remove prior to running update
-	# Useful if wanting to remove old code due to changes in filenames
-	# that otherwise would accumulate. Note: this runs after taking
-	# a backup (if enabled) but before placing in new update. If the same
-	# file name removed exists in the update, then it acts as if pattern
-	# is placed in the overwrite_patterns property. Note this is effectively
-	# ignored if clean=True in the run_update method
-	updater.remove_pre_update_patterns = ["*.py", "*.pyc"]
-	# Note setting ["*"] here is equivalent to always running updates with
-	# clean = True in the run_update method, ie the equivalent of a fresh,
-	# new install. This would also delete any resources or user-made/modified
-	# files setting ["__pycache__"] ensures the pycache folder is always removed
-	# The configuration of ["*.py","*.pyc"] is a safe option as this
-	# will ensure no old python files/caches remain in event different addon
-	# versions have different filenames or structures
-
-	# Allow branches like 'master' as an option to update to, regardless
-	# of release or version.
-	# Default behavior: releases will still be used for auto check (popup),
-	# but the user has the option from user preferences to directly
-	# update to the master branch or any other branches specified using
-	# the "install {branch}/older version" operator.
-	updater.include_branches = True
-
-	# (GitHub only) This options allows the user to use releases over tags for data,
-	# which enables pulling down release logs/notes, as well as specify installs from
-	# release-attached zips (instead of just the auto-packaged code generated with
-	# a release/tag). Setting has no impact on BitBucket or GitLab repos
-	updater.use_releases = False
-	# note: Releases always have a tag, but a tag may not always be a release
-	# Therefore, setting True above will filter out any non-annoted tags
-	# note 2: Using this option will also display the release name instead of
-	# just the tag name, bear this in mind given the skip_tag_function filtering above
-
-	# if using "include_branches",
-	# updater.include_branch_list defaults to ['master'] branch if set to none
-	# example targeting another multiple branches allowed to pull from
-	# updater.include_branch_list = ['master', 'dev'] # example with two branches
-	updater.include_branch_list = None  # None is the equivalent to setting ['master']
-
-	# Only allow manual install, thus prompting the user to open
-	# the addon's web page to download, specifically: updater.website
-	# Useful if only wanting to get notification of updates but not
-	# directly install.
-	updater.manual_only = False
-
-	# Used for development only, "pretend" to install an update to test
-	# reloading conditions
-	updater.fake_install = False # Set to true to test callback/reloading
-
-	# Show popups, ie if auto-check for update is enabled or a previous
-	# check for update in user preferences found a new version, show a popup
-	# (at most once per blender session, and it provides an option to ignore
-	# for future sessions); default behavior is set to True
-	updater.showpopups = True
-	# note: if set to false, there will still be an "update ready" box drawn
-	# using the `update_notice_box_ui` panel function.
-
-	# Override with a custom function on what tags
-	# to skip showing for updater; see code for function above.
-	# Set the min and max versions allowed to install.
-	# Optional, default None
-	# min install (>=) will install this and higher
-	updater.version_min_update = None
-	# updater.version_min_update = None  # if not wanting to define a min
-
-	# max install (<) will install strictly anything lower
-	# updater.version_max_update = (9,9,9)
-	updater.version_max_update = None # set to None if not wanting to set max
-
-	# Function defined above, customize as appropriate per repository
-	updater.skip_tag = skip_tag_function # min and max used in this function
-
-	# Function defined above, customize as appropriate per repository; not required
-	updater.select_link = select_link_function
-
-	# The register line items for all operators/panels
-	# If using bpy.utils.register_module(__name__) to register elsewhere
-	# in the addon, delete these lines (also from unregister)
-	for cls in classes:
-		# apply annotations to remove Blender 2.8 warnings, no effect on 2.7
-		make_annotations(cls)
-		# comment out this line if using bpy.utils.register_module(__name__)
-		bpy.utils.register_class(cls)
-
-	# special situation: we just updated the addon, show a popup
-	# to tell the user it worked
-	# should be enclosed in try/catch in case other issues arise
-	showReloadPopup()
-
-
-def unregister():
-	for cls in reversed(classes):
-		# comment out this line if using bpy.utils.unregister_module(__name__)
-		bpy.utils.unregister_class(cls)
-
-	# clear global vars since they may persist if not restarting blender
-	updater.clear_state() # clear internal vars, avoids reloading oddities
-
-	global ran_autocheck_install_popup
-	ran_autocheck_install_popup = False
-
-	global ran_update_sucess_popup
-	ran_update_sucess_popup = False
-
-	global ran_background_check
-	ran_background_check = False
diff --git a/ui.py b/ui.py
index 2809021..3c2291c 100644
--- a/ui.py
+++ b/ui.py
@@ -17,7 +17,6 @@
 # END GPL LICENSE BLOCK #####
 
 import bpy
-from . import addon_updater_ops
 from collections import OrderedDict
 import bgl
 import blf
@@ -582,7 +581,6 @@ class GAFFER_PT_lights(bpy.types.Panel):
     bl_category = "Gaffer"
 
     def draw(self, context):
-        addon_updater_ops.check_for_update_background()
 
         scene = context.scene
         gaf_props = scene.gaf_props
@@ -646,7 +644,6 @@ class GAFFER_PT_lights(bpy.types.Panel):
                          text="",
                          icon='URL').url = "https://forms.gle/R22DphecWsXmaLAr9"
 
-        addon_updater_ops.update_notice_box_ui(self, context)
 
 
 class GAFFER_PT_tools(bpy.types.Panel):