Fix parsing of comments links in the relaxed YAML config format

Author: petersvp

TikTokLiveTool.pyw

@@ -21,13 +21,21 @@ pending_gifts = []
 pending_actions = []
 
 def preprocess_yaml_string(yaml_str):
-    # Match keys that need quoting and preserve indentation
     def quote_key(match):
         indent = match.group(1)  # Leading spaces
         key = match.group(2)     # The actual key
         return f'{indent}"{key}":'
-    yaml_str = re.sub(r'^(\s*)([^:\s][^:\n]*):', quote_key, yaml_str, flags=re.MULTILINE)
-    return yaml_str
+    
+    # Only process lines that are not comments
+    def process_line(line):
+        if line.strip().startswith('#'):
+            return line
+        return re.sub(r'^(\s*)([^:\s][^:\n]*):', quote_key, line)
+
+    # Apply processing to each line individually
+    yaml_lines = yaml_str.splitlines()
+    processed_lines = [process_line(line) for line in yaml_lines]
+    return '\n'.join(processed_lines)
 
 def open_link(url):
     webbrowser.open(url)
@@ -401,6 +409,7 @@ def load_config():
     try:
         with open("config.cfg", 'r') as file:
             configfile = preprocess_yaml_string(file.read())
+            print(configfile)
             config.update(yaml.safe_load(configfile))
     except Exception as e:
         print(f"Error loading config: {e}")

gifts.txt

@@ -0,0 +1,204 @@
+Gimme The Vote: 1
+Music Play: 1
+GG: 1
+Ice Cream Cone: 1
+Rose: 1
+TikTok: 1
+Community Fest: 1
+Cat Paws: 1
+Thumbs Up: 1
+Heart: 1
+Cake Slice: 1
+Glow Stick: 1
+Love you: 1
+Squirrel: 1
+Heart Me: 1
+Team Bracelet: 2
+Finger Heart: 5
+Instant Noodles: 5
+Cute Cat: 5
+New Year Protection: 5
+Fighting: 7
+LOL: 9
+Cheer You Up: 9
+Friendship Necklace: 10
+Rosa: 10
+Watermelon: 10
+Shiba Inu Cookie: 10
+Shaved ice: 10
+Perfume: 20
+Thank you: 20
+Nice to meet you: 20
+Love you: 20
+Doughnut: 30
+Hot Choco: 30
+Community Crown: 99
+Paper Crane: 99
+Little Crown: 99
+Cap: 99
+Snowman: 99
+Hat and Mustache: 99
+Cupid’s Bow: 99
+Like-Pop: 99
+Love Painting: 99
+Pineapple: 99
+Star: 99
+Mishka Bear: 100
+Confetti: 100
+Hand Hearts: 100
+Hand Heart: 100
+LIVE Fandom: 100
+Marvelous Confetti: 100
+Sunglasses: 199
+Hearts: 199
+Lock and Key: 199
+Garland Headpiece: 199
+Love You: 199
+Cheer For You: 199
+Birthday Glasses: 199
+Pinch Cheek: 199
+Wooly Hat: 199
+Shiba Inu: 199
+Stroke Hair: 199
+Stinging Bee: 199
+Massage for You: 199
+Coffee Magic: 199
+Lucky Spray: 199
+Bunny Ears: 200
+Pinch Face: 249
+Boxing Gloves: 299
+Duck: 299
+Corgi: 299
+Fruit Friends: 299
+Kitten’s Paw: 299
+Dancing Flower: 299
+Naughty Chicken: 299
+Play for You: 299
+TikTok Crown: 299
+Rock Star: 299
+Rookie King: 299
+Lucky Cat: 399
+Singing Mic: 399
+Forever Rosa: 399
+Magic Rhythm: 399
+Relaxed Goose: 399
+Tom's Hug: 399
+Beating Heart: 449
+Coral: 499
+Hands Up: 499
+Money Gun: 500
+Spaghetti Kiss: 500
+Great Job: 500
+Cuddle with Me: 500
+Sweet Memories: 500
+You’re Amazing: 500
+VR Goggles: 500
+Lion’s Mane: 500
+Gem Gun: 500
+Swan: 699
+The Van Cat: 799
+Claw machine: 800
+Train: 899
+Travel with You: 999
+Hot Spring: 999
+Lovely Music: 999
+Lucky Airdrop Box: 999
+Shiny Face: 999
+Trending Figure: 999
+Gold Mine: 1000
+Mirror Bloom: 1000
+Watermelon Love: 1000
+Magic Cat: 1000
+Blooming Ribbons: 1000
+Galaxy: 1000
+Giraffe: 1000
+Spotlight: 1000
+Shiny air balloon: 1000
+Fireworks: 1088
+Frozen Magic: 1299
+Garland : 1500
+Champion: 1500
+Chasing the Dream: 1500
+Lover’s Lock: 1500
+Greeting Card: 1500
+Future Encounter: 1500
+Adventure Encounter: 1500
+Penlight: 1599
+Here We Go: 1799
+Love Drop: 1800
+Battle Crush: 1888
+Make-up Box: 1999
+Rabbit: 1999
+Star of Red Carpet: 1999
+Super Cake: 1999
+Gift Box: 1999
+Cooper Flies Home: 1999
+Mystery Firework: 1999
+Whale Diving: 2150
+Animal Band: 2500
+Concert: 2888
+Motorcycle: 2988
+Community Celebration: 2999
+Illumination: 2999
+Old Famous Car: 2999
+Rhythmic Bear: 2999
+Space Kitty: 2999
+Ferris Wheel: 3000
+Meteor Shower: 3000
+Golden Party: 3000
+Sakura Train: 3999
+Gift Box: 3999
+Flower Overflow: 4000
+Cosy Nights: 4000
+Your Concert: 4500
+Private Jet: 4888
+Leon the Kitten: 4888
+Signature Jet: 4888
+Unicorn Fantasy: 5000
+Farm: 5000
+Flying Jets: 5000
+Motorcycle Together: 5000
+Aqua Car: 6000
+Future City: 6000
+Lili the Leopard: 6599
+Birthday Party: 6999
+Celebration Time: 6999
+Happy Party: 6999
+Sports Car: 7000
+Star Throne: 7999
+Match Trophy: 7999
+Star Throne: 7999
+Leon and Lili: 9699
+Interstellar: 10000
+Sunset Speedway: 10000
+Couples Lock: 10000
+Falcon: 10999
+Red Lightning: 12000
+White Wolf: 12000
+Gimme The Mic: 12000
+Holy Arc: 14999
+Rosa Nebula: 15000
+Look! Meteor Shower: 15000
+Future Journey: 15000
+Amusement Park: 17000
+Fly Love: 19999
+Castle Fantasy: 20000
+TikTok Shuttle: 20000
+Yacht: 20000
+Premium Shuttle: 20000
+Rose Carriage: 25000
+Phoenix: 25999
+Adam’s Dream: 25999
+Mystic Castle: 25999
+Solar Temple: 25999
+Dragon Flame: 26999
+Lion: 29999
+Leon and Lion: 34000
+TikTok Universe+: 34999
+TikTok Stars: 39999
+Thunder Falcon: 39999
+Fire Phoenix: 41999
+Arnold the Warrior: 42999
+Pegasus: 42999
+TikTok Universe: 44999
+TikTok Universe: 44999

requirements.txt

@@ -0,0 +1,30 @@
+anyio==4.4.0
+async-timeout==4.0.3
+betterproto==2.0.0b7
+certifi==2024.7.4
+customtkinter==5.2.2
+darkdetect==0.8.0
+ffmpy==0.4.0
+grpclib==0.4.7
+h11==0.14.0
+h2==4.1.0
+hpack==4.0.0
+httpcore==1.0.5
+httpx==0.27.0
+hyperframe==6.0.1
+idna==3.8
+mashumaro==3.13.1
+multidict==6.0.5
+packaging==24.1
+protobuf==5.27.3
+protobuf3-to-dict==0.1.5
+pyee==11.1.0
+python-dateutil==2.9.0.post0
+python-socks==2.4.4
+PyYAML==6.0.2
+six==1.16.0
+sniffio==1.3.1
+TikTokLive==6.1.0
+typing_extensions==4.12.2
+websockets==13.0
+websockets_proxy==0.1.2