baseconvert 2.0.2__tar.gz → 2.0.4__tar.gz

{baseconvert-2.0.2/baseconvert.egg-info → baseconvert-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: baseconvert
-Version: 2.0.2
+Version: 2.0.4
 Summary: Convert numbers between bases.
 Home-page: https://github.com/BreadMakesYouFull/baseconvert.git
 Author: squdle, BreadMakesYouFull

{baseconvert-2.0.2 → baseconvert-2.0.4}/README.md

@@ -7,6 +7,15 @@ Convert rational numbers between bases.
 
 [https://github.com/BreadMakesYouFull/baseconvert](https://github.com/BreadMakesYouFull/baseconvert)
 
+<a href='https://flathub.org/apps/io.github.breadmakesyoufull.baseconvert'>
+  <img width='128' alt='Get it on Flathub' src='https://flathub.org/api/badge?locale=en'/>
+  Install for linux via flatpak
+</a>
+
+[![PyPI version](https://badge.fury.io/py/baseconvert.svg)](https://badge.fury.io/py/baseconvert) [![](https://github.com/breadmakesyoufull/baseconvert/actions/workflows/lint-then-test.yml/badge.svg)](https://github.com/BreadMakesYouFull/baseconvert/actions/workflows/lint-then-test.yml)
+
+
+
 ## Install
 
 Requires:

baseconvert-2.0.4/VERSION.txt

@@ -0,0 +1 @@
+2.0.4

{baseconvert-2.0.2 → baseconvert-2.0.4}/baseconvert/ButtonRow.qml

@@ -17,7 +17,8 @@ Item {
    property bool enable5: true
    property bool enable6: true
    signal buttonPressed(text: string)
-   property bool darkMode: Application.styleHints.colorScheme === Qt.ColorScheme.Dark
+   property bool is_windows: Qt.platform.os == "windows" // Just use light mode on windows for simplicity
+   property bool darkMode: is_windows ? false : (Application.styleHints.colorScheme === Qt.ColorScheme.Dark)
    property color color1: darkMode ? "#333333" : "#ffffff"
    property color colorText1: darkMode ? "#ffffff" : "#000000"
    property color color2: darkMode ? "#333333" : "#ffffff"

{baseconvert-2.0.2 → baseconvert-2.0.4}/baseconvert/__init__.py

@@ -2,4 +2,5 @@ from baseconvert.baseconvert import BaseConverter
 from baseconvert.baseconvert import base
 
 import pkg_resources
+
 __version__ = pkg_resources.require("baseconvert")[0].version

baseconvert-2.0.4/baseconvert/__main__.py

@@ -0,0 +1,89 @@
+from baseconvert import base
+
+
+import sys
+import argparse
+
+
+def main():
+    """
+    Main entry point for running baseconvert as a command.
+
+    Examples:
+
+        $ python -m baseconvert -n 0.5 -i 10 -o 20 -s True
+        0.A
+
+        $ echo 3.1415926 | python -m baseconvert -i 10 -o 16 -d 3 -s True
+        3.243
+    """
+    # Parse arguments
+    parser = argparse.ArgumentParser(
+        description="Convert rational numbers between bases."
+    )
+    parser.add_argument(
+        "-n",
+        "--number",
+        default=None,
+        help="The number to convert as a string, else stdin used.",
+    )
+    parser.add_argument(
+        "-i", "--input-base", default=10, help="The input base (default 10)."
+    )
+    parser.add_argument(
+        "-o", "--output-base", default=10, help="The output base (default 10)."
+    )
+    parser.add_argument(
+        "-d",
+        "--max_depth",
+        default=10,
+        type=int,
+        help="The maximum fractional digits (default 10).",
+    )
+    parser.add_argument(
+        "-r",
+        "--recurring",
+        default=True,
+        type=bool,
+        help="Boolean, if True will attempt to find recurring decimals (default True).",
+    )
+    parser.add_argument(
+        "-s",
+        "--string",
+        type=bool,
+        help="Boolean, if True will output number as String, else as tuple (default False).",
+    )
+    args = parser.parse_args()
+
+    args.input_base = float(args.input_base)
+    args.output_base = float(args.output_base)
+    if args.input_base == int(args.input_base):
+        args.input_base = int(args.input_base)
+    if args.output_base == int(args.output_base):
+        args.output_base = int(args.output_base)
+    if args.number:
+        return base(
+            args.number,
+            args.input_base,
+            args.output_base,
+            string=args.string,
+            max_depth=args.max_depth,
+            recurring=args.recurring,
+        )
+    elif not sys.stdin.isatty():
+        return base(
+            sys.stdin.read().strip(),
+            args.input_base,
+            args.output_base,
+            string=args.string,
+            max_depth=args.max_depth,
+            recurring=args.recurring,
+        )
+    else:
+        from .gui import main
+
+        main()
+
+
+if __name__ == "__main__":
+    print(main())

{baseconvert-2.0.2 → baseconvert-2.0.4}/baseconvert/app.qml

@@ -4,16 +4,31 @@ import QtQuick.Layouts
 
 
 ApplicationWindow {
+    id: main
     width: 400
     height: 400
+    minimumWidth: 300
+    minimumHeight: 150
     visible: true
     title: "baseconvert"
     property string result: ""
-
-    font.family: "monospace"
-   property bool darkMode: Application.styleHints.colorScheme === Qt.ColorScheme.Dark
+    property bool is_windows: Qt.platform.os == "windows" // Just use light mode on windows for simplicity
+    property bool darkMode: is_windows ? false : (Application.styleHints.colorScheme === Qt.ColorScheme.Dark)
+    font: Qt.font({
+                bold: true,
+                underline: false,
+                pixelSize: ((main.height > 300) ? ((main.height > main.width) ? main.width / 30 : main.height / 30) : main.height / 8) * 1.1, // resize relative to parent
+                family: "monospace"
+        })
+    property var fontLarge: Qt.font({
+                bold: true,
+                underline: false,
+                pixelSize: main.font.pixelSize * 1.5,
+                family: "monospace"
+        })
 
     ColumnLayout {
+        id: mainLayout
         anchors.fill: parent
         RowLayout {
             TextField {
@@ -21,22 +36,19 @@ ApplicationWindow {
                 Layout.fillWidth: true
                 Layout.columnSpan: 1
                 placeholderText: qsTr("Input")
+                font: main.fontLarge
                 onTextChanged: {
                     input.text = input.text.toUpperCase().replace(/[^A-Z0-9.]/g, '')
                     backend.input_changed(input.text, from.value, to.value);
                 }
                 width: parent.width
-                font.pointSize: 18
                 focus: true
             }
         }
         RowLayout {
             Label {
                 id: from_text
-                text: "```base from : 10```"
-                textFormat: Text.MarkdownText
-                Layout.fillWidth: false
-                Layout.preferredWidth: parent.width / 3
+                text: "from 10"
                 horizontalAlignment: Qt.AlignRight
             }
             Slider {
@@ -49,17 +61,16 @@ ApplicationWindow {
                 stepSize: 1
                 onValueChanged: {
                     backend.input_changed(input.text, from.value, to.value);
-                    from_text.text = "```From base : " + from.value.toString() + "```";
+                    from_text.text = "from " + from.value.toString();
                 }
+                handle.implicitWidth: to_text.height
+                handle.implicitHeight: to_text.height
             }
         }
         RowLayout {
             Label {
                 id: to_text
-                text: "```to base: 36```"
-                textFormat: Text.MarkdownText
-                Layout.fillWidth: false
-                Layout.preferredWidth: parent.width / 3
+                text: "  to 36"
                 horizontalAlignment: Qt.AlignRight
             }
             Slider {
@@ -72,23 +83,25 @@ ApplicationWindow {
                 stepSize: 1
                 onValueChanged: {
                     backend.input_changed(input.text, from.value, to.value);
-                    to_text.text = "```To base : " + to.value.toString() + "```"
+                    to_text.text = "  to " + to.value.toString();
                 }
+                handle.implicitWidth: to_text.height
+                handle.implicitHeight: to_text.height
             }
         }
         ColumnLayout {
-            TextArea {
+            TextField {
                 id: output
                 text: backend.result
                 Layout.fillWidth: true
                 Layout.columnSpan: 1
+                font: main.fontLarge
                 readOnly: true
                 width: parent.width
-                font.pointSize: 18
-                //wrapMode: Text.WrapAnywhere
             }
         }
         ButtonRow{
+            visible: (main.height > 300) ? true : false
             Layout.fillWidth: true
             Layout.fillHeight: true
             text1: "FLIP"
@@ -97,10 +110,10 @@ ApplicationWindow {
             text4: "< DELETE"
             enable5: false
             enable6: false
-            color1: darkMode ? "#0D47A1" : "#ffffff"
-            color2: darkMode ? "#C8090B" : "#ffffff"
-            color3: darkMode ? "#C8090B" : "#ffffff"
-            color4: darkMode ? "#C63100" : "#ffffff"
+            color1: darkMode ? "#0D47A1" : "#275fb8"
+            color2: darkMode ? "#C8090B" : "#f51618"
+            color3: darkMode ? "#C8090B" : "#f51618"
+            color4: darkMode ? "#C63100" : "#ff6633"
             onButtonPressed: (text) => {
                 if( text == "FLIP"){
                     var base_from = from.value;
@@ -130,6 +143,7 @@ ApplicationWindow {
             }
         }
         ButtonRow{
+            visible: (main.height > 300) ? true : false
             Layout.fillWidth: true
             Layout.fillHeight: true
             text1: "V"
@@ -144,12 +158,13 @@ ApplicationWindow {
             enable5: (from.value >= 36) ? true : false
             enable6: true
             text6: "."
-            color6: darkMode ? "#0D47A1" : "#ffffff"
+            color6: darkMode ? "#006064" : "#109ba1"
             onButtonPressed: (text) => {
                 input.text += text
             }
         }
         ButtonRow{
+            visible: (main.height > 300) ? true : false
             Layout.fillWidth: true
             Layout.fillHeight: (from.value >= 26) ? true : false
             text1: "P"
@@ -167,6 +182,7 @@ ApplicationWindow {
             onButtonPressed: (text) => {input.text += text}
         }
         ButtonRow{
+            visible: (main.height > 300) ? true : false
             Layout.fillWidth: true
             Layout.fillHeight: (from.value >= 20) ? true : false
             text1: "J"
@@ -184,6 +200,7 @@ ApplicationWindow {
             onButtonPressed: (text) => {input.text += text}
         }
         ButtonRow{
+            visible: (main.height > 300) ? true : false
             Layout.fillWidth: true
             Layout.fillHeight: (from.value >= 14) ? true : false
             text1: "D"
@@ -201,6 +218,7 @@ ApplicationWindow {
             onButtonPressed: (text) => {input.text += text}
         }
         ButtonRow{
+            visible: (main.height > 300) ? true : false
             Layout.fillWidth: true
             Layout.fillHeight: (from.value >= 8) ? true : false
             text1: "7"
@@ -218,6 +236,7 @@ ApplicationWindow {
             onButtonPressed: (text) => {input.text += text}
         }
         ButtonRow{
+            visible: (main.height > 300) ? true : false
             Layout.fillWidth: true
             Layout.fillHeight: (from.value >= 2) ? true : false
             text1: "1"
@@ -235,10 +254,11 @@ ApplicationWindow {
             onButtonPressed: (text) => {input.text += text}
         }
         ButtonRow{
+            visible: (main.height > 300) ? true : false
             Layout.fillWidth: true
             Layout.fillHeight: true
             text1: "0"
-            color1: darkMode ? "#0D47A1" : "#ffffff"
+            color1: darkMode ? "#0D47A1" : "#275fb8"
             onButtonPressed: (text) => {input.text += text}
             enable2: false
             enable3: false

{baseconvert-2.0.2 → baseconvert-2.0.4}/baseconvert/baseconvert.py

@@ -157,10 +157,7 @@ Exact result:
 import sys
 
 
-__MATH_GCD = (
-    sys.version_info.major >= 3
-    and sys.version_info.minor >= 5
-)
+__MATH_GCD = sys.version_info.major >= 3 and sys.version_info.minor >= 5
 
 if __MATH_GCD:
     from math import gcd
@@ -217,9 +214,17 @@ class BaseConverter:
         >>> b((4,5,6,7))
         (4, 2, 5, 4, 7)
     """
-    def __init__(self, input_base, output_base, max_depth=10,
-                 string=False, recurring=True, padding=0,
-                 exact=False):
+
+    def __init__(
+        self,
+        input_base,
+        output_base,
+        max_depth=10,
+        string=False,
+        recurring=True,
+        padding=0,
+        exact=False,
+    ):
         self.input_base = input_base
         self.output_base = output_base
         self.max_depth = max_depth
@@ -231,8 +236,15 @@ class BaseConverter:
 
     def __call__(self, number):
         """Convert a number."""
-        return base(number, self.input_base, self.output_base,
-                    self.max_depth, self.string, self.recurring, self.padding)
+        return base(
+            number,
+            self.input_base,
+            self.output_base,
+            self.max_depth,
+            self.string,
+            self.recurring,
+            self.padding,
+        )
 
 
 def represent_as_tuple(string):
@@ -266,8 +278,7 @@ def represent_as_string(iterable):
     '868.0F'
     """
     keep = (".", "[", "]")
-    return "".join(tuple(int_to_str_digit(i) if i not in keep
-                   else i for i in iterable))
+    return "".join(tuple(int_to_str_digit(i) if i not in keep else i for i in iterable))
 
 
 def pad(iterable, n):
@@ -310,16 +321,21 @@ def pad(iterable, n):
         ('0', '0', 'A', '0', '.', '0', '1')
     """
     if isinstance(iterable, str):
-        return (n - len(iterable.split(".")[0])) * '0' + iterable
+        return (n - len(iterable.split(".")[0])) * "0" + iterable
     else:
         return tuple(
             (
-                n - len(
-                    iterable[0:iterable.index(".")]
+                n
+                - len(
+                    iterable[0 : iterable.index(".")]
                     if iterable.count(".")
                     else iterable
                 )
-            ) * ["0",] + list(iterable)
+            )
+            * [
+                "0",
+            ]
+            + list(iterable)
         )
 
 
@@ -354,7 +370,7 @@ def digit(decimal, digit, input_base=10):
     if decimal == 0:
         return 0
     if digit != 0:
-        return (decimal // (input_base ** digit)) % input_base
+        return (decimal // (input_base**digit)) % input_base
     else:
         return decimal % input_base
 
@@ -390,7 +406,7 @@ def digits(number, base=10):
         return 0
     digits = 0
     n = 1
-    while(number >= 1):
+    while number >= 1:
         number //= base
         digits += 1
     return digits
@@ -414,7 +430,7 @@ def integer_fractional_parts(number):
     radix_point = number.index(".")
     integer_part = number[:radix_point]
     fractional_part = number[radix_point:]
-    return(integer_part, fractional_part)
+    return (integer_part, fractional_part)
 
 
 def from_base_10_int(decimal, output_base=10):
@@ -462,7 +478,7 @@ def to_base_10_int(n, input_base):
         >>> to_base_10_int((8,1), 16)
         129
     """
-    return sum(c * input_base ** i for i, c in enumerate(n[::-1]))
+    return sum(c * input_base**i for i, c in enumerate(n[::-1]))
 
 
 def integer_base(number, input_base=10, output_base=10):
@@ -495,8 +511,7 @@ def integer_base(number, input_base=10, output_base=10):
     return from_base_10_int(to_base_10_int(number, input_base), output_base)
 
 
-def fractional_base(fractional_part, input_base=10, output_base=10,
-                    max_depth=10):
+def fractional_base(fractional_part, input_base=10, output_base=10, max_depth=10):
     """
     Convert the fractional part of a number from any base to any base.
 
@@ -519,17 +534,17 @@ def fractional_base(fractional_part, input_base=10, output_base=10,
     numerator = 0
     for i, value in enumerate(fractional_part, 1):
         numerator += value * input_base ** (fractional_digits - i)
-    denominator = input_base ** fractional_digits
+    denominator = input_base**fractional_digits
     i = 1
     digits = []
     visited = []
-    while(i < max_depth + 1 or (max_depth == 0 and i < MAX_DEPTH)):
-        numerator *= output_base ** i
+    while i < max_depth + 1 or (max_depth == 0 and i < MAX_DEPTH):
+        numerator *= output_base**i
         digit = numerator // denominator
         remainder = numerator % denominator
         visited.append((digit, remainder))
         numerator -= digit * denominator
-        denominator *= output_base ** i
+        denominator *= output_base**i
         digits.append(digit)
         i += 1
         greatest_common_divisor = gcd(numerator, denominator)
@@ -643,13 +658,13 @@ def find_recurring(number, min_repeat=5):
     best_period = 0
     best_repeat = 0
     # Find recurring pattern.
-    while (period < len(sequence)):
+    while period < len(sequence):
         period += 1
         pattern = sequence[:period]
         repeat = 0
         digit = period
         pattern_match = True
-        while(pattern_match and digit < len(sequence)):
+        while pattern_match and digit < len(sequence):
             for i, pattern_digit in enumerate(pattern):
                 if sequence[digit + i] != pattern_digit:
                     pattern_match = False
@@ -669,7 +684,7 @@ def find_recurring(number, min_repeat=5):
     # Use the best pattern found.
     pattern = sequence[:best_period]
     # Remove the pattern from our original number.
-    number = integer_part + fractional_part[:-(best + best_period)]
+    number = integer_part + fractional_part[: -(best + best_period)]
     # Ensure we are at the start of the pattern.
     pattern_temp = pattern
     number_temp = number
@@ -703,7 +718,7 @@ def expand_recurring(number, repeat=5):
     """
     if "[" in number:
         pattern_index = number.index("[")
-        pattern = number[pattern_index + 1:-1]
+        pattern = number[pattern_index + 1 : -1]
         number = number[:pattern_index]
         number = number + pattern * (repeat + 1)
     return number
@@ -739,8 +754,16 @@ def check_valid(number, input_base=10):
     return True
 
 
-def base(number, input_base=10, output_base=10, max_depth=10,
-         string=False, recurring=True, padding=0, exact=False):
+def base(
+    number,
+    input_base=10,
+    output_base=10,
+    max_depth=10,
+    string=False,
+    recurring=True,
+    padding=0,
+    exact=False,
+):
     """
     Converts a number from any base to any another.
 
@@ -781,15 +804,16 @@ def base(number, input_base=10, output_base=10, max_depth=10,
     if input_base == 1:
         number = (1,) * number.count(1)
     # Expand any recurring digits.
-    number = expand_recurring(number, repeat=MAX_DEPTH*2)
+    number = expand_recurring(number, repeat=MAX_DEPTH * 2)
     # Convert a fractional number.
     if "." in number:
         radix_point = number.index(".")
         integer_part = number[:radix_point]
         fractional_part = number[radix_point:]
         integer_part = integer_base(integer_part, input_base, output_base)
-        fractional_part = fractional_base(fractional_part, input_base,
-                                          output_base, max_depth)
+        fractional_part = fractional_base(
+            fractional_part, input_base, output_base, max_depth
+        )
         number = integer_part + fractional_part
         number = truncate(number)
     # Convert an integer number.
@@ -803,4 +827,5 @@ def base(number, input_base=10, output_base=10, max_depth=10,
 
 if __name__ == "__main__":
     import doctest
+
     doctest.testmod(verbose=False)

{baseconvert-2.0.2 → baseconvert-2.0.4}/baseconvert/gui.py

@@ -8,9 +8,10 @@ from PySide6.QtQml import QQmlApplicationEngine
 
 from .baseconvert import base
 
+
 class Backend(QObject):
 
-    updateResult=Signal()
+    updateResult = Signal()
 
     def __init__(self, parent=None):
         super().__init__(parent)
@@ -21,9 +22,7 @@ class Backend(QObject):
     def input_changed(self, value, base_from, base_to):
         if re.match("^[0-9A-Z]*[.]?[0-9A-Z]*$", value):
             try:
-                self._result = base(
-                    value, base_from, base_to, string=True, exact=True
-                )
+                self._result = base(value, base_from, base_to, string=True, exact=True)
             except:
                 self._result = self._default
         else:
@@ -40,9 +39,7 @@ def main():
     app = QGuiApplication(sys.argv)
     engine = QQmlApplicationEngine()
     engine.rootContext().setContextProperty("backend", backend)
-    engine.load(
-        pkg_resources.resource_filename(__name__, 'app.qml')
-    )
+    engine.load(pkg_resources.resource_filename(__name__, "app.qml"))
     if not engine.rootObjects():
         sys.exit(-1)
     exit_code = app.exec()

{baseconvert-2.0.2 → baseconvert-2.0.4/baseconvert.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: baseconvert
-Version: 2.0.2
+Version: 2.0.4
 Summary: Convert numbers between bases.
 Home-page: https://github.com/BreadMakesYouFull/baseconvert.git
 Author: squdle, BreadMakesYouFull

baseconvert-2.0.2/VERSION.txt

@@ -1 +0,0 @@
-2.0.2

baseconvert-2.0.2/baseconvert/__main__.py

@@ -1,51 +0,0 @@
-from baseconvert import base
-
-
-import sys
-import argparse
-
-
-def main():
-    """
-    Main entry point for running baseconvert as a command.
-
-    Examples:
-
-        $ python -m baseconvert -n 0.5 -i 10 -o 20 -s True
-        0.A
-
-        $ echo 3.1415926 | python -m baseconvert -i 10 -o 16 -d 3 -s True
-        3.243
-    """
-    # Parse arguments
-    parser = argparse.ArgumentParser(description="Convert rational numbers between bases.")
-    parser.add_argument("-n", "--number", default=None,
-                        help="The number to convert as a string, else stdin used.")
-    parser.add_argument("-i", "--input-base", default=10,
-                        help="The input base (default 10).")
-    parser.add_argument("-o", "--output-base", default=10,
-                        help="The output base (default 10).")
-    parser.add_argument("-d", "--max_depth", default=10, type=int,
-                        help="The maximum fractional digits (default 10).")
-    parser.add_argument("-r", "--recurring", default=True, type=bool,
-                        help="Boolean, if True will attempt to find recurring decimals (default True).")
-    parser.add_argument("-s", "--string", type=bool,
-                        help="Boolean, if True will output number as String, else as tuple (default False).")
-    args = parser.parse_args()
-
-    args.input_base = float(args.input_base)
-    args.output_base = float(args.output_base)
-    if args.input_base == int(args.input_base):
-        args.input_base = int(args.input_base)
-    if args.output_base == int(args.output_base):
-        args.output_base = int(args.output_base)
-    if (args.number):
-        return base(args.number, args.input_base, args.output_base, string=args.string, max_depth=args.max_depth, recurring=args.recurring)
-    elif not sys.stdin.isatty():
-        return base(sys.stdin.read().strip(), args.input_base, args.output_base, string=args.string, max_depth=args.max_depth, recurring=args.recurring)
-    else:
-        from .gui import main
-        main()
-
-if __name__ == "__main__":
-    print(main())