diff --git a/client/lib/engine/bin/CacheLib.py b/client/lib/engine/bin/CacheLib.py index 37246c9..575457b 100755 --- a/client/lib/engine/bin/CacheLib.py +++ b/client/lib/engine/bin/CacheLib.py @@ -162,7 +162,9 @@ def ogFormatCache(): # Crear estructura básica. mntdir = ogMountCache() - os.makedirs(os.path.join(mntdir, ogGlobals.OGIMG), exist_ok=True) + j = '/'.join ([mntdir, ogGlobals.OGIMG]) ## os.path.join doesn't work: "If a segment […] is an absolute path, all previous segments are ignored" + print (f'cucu mntdir ({mntdir}) OGIMG ({ogGlobals.OGIMG}) j ({j})') + os.makedirs (j, exist_ok=True) # Incluir kernel e Initrd del ogLive ## como lo llamo sin especificar el path entero? diff --git a/client/shared/functions/ogTorrentStart b/client/shared/functions/ogTorrentStart new file mode 100755 index 0000000..778d512 --- /dev/null +++ b/client/shared/functions/ogTorrentStart @@ -0,0 +1,39 @@ +#!/usr/bin/python3 + +import sys +import argparse +from SystemLib import ogHelp +from ProtocolLib import ogTorrentStart + +if 2 == len (sys.argv) and 'help' == sys.argv[1]: + #parser.print_help() sale en inglés aunque la locale indique otra cosa + ogHelp ('ogTorrentStart', 'ogTorrentStart [ str_repo] [ [Relative_path_fileTORRENT] | [str_REPOSITORY path_fileTORRENT] | [int_ndisk int_npart path_fileTORRENT ] ] SessionTorrent', ['ogTorrentStart CACHE /PS1_PH1.img.torrent seeder:10000', 'ogTorrentStart /opt/opengnsys/cache/linux.iso peer:60', 'ogTorrentStart 1 1 /linux.iso.torrent leecher:60']) + sys.exit (0) + +parser = argparse.ArgumentParser (add_help=False) +if 3 == len (sys.argv): + parser.add_argument ('torrentfile', nargs='?', default=None) + parser.add_argument ('torrentsess', nargs='?', default=None) +elif 4 == len (sys.argv): + parser.add_argument ('container', nargs='?', default=None) + parser.add_argument ('torrentfile', nargs='?', default=None) + parser.add_argument ('torrentsess', nargs='?', default=None) +elif 5 == len (sys.argv): + parser.add_argument ('disk', nargs='?', default=None) + parser.add_argument ('par', nargs='?', default=None) + parser.add_argument ('torrentfile', nargs='?', default=None) + parser.add_argument ('torrentsess', nargs='?', default=None) + +args = parser.parse_args() + +if 3 == len (sys.argv): + ret = ogTorrentStart (torrentfile=args.torrentfile, torrentsess=args.torrentsess) +elif 4 == len (sys.argv): + ret = ogTorrentStart (container=args.container, torrentfile=args.torrentfile, torrentsess=args.torrentsess) +elif 5 == len (sys.argv): + ret = ogTorrentStart (disk=args.disk, par=args.par, torrentfile=args.torrentfile, torrentsess=args.torrentsess) + +if ret is not None: + if ret == True: sys.exit (0) + elif ret == False: sys.exit (1) + else: print (ret)