tinyssg 0.0.6__tar.gz → 0.0.9__tar.gz

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: tinyssg
3
- Version: 0.0.6
3
+ Version: 0.0.9
4
4
  Summary: A simple static site generator
5
5
  Author: Uniras
6
6
  Author-email: tkappeng@gmail.com
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "tinyssg"
7
- version = "0.0.6"
7
+ version = "0.0.9"
8
8
  description = "A simple static site generator"
9
9
  readme = "README.md"
10
10
  authors = [
@@ -63,14 +63,21 @@ class TinySSGUtility:
63
63
  return result
64
64
 
65
65
  @classmethod
66
- def get_fullpath(cls, args: dict, pathkey: str) -> str:
66
+ def get_fullpath(cls, args: dict, pathkey: str = '') -> str:
67
67
  """
68
68
  Get the full path from the relative path
69
69
  """
70
70
  if isinstance(args['curdir'], str) and len(args['curdir']) > 0:
71
- return os.path.join(args['curdir'], args[pathkey])
71
+ basedir = args['curdir']
72
72
  else:
73
- return os.path.join(os.getcwd(), args[pathkey])
73
+ basedir = os.getcwd()
74
+
75
+ if isinstance(args[pathkey], str) and len(args[pathkey]) > 0:
76
+ result = os.path.join(basedir, args[pathkey])
77
+ else:
78
+ result = basedir
79
+
80
+ return result
74
81
 
75
82
  @classmethod
76
83
  def clear_output(cls, output_full_path: str) -> None:
@@ -103,6 +110,7 @@ class TinySSGUtility:
103
110
 
104
111
  print(message)
105
112
 
113
+ @classmethod
106
114
  def error_print(cls, message: str) -> None:
107
115
  """
108
116
  Output error message
@@ -482,7 +490,7 @@ class TinySSGDebug:
482
490
  """
483
491
  Output the server stop message
484
492
  """
485
- TinySSGUtility.error_print('Server return code:', process.poll())
493
+ TinySSGUtility.error_print(f"Server return code:{process.poll()}")
486
494
  TinySSGUtility.error_print('Server Output:\n')
487
495
  TinySSGUtility.error_print(process.stdout.read() if process.stdout else '')
488
496
  TinySSGUtility.error_print(process.stderr.read() if process.stderr else '')
@@ -566,13 +574,20 @@ class TinySSGLauncher:
566
574
  """
567
575
  url = f"http://localhost:{args['port']}/{args['output']}/"
568
576
 
577
+ is_jupyter = False
578
+
569
579
  try:
570
580
  from IPython import get_ipython # type: ignore
571
581
  env = get_ipython().__class__.__name__
572
582
  if env == 'ZMQInteractiveShell':
573
- from IPython import display
574
- display.display(display.IFrame(url, width=args['jwidth'], height=args['jheight']))
583
+ is_jupyter = True
575
584
  except: # noqa: E722
585
+ pass
586
+
587
+ if is_jupyter:
588
+ from IPython import display
589
+ display.display(display.IFrame(url, width=args['jwidth'], height=args['jheight']))
590
+ else:
576
591
  webbrowser.open(url)
577
592
 
578
593
  @classmethod
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: tinyssg
3
- Version: 0.0.6
3
+ Version: 0.0.9
4
4
  Summary: A simple static site generator
5
5
  Author: Uniras
6
6
  Author-email: tkappeng@gmail.com
@@ -1,6 +1,6 @@
1
1
  README.md
2
2
  pyproject.toml
3
- tinyssg/__main__.py
3
+ tinyssg/tinyssg.py
4
4
  tinyssg.egg-info/PKG-INFO
5
5
  tinyssg.egg-info/SOURCES.txt
6
6
  tinyssg.egg-info/dependency_links.txt
File without changes
File without changes