From e6857efe04644d6fc68eebc03153d99272209aaa Mon Sep 17 00:00:00 2001
From: willip <willipink@gmx.de>
Date: Fri, 8 Mar 2019 11:53:21 +0000
Subject: [PATCH] - update .gitignore to ignore python bytecode - move
 log-routine to pyf - add feature to check_update to properly check if the
 file exists

---
 .gitignore                     |   3 ++-
 __pycache__/pyf.cpython-35.pyc | Bin 1389 -> 1668 bytes
 pyf.py                         |  11 ++++++++++-
 quickos.py                     |  33 +++++++++++----------------------
 4 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 223f15a..6fc6cad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.swp
 Session.vim
-__pycache__
+__pycache__/
+*.py[cod]
diff --git a/__pycache__/pyf.cpython-35.pyc b/__pycache__/pyf.cpython-35.pyc
index e8039a82b4e91a7071985b693472554340dc73d9..3e79dd98533ff534356bf26e588364915c99d5bc 100644
GIT binary patch
delta 942
zcmZ8g&2G~`5T3CeC(TcrmY<6DfTdJLKJ*8UsH!S~gaDP6Hc*s;BG<cZ(%Nyd-YBR|
zR783PRhD=K1c$x|Z?HGSi39Jztka4LYj<`$JDzXm`{Y0Qvr=WcRLcK&{qgOl1@H^5
zJtp~UwBwEQ%G`3z0!AwXX8^SfFdJAl^~uQr8v~YyGlW_em;u{v;hejt$K@p%wwF5H
zrhgR0i$QeY<0XJWXMy%34X{E+(n4SeLjyj~!vLX=aA@dihbBl14l^(W=z~reBH#`)
z;pNsFvfHk8%$=TSO76(WA(;JUz@6&p`exp_eAe2Y@Ioi#aqJ!NhmLIUs~4x&X!;E&
zZg@f9?2QUZ-qNLX7L{{!y|k1<@7O*WI46Vr3)faw)aET^R@XOGCdF6wek4LqDoZxQ
z8Ll!uo!m84_7Yj){x=YXB!~02sPdQ|pNI#rrcjjVJpbe`2%8)ig}xP<rI9I;r_8pH
zljOvjK`_KbvWhczzLQVf5m^C1h%hh#`v!<FNeAZ^o{(%L7%4}#Z^6)nK?eF1B(<)@
zV+CMEV5Q_I-h42w*=G~bw^QEHAiB$%?p7K4rdENaDMLi0i*0u@xo5mjE{u1^Z%j(&
zhnfG{9_zN5CwZMnO}?7DOViZwwb9b-biQ1*!@^hXYIK(}(jki|W|R9?<(ZhGP|adI
z_Ek<x((*!H%M0F)glt675lK=T?}{L3?kx)5>GD{LvIf$Gi3x2qvtl~Au$<F>H?tH}
zD6jQ1YK29;RuFkiHyi78u*zs-8E@cidk!mxa46>HRJLAckzcPXBZ`%Mz@^_~D!a3>
t_5AVEEur;IwH>vfzagmQ)Lxkp;7S;=ZopUdUlQw(Z4|L+*;vdK?Z3sV%isV2

delta 639
zcmZ8dO=}ZT6g_u7UMA_JjZJJ+tSux6gJAxEErNoIikL<!Q7N%+l!i%X`es7KCa5HP
zDQ_i$dw)R1l{**yg=}4Q;mVyGy|0Bfc;Q~|$Kl+=85e&QYSm(~u=wHK(~mar6H~!6
zu5+d<`?dNd>0k`B9Y_~aK;|$ew7Ivi7I^!+f&NXK)roi!t6nDyXp-xNY1(-ieui@O
zSGs&9QCZH=SzKT#)3-Lw6BA}Ca^B!ff9OwEl@9b5tNw=Hbsc0b20)kp3XBM{jPoN4
zL&7cTLFSD#t^)@n8$-sjt^(u?qz_qyoHcso90r6DocGHZ3Jh#RDNAN4&tM?X%`vw{
z>vA3sn~%5oVxxS584(d*)`E(@Z@-#*?d}a5d&57}I3(7rzuV6&HKXg!+Y2tw>Zl0r
zCi#9MJ6X7q#Z~>ydD1AIoc{xQtsU8Wl(ganMjYAXld9<3ZcQid;>zJ)j=*cr_Ei*Z
zJ-@2Loqm{R$}@a<Q;dnqI6BF#KWN^)d8avX(<Iu;R7oGW%lA%^6$7H|SmmiyPsY33
zQQTqASiw9OI3*HPqB1Sff~Zr?QWtp}2)!iEuBvm~AHOx*DY_}nYrR<Zqj1&Olo|=b
J^2xV-@eeord;tIe

diff --git a/pyf.py b/pyf.py
index 3159066..98ac5c3 100644
--- a/pyf.py
+++ b/pyf.py
@@ -4,6 +4,16 @@ import os
 WORKDIR = os.getcwd()
 
 
+
+TMP = '/tmp/quickos.log'
+def log(message):
+    ''' write to logfile TMP
+        @param message: the message which shall be written to the log file
+    '''
+    with open(TMP, 'a') as f:
+        f.write('{} {}\n'.format(time.ctime(), message))
+
+
 def prt(message):
     ''' print a message with style '''
     print('::: {}'.format(message))
@@ -18,7 +28,6 @@ def download(url, file_name, progress=True):
     if progress:
         from tqdm import tqdm
         prt('downloading {}'.format(url))
-        file_name = '{}/{}'.format(WORKDIR, url.split('/')[-1])
         class TqdmUpTo(tqdm):
             def update_to(self, b=1, bsize=1, tsize=None):
                 if tsize is not None:
diff --git a/quickos.py b/quickos.py
index dfa7997..0a264e4 100755
--- a/quickos.py
+++ b/quickos.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 
 
-
 from pprint import pprint
 import daemon
 import time
@@ -10,14 +9,10 @@ import os
 import json
 from pyf import download, prt
 
+
 WORKDIR = os.getcwd()
 
 
-
-TMP = '/tmp/quickos.log'
-
-
-
 def init_parser():
     ''' initialize the argument parser
         @return agrs: the parsed arguments
@@ -33,16 +28,6 @@ def init_parser():
     return parser.parse_args()
 
 
-
-def log(message):
-    ''' write to logfile TMP
-        @param message: the message which shall be written to the log file
-    '''
-    with open(TMP, 'a') as f:
-        f.write('{} {}\n'.format(time.ctime(), message))
-
-
-
 # algo check if new version should be downloaded
 # a: is image file there?
 # -> no: download image file
@@ -64,15 +49,19 @@ def check_update(database):
     ''' check if update is necessary '''
     from urllib.parse import urlparse
     from os import path
-    for name, ops in database.items():
+    for name, dist in database.items():
         prt('checking operating system {} ...'.format(name))
 
-        if ops['file_name'] == '':
-            file_name = urlparse(ops['file_url'])
+        if dist['file_name'] == '':
+            file_name = urlparse(dist['file_url'])
             file_name = file_name.path
-            file_name = path.basename(file_name)
-            print(file_name)
-            download(ops['file_url'], file_name)
+            file_name = '{}/dist/{}'.format(WORKDIR, path.basename(file_name))
+            download(dist['file_url'], file_name)
+            continue
+
+        file_name = '{}/dist/{}'.format(WORKDIR, dist['file_name'])
+        if not path.isfile(file_name):
+            download(dist['file_url'], file_name)
             continue