clox 0.6__tar.gz → 0.8__tar.gz

{clox-0.6 → clox-0.8}/CHANGELOG.md

@@ -5,6 +5,21 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [0.8] - 2025-03-16
+### Added
+- `--country` argument
+- `--countries-list` argument
+- `COUNTRIES.md`
+### Changed
+- Input case sensitivity bug fixed
+- Test system modified
+- `README.md` updated
+## [0.7] - 2025-03-06
+### Added
+- Jalali calendar
+- `--date-system` argument
+### Changed
+- `README.md` updated
 ## [0.6] - 2025-02-25
 ### Added
 - `--calendar` argument
@@ -43,7 +58,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - `TIMEZONES.md`
 - `FACES.md`
 
-[Unreleased]: https://github.com/sepandhaghighi/clox/compare/v0.6...dev
+[Unreleased]: https://github.com/sepandhaghighi/clox/compare/v0.8...dev
+[0.8]: https://github.com/sepandhaghighi/clox/compare/v0.7...v0.8
+[0.7]: https://github.com/sepandhaghighi/clox/compare/v0.6...v0.7
 [0.6]: https://github.com/sepandhaghighi/clox/compare/v0.5...v0.6
 [0.5]: https://github.com/sepandhaghighi/clox/compare/v0.4...v0.5
 [0.4]: https://github.com/sepandhaghighi/clox/compare/v0.3...v0.4

clox-0.8/COUNTRIES.md

@@ -0,0 +1,252 @@
+# Countries List
+
+**Last Update: 2025-03-11**
+
+
+1. AD - Andorra
+2. AE - United Arab Emirates
+3. AF - Afghanistan
+4. AG - Antigua & Barbuda
+5. AI - Anguilla
+6. AL - Albania
+7. AM - Armenia
+8. AO - Angola
+9. AQ - Antarctica
+10. AR - Argentina
+11. AS - Samoa (American)
+12. AT - Austria
+13. AU - Australia
+14. AW - Aruba
+15. AX - Åland Islands
+16. AZ - Azerbaijan
+17. BA - Bosnia & Herzegovina
+18. BB - Barbados
+19. BD - Bangladesh
+20. BE - Belgium
+21. BF - Burkina Faso
+22. BG - Bulgaria
+23. BH - Bahrain
+24. BI - Burundi
+25. BJ - Benin
+26. BL - St Barthelemy
+27. BM - Bermuda
+28. BN - Brunei
+29. BO - Bolivia
+30. BQ - Caribbean NL
+31. BR - Brazil
+32. BS - Bahamas
+33. BT - Bhutan
+34. BW - Botswana
+35. BY - Belarus
+36. BZ - Belize
+37. CA - Canada
+38. CC - Cocos (Keeling) Islands
+39. CD - Congo (Dem. Rep.)
+40. CF - Central African Rep.
+41. CG - Congo (Rep.)
+42. CH - Switzerland
+43. CI - Côte d'Ivoire
+44. CK - Cook Islands
+45. CL - Chile
+46. CM - Cameroon
+47. CN - China
+48. CO - Colombia
+49. CR - Costa Rica
+50. CU - Cuba
+51. CV - Cape Verde
+52. CW - Curaçao
+53. CX - Christmas Island
+54. CY - Cyprus
+55. CZ - Czech Republic
+56. DE - Germany
+57. DJ - Djibouti
+58. DK - Denmark
+59. DM - Dominica
+60. DO - Dominican Republic
+61. DZ - Algeria
+62. EC - Ecuador
+63. EE - Estonia
+64. EG - Egypt
+65. EH - Western Sahara
+66. ER - Eritrea
+67. ES - Spain
+68. ET - Ethiopia
+69. FI - Finland
+70. FJ - Fiji
+71. FK - Falkland Islands
+72. FM - Micronesia
+73. FO - Faroe Islands
+74. FR - France
+75. GA - Gabon
+76. GB - Britain (UK)
+77. GD - Grenada
+78. GE - Georgia
+79. GF - French Guiana
+80. GG - Guernsey
+81. GH - Ghana
+82. GI - Gibraltar
+83. GL - Greenland
+84. GM - Gambia
+85. GN - Guinea
+86. GP - Guadeloupe
+87. GQ - Equatorial Guinea
+88. GR - Greece
+89. GS - South Georgia & the South Sandwich Islands
+90. GT - Guatemala
+91. GU - Guam
+92. GW - Guinea-Bissau
+93. GY - Guyana
+94. HK - Hong Kong
+95. HN - Honduras
+96. HR - Croatia
+97. HT - Haiti
+98. HU - Hungary
+99. ID - Indonesia
+100. IE - Ireland
+101. IL - Israel
+102. IM - Isle of Man
+103. IN - India
+104. IO - British Indian Ocean Territory
+105. IQ - Iraq
+106. IR - Iran
+107. IS - Iceland
+108. IT - Italy
+109. JE - Jersey
+110. JM - Jamaica
+111. JO - Jordan
+112. JP - Japan
+113. KE - Kenya
+114. KG - Kyrgyzstan
+115. KH - Cambodia
+116. KI - Kiribati
+117. KM - Comoros
+118. KN - St Kitts & Nevis
+119. KP - Korea (North)
+120. KR - Korea (South)
+121. KW - Kuwait
+122. KY - Cayman Islands
+123. KZ - Kazakhstan
+124. LA - Laos
+125. LB - Lebanon
+126. LC - St Lucia
+127. LI - Liechtenstein
+128. LK - Sri Lanka
+129. LR - Liberia
+130. LS - Lesotho
+131. LT - Lithuania
+132. LU - Luxembourg
+133. LV - Latvia
+134. LY - Libya
+135. MA - Morocco
+136. MC - Monaco
+137. MD - Moldova
+138. ME - Montenegro
+139. MF - St Martin (French)
+140. MG - Madagascar
+141. MH - Marshall Islands
+142. MK - North Macedonia
+143. ML - Mali
+144. MM - Myanmar (Burma)
+145. MN - Mongolia
+146. MO - Macau
+147. MP - Northern Mariana Islands
+148. MQ - Martinique
+149. MR - Mauritania
+150. MS - Montserrat
+151. MT - Malta
+152. MU - Mauritius
+153. MV - Maldives
+154. MW - Malawi
+155. MX - Mexico
+156. MY - Malaysia
+157. MZ - Mozambique
+158. NA - Namibia
+159. NC - New Caledonia
+160. NE - Niger
+161. NF - Norfolk Island
+162. NG - Nigeria
+163. NI - Nicaragua
+164. NL - Netherlands
+165. NO - Norway
+166. NP - Nepal
+167. NR - Nauru
+168. NU - Niue
+169. NZ - New Zealand
+170. OM - Oman
+171. PA - Panama
+172. PE - Peru
+173. PF - French Polynesia
+174. PG - Papua New Guinea
+175. PH - Philippines
+176. PK - Pakistan
+177. PL - Poland
+178. PM - St Pierre & Miquelon
+179. PN - Pitcairn
+180. PR - Puerto Rico
+181. PS - Palestine
+182. PT - Portugal
+183. PW - Palau
+184. PY - Paraguay
+185. QA - Qatar
+186. RE - Réunion
+187. RO - Romania
+188. RS - Serbia
+189. RU - Russia
+190. RW - Rwanda
+191. SA - Saudi Arabia
+192. SB - Solomon Islands
+193. SC - Seychelles
+194. SD - Sudan
+195. SE - Sweden
+196. SG - Singapore
+197. SH - St Helena
+198. SI - Slovenia
+199. SJ - Svalbard & Jan Mayen
+200. SK - Slovakia
+201. SL - Sierra Leone
+202. SM - San Marino
+203. SN - Senegal
+204. SO - Somalia
+205. SR - Suriname
+206. SS - South Sudan
+207. ST - Sao Tome & Principe
+208. SV - El Salvador
+209. SX - St Maarten (Dutch)
+210. SY - Syria
+211. SZ - Eswatini (Swaziland)
+212. TC - Turks & Caicos Is
+213. TD - Chad
+214. TF - French Southern & Antarctic Lands
+215. TG - Togo
+216. TH - Thailand
+217. TJ - Tajikistan
+218. TK - Tokelau
+219. TL - East Timor
+220. TM - Turkmenistan
+221. TN - Tunisia
+222. TO - Tonga
+223. TR - Turkey
+224. TT - Trinidad & Tobago
+225. TV - Tuvalu
+226. TW - Taiwan
+227. TZ - Tanzania
+228. UA - Ukraine
+229. UG - Uganda
+230. UM - US minor outlying islands
+231. US - United States
+232. UY - Uruguay
+233. UZ - Uzbekistan
+234. VA - Vatican City
+235. VC - St Vincent
+236. VE - Venezuela
+237. VG - Virgin Islands (UK)
+238. VI - Virgin Islands (US)
+239. VN - Vietnam
+240. VU - Vanuatu
+241. WF - Wallis & Futuna
+242. WS - Samoa (western)
+243. YE - Yemen
+244. YT - Mayotte
+245. ZA - South Africa
+246. ZM - Zambia
+247. ZW - Zimbabwe

{clox-0.6 → clox-0.8}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.2
 Name: clox
-Version: 0.6
+Version: 0.8
 Summary: A Geeky Clock for Terminal Enthusiasts
 Home-page: https://github.com/sepandhaghighi/clox
-Download-URL: https://github.com/sepandhaghighi/clox/tarball/v0.6
+Download-URL: https://github.com/sepandhaghighi/clox/tarball/v0.8
 Author: Sepand Haghighi
 Author-email: me@sepand.tech
 License: MIT
@@ -32,6 +32,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: AUTHORS.md
 Requires-Dist: art>=5.3
+Requires-Dist: jdatetime>=3.8.2
 Requires-Dist: pytz>=2019.2
 Dynamic: author
 Dynamic: author-email
@@ -103,13 +104,13 @@ Clox is a terminal-based clock application designed for terminal enthusiasts who
 ## Installation		
 
 ### Source Code
-- Download [Version 0.6](https://github.com/sepandhaghighi/clox/archive/v0.6.zip) or [Latest Source](https://github.com/sepandhaghighi/clox/archive/dev.zip)
+- Download [Version 0.8](https://github.com/sepandhaghighi/clox/archive/v0.8.zip) or [Latest Source](https://github.com/sepandhaghighi/clox/archive/dev.zip)
 - `pip install .`				
 
 ### PyPI
 
 - Check [Python Packaging User Guide](https://packaging.python.org/installing/)     
-- `pip install clox==0.6`						
+- `pip install clox==0.8`						
 
 
 ## Usage
@@ -142,16 +143,30 @@ clox
 clox --face=3
 ```
 * Use `--face=-1` for random mode
-* [Faces List](https://github.com/sepandhaghighi/clox/blob/main/FACES.md)
-* `clox --faces-list`
+* [Faces List](https://github.com/sepandhaghighi/clox/blob/main/FACES.md): `clox --faces-list`
+
 
 ### Timezone
 
 ```console
 clox --timezone="Etc/GMT+7"
 ```
-* [Timezones List](https://github.com/sepandhaghighi/clox/blob/main/TIMEZONES.md)
-* `clox --timezones-list`
+* [Timezones List](https://github.com/sepandhaghighi/clox/blob/main/TIMEZONES.md): `clox --timezones-list`
+
+
+### Country
+
+The `--country` argument allows you to specify a country using its **ISO 3166** code format
+
+ℹ️ When the `--country` argument is provided, the `--timezone` argument will be ignored
+
+ℹ️ If the specified country has multiple timezones, the first timezone will be selected automatically
+
+```console
+clox --country="DE"
+```
+* [Countries List](https://github.com/sepandhaghighi/clox/blob/main/COUNTRIES.md): `clox --countries-list`
+
 
 ### Vertical/Horizontal Shift
 
@@ -209,6 +224,16 @@ In this mode, the calendar will be displayed
 clox --calendar=month
 ```
 
+### Date System
+
+ℹ️ Valid choices: [`gregorian`, `jalali`]
+
+ℹ️ The default date system is `gregorian`
+
+```console
+clox --date-system=jalali
+```
+
 ## Screen Record
 
 <div align="center">
@@ -267,6 +292,21 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [0.8] - 2025-03-16
+### Added
+- `--country` argument
+- `--countries-list` argument
+- `COUNTRIES.md`
+### Changed
+- Input case sensitivity bug fixed
+- Test system modified
+- `README.md` updated
+## [0.7] - 2025-03-06
+### Added
+- Jalali calendar
+- `--date-system` argument
+### Changed
+- `README.md` updated
 ## [0.6] - 2025-02-25
 ### Added
 - `--calendar` argument
@@ -305,7 +345,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - `TIMEZONES.md`
 - `FACES.md`
 
-[Unreleased]: https://github.com/sepandhaghighi/clox/compare/v0.6...dev
+[Unreleased]: https://github.com/sepandhaghighi/clox/compare/v0.8...dev
+[0.8]: https://github.com/sepandhaghighi/clox/compare/v0.7...v0.8
+[0.7]: https://github.com/sepandhaghighi/clox/compare/v0.6...v0.7
 [0.6]: https://github.com/sepandhaghighi/clox/compare/v0.5...v0.6
 [0.5]: https://github.com/sepandhaghighi/clox/compare/v0.4...v0.5
 [0.4]: https://github.com/sepandhaghighi/clox/compare/v0.3...v0.4

{clox-0.6 → clox-0.8}/README.md

@@ -53,13 +53,13 @@ Clox is a terminal-based clock application designed for terminal enthusiasts who
 ## Installation		
 
 ### Source Code
-- Download [Version 0.6](https://github.com/sepandhaghighi/clox/archive/v0.6.zip) or [Latest Source](https://github.com/sepandhaghighi/clox/archive/dev.zip)
+- Download [Version 0.8](https://github.com/sepandhaghighi/clox/archive/v0.8.zip) or [Latest Source](https://github.com/sepandhaghighi/clox/archive/dev.zip)
 - `pip install .`				
 
 ### PyPI
 
 - Check [Python Packaging User Guide](https://packaging.python.org/installing/)     
-- `pip install clox==0.6`						
+- `pip install clox==0.8`						
 
 
 ## Usage
@@ -92,16 +92,30 @@ clox
 clox --face=3
 ```
 * Use `--face=-1` for random mode
-* [Faces List](https://github.com/sepandhaghighi/clox/blob/main/FACES.md)
-* `clox --faces-list`
+* [Faces List](https://github.com/sepandhaghighi/clox/blob/main/FACES.md): `clox --faces-list`
+
 
 ### Timezone
 
 ```console
 clox --timezone="Etc/GMT+7"
 ```
-* [Timezones List](https://github.com/sepandhaghighi/clox/blob/main/TIMEZONES.md)
-* `clox --timezones-list`
+* [Timezones List](https://github.com/sepandhaghighi/clox/blob/main/TIMEZONES.md): `clox --timezones-list`
+
+
+### Country
+
+The `--country` argument allows you to specify a country using its **ISO 3166** code format
+
+ℹ️ When the `--country` argument is provided, the `--timezone` argument will be ignored
+
+ℹ️ If the specified country has multiple timezones, the first timezone will be selected automatically
+
+```console
+clox --country="DE"
+```
+* [Countries List](https://github.com/sepandhaghighi/clox/blob/main/COUNTRIES.md): `clox --countries-list`
+
 
 ### Vertical/Horizontal Shift
 
@@ -159,6 +173,16 @@ In this mode, the calendar will be displayed
 clox --calendar=month
 ```
 
+### Date System
+
+ℹ️ Valid choices: [`gregorian`, `jalali`]
+
+ℹ️ The default date system is `gregorian`
+
+```console
+clox --date-system=jalali
+```
+
 ## Screen Record
 
 <div align="center">

{clox-0.6 → clox-0.8}/SECURITY.md

@@ -4,8 +4,8 @@
 
 | Version       | Supported          |
 | ------------- | ------------------ |
-| 0.6           | :white_check_mark: |
-| < 0.6         | :x:                |
+| 0.8           | :white_check_mark: |
+| < 0.8         | :x:                |
 
 ## Reporting a Vulnerability
 

{clox-0.6 → clox-0.8}/clox/functions.py

@@ -3,17 +3,20 @@
 import os
 import sys
 import time
-import calendar
+from calendar import TextCalendar as GregorianCalendar
 import random
 import datetime
+import jdatetime
 import argparse
 import pytz
 from art import tprint
+from .jcalendar import TextCalendar as JalaliCalendar
 from .params import HORIZONTAL_TIME_24H_FORMATS, VERTICAL_TIME_24H_FORMATS
 from .params import HORIZONTAL_TIME_12H_FORMATS, VERTICAL_TIME_12H_FORMATS
-from .params import TIMEZONES_LIST, CLOX_VERSION, DATE_FORMAT
+from .params import CLOX_VERSION, DATE_FORMAT
+from .params import TIMEZONES_LIST, COUNTRIES_LIST
 from .params import ADDITIONAL_INFO, EXIT_MESSAGE
-from .params import FACES_MAP, FACES_LIST, CALENDAR_LIST
+from .params import FACES_MAP, FACES_LIST, CALENDARS_LIST, DATE_SYSTEMS_LIST
 from .params import HORIZONTAL_FACES_LIST_EXAMPLE, VERTICAL_FACES_LIST_EXAMPLE
 from .params import CLOX_OVERVIEW, CLOX_REPO
 
@@ -75,18 +78,45 @@ def show_faces_list(vertical=False):
         print('=' * 80)
 
 
-def show_timezones_list():
+def show_timezones_list(country=None):
     """
     Show timezones list.
 
+    :param country: country iso3166 code
+    :type country: str
     :return: None
     """
-    print("Timezones list:\n")
-    for index, timezone in enumerate(TIMEZONES_LIST, 1):
+    timezones_list = TIMEZONES_LIST
+    country_name = "All"
+    if country is not None:
+        timezones_list = list(map(lambda x: x.upper(), pytz.country_timezones(country)))
+        country_name = pytz.country_names[country]
+    try:
+        print("Timezones list ({country_name}):\n".format(country_name=country_name))
+    except Exception:
+        print("Timezones list ({country_name}):\n".format(country_name=country.upper()))
+    for index, timezone in enumerate(sorted(timezones_list), 1):
         print("{index}. {timezone}".format(index=index, timezone=timezone))
 
 
-def print_calendar(mode="month", timezone=None, v_shift=0, h_shift=0):
+def show_countries_list():
+    """
+    Show countries list.
+
+    :return: None
+    """
+    print("Countries list:\n")
+    for index, country_code in enumerate(sorted(COUNTRIES_LIST), 1):
+        country_name = pytz.country_names[country_code]
+        try:
+            print("{index}. {country_code} - {country_name}".format(index=index,
+                                                                    country_code=country_code, country_name=country_name))
+        except Exception:
+            print("{index}. {country_code} - {country_name}".format(index=index,
+                                                                    country_code=country_code, country_name=country_code))
+
+
+def print_calendar(mode="month", timezone=None, country=None, v_shift=0, h_shift=0, date_system="gregorian"):
     """
     Print calendar.
 
@@ -94,34 +124,46 @@ def print_calendar(mode="month", timezone=None, v_shift=0, h_shift=0):
     :type mode: str
     :param timezone: timezone
     :type timezone: str
+    :param country: country iso3166 code
+    :type country: str
     :param v_shift: vertical shift
     :type v_shift: int
     :param h_shift: horizontal shift
     :type h_shift: int
+    :param date_system: date system
+    :type date_system: str
     :return: None
     """
+    datetime_lib = datetime
+    calendar_obj = GregorianCalendar()
+    if date_system == "jalali":
+        datetime_lib = jdatetime
+        calendar_obj = JalaliCalendar()
     tz = None
     timezone_str = "Local"
+    if country is not None:
+        timezone = pytz.country_timezones(country)[0].upper()
     if timezone is not None:
         timezone_str = timezone
         tz = pytz.timezone(timezone)
     v_shift = max(0, v_shift)
     h_shift = max(0, h_shift)
-    datetime_now = datetime.datetime.now(tz=tz)
+    datetime_now = datetime_lib.datetime.now(tz=tz)
     current_date = datetime_now.strftime(DATE_FORMAT)
     print('\n' * v_shift, end='')
     print(" " * h_shift, end='')
     print("Today: {date}".format(date=current_date))
     print(" " * h_shift, end='')
     print("Timezone: {timezone}\n".format(timezone=timezone_str))
-    calendar_str = calendar.month(datetime_now.year, datetime_now.month)
+    calendar_str = calendar_obj.formatmonth(datetime_now.year, datetime_now.month)
     if mode == "year":
-        calendar_str = calendar.calendar(datetime_now.year)
+        calendar_str = calendar_obj.formatyear(datetime_now.year)
     print("\n".join([" " * h_shift + x for x in calendar_str.split("\n")]))
 
 
 def run_clock(
         timezone=None,
+        country=None,
         v_shift=0,
         h_shift=0,
         face=1,
@@ -129,12 +171,15 @@ def run_clock(
         vertical=False,
         hide_date=False,
         hide_timezone=False,
-        am_pm=False):
+        am_pm=False,
+        date_system="gregorian"):
     """
     Run clock.
 
     :param timezone: timezone
     :type timezone: str
+    :param country: country iso3166 code
+    :type country: str
     :param v_shift: vertical shift
     :type v_shift: int
     :param h_shift: horizontal shift
@@ -151,14 +196,21 @@ def run_clock(
     :type hide_timezone: bool
     :param am_pm: AM/PM mode flag
     :type am_pm: bool
+    :param date_system: date system
+    :type date_system: str
     :return: None
     """
+    datetime_lib = datetime
+    if date_system == "jalali":
+        datetime_lib = jdatetime
     format_index = 0
     time_formats = HORIZONTAL_TIME_12H_FORMATS if am_pm else HORIZONTAL_TIME_24H_FORMATS
     if vertical:
         time_formats = VERTICAL_TIME_12H_FORMATS if am_pm else VERTICAL_TIME_24H_FORMATS
     tz = None
     timezone_str = "Local"
+    if country is not None:
+        timezone = pytz.country_timezones(country)[0].upper()
     if timezone is not None:
         timezone_str = timezone
         tz = pytz.timezone(timezone)
@@ -169,7 +221,7 @@ def run_clock(
         clear_screen()
         print('\n' * v_shift, end='')
         print(" " * h_shift, end='')
-        datetime_now = datetime.datetime.now(tz=tz)
+        datetime_now = datetime_lib.datetime.now(tz=tz)
         current_time = datetime_now.strftime(time_formats[format_index])
         current_date = datetime_now.strftime(DATE_FORMAT)
         tprint(current_time, font=face, sep="\n" + " " * h_shift)
@@ -192,7 +244,8 @@ def main():
     """
     parser = argparse.ArgumentParser()
     parser.epilog = ADDITIONAL_INFO
-    parser.add_argument('--timezone', help='timezone', type=str, choices=TIMEZONES_LIST)
+    parser.add_argument('--timezone', help='timezone', type=str.upper, choices=TIMEZONES_LIST)
+    parser.add_argument('--country', help='country (iso3166 code)', type=str.upper, choices=COUNTRIES_LIST)
     parser.add_argument('--v-shift', help='vertical shift', type=int, default=0)
     parser.add_argument('--h-shift', help='horizontal shift', type=int, default=0)
     parser.add_argument('--version', help='version', nargs="?", const=1)
@@ -200,12 +253,19 @@ def main():
     parser.add_argument('--face', help='face', type=int, choices=FACES_LIST, default=1)
     parser.add_argument('--faces-list', help='faces list', nargs="?", const=1)
     parser.add_argument('--timezones-list', help='timezones list', nargs="?", const=1)
+    parser.add_argument('--countries-list', help='countries list', nargs="?", const=1)
     parser.add_argument('--no-blink', help='disable blinking mode', nargs="?", const=1)
     parser.add_argument('--vertical', help='vertical mode', nargs="?", const=1)
     parser.add_argument('--hide-date', help='hide date', nargs="?", const=1)
     parser.add_argument('--hide-timezone', help='hide timezone', nargs="?", const=1)
     parser.add_argument('--am-pm', help='AM/PM mode', nargs="?", const=1)
-    parser.add_argument('--calendar', help='calendar mode', type=str, choices=CALENDAR_LIST)
+    parser.add_argument('--calendar', help='calendar mode', type=str.lower, choices=CALENDARS_LIST)
+    parser.add_argument(
+        '--date-system',
+        help='date system',
+        type=str.lower,
+        choices=DATE_SYSTEMS_LIST,
+        default="gregorian")
     args = parser.parse_args()
     if args.version:
         print(CLOX_VERSION)
@@ -214,13 +274,22 @@ def main():
     elif args.faces_list:
         show_faces_list(vertical=args.vertical)
     elif args.timezones_list:
-        show_timezones_list()
+        show_timezones_list(args.country)
+    elif args.countries_list:
+        show_countries_list()
     elif args.calendar:
-        print_calendar(mode=args.calendar, timezone=args.timezone, h_shift=args.h_shift, v_shift=args.v_shift)
+        print_calendar(
+            mode=args.calendar,
+            timezone=args.timezone,
+            country=args.country,
+            h_shift=args.h_shift,
+            v_shift=args.v_shift,
+            date_system=args.date_system)
     else:
         try:
             run_clock(
                 timezone=args.timezone,
+                country=args.country,
                 h_shift=args.h_shift,
                 v_shift=args.v_shift,
                 face=args.face,
@@ -228,6 +297,7 @@ def main():
                 vertical=args.vertical,
                 hide_date=args.hide_date,
                 hide_timezone=args.hide_timezone,
-                am_pm=args.am_pm)
+                am_pm=args.am_pm,
+                date_system=args.date_system)
         except (KeyboardInterrupt, EOFError):
             print(EXIT_MESSAGE)

clox-0.8/clox/jcalendar.py

@@ -0,0 +1,359 @@
+# -*- coding: utf-8 -*-
+"""clox jalali calendar."""
+# Reference: https://github.com/IKermani/jcalendar
+import datetime
+from itertools import repeat
+import jdatetime
+
+# Exception raised for bad input (with string parameter for details)
+error = ValueError
+
+
+# Exceptions raised for bad input
+class IllegalMonthError(ValueError):
+    """Illegal month error."""
+
+    def __init__(self, month):
+        """Initiate."""
+        self.month = month
+
+    def __str__(self):
+        """Return string representation."""
+        return "bad month number %r; must be 1-12" % self.month
+
+
+class IllegalWeekdayError(ValueError):
+    """Illegal weekday error."""
+
+    def __init__(self, weekday):
+        """Initiate."""
+        self.weekday = weekday
+
+    def __str__(self):
+        """Return string representation."""
+        return "bad weekday number %r; must be 0 (Shanbe) to 6 (Jom'e)" % self.weekday
+
+
+# Constants for months referenced later
+January = 1
+February = 2
+
+Farvardin = 1
+Esfand = 12
+
+# Number of days per month (except for Esfand in leap years)
+mdays = [0, 31, 31, 31, 31, 31, 31, 30, 30, 30, 30, 30, 29]
+
+# Full and abbreviated names of weekdays
+day_name = jdatetime.date.j_weekdays_en
+day_abbr = jdatetime.date.j_weekdays_short_en
+# day_abbr = ['Sh', 'Ye', 'Do', 'Se', 'Ch', 'Pa', 'Jo']
+
+# Full and abbreviated names of months (1-based arrays!!!)
+month_name = [0] + jdatetime.date.j_months_en
+month_abbr = [0] + jdatetime.date.j_months_short_en
+
+# Constants for weekdays
+(MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY, SUNDAY) = range(7)
+(DOSHANBE, SESHANBE, CHAHARSHANBE, PANJSHANBE, JOME, SHANBE, YEKSHANBE) = range(7)
+
+
+def isleap(year):
+    """Return True for leap years, False for non-leap years."""
+    return jdatetime.date(year, 1, 1).isleap()
+
+
+def leapdays(y1, y2):
+    """Return number of leap years in range [y1, y2)."""
+    leapdays = 0
+
+    for year in range(y1, y2):
+        if isleap(year):
+            leapdays += 1
+
+    return leapdays
+
+
+def weekday(year, month, day):
+    """Return week-day (0-6 ~ Mon-Sun)."""
+    if not datetime.MINYEAR <= year <= datetime.MAXYEAR:
+        year = 2000 + year % 400
+    return jdatetime.date(year, month, day).weekday()
+
+
+def monthrange(year, month):
+    """Return weekday (0-6 ~ Mon-Sun) and number of days (28-31) for year, month."""
+    if not 1 <= month <= 12:
+        raise IllegalMonthError(month)
+    day1 = weekday(year, month, 1)
+    ndays = mdays[month] + (month == Esfand and isleap(year))
+    return day1, ndays
+
+
+def _monthlen(year, month):
+    """Return length of month."""
+    return mdays[month] + (month == Esfand and isleap(year))
+
+
+def _prevmonth(year, month):
+    """Return previous month."""
+    if month == 1:
+        return year - 1, 12
+    else:
+        return year, month - 1
+
+
+def _nextmonth(year, month):
+    """Return next month."""
+    if month == 12:
+        return year + 1, 1
+    else:
+        return year, month + 1
+
+
+class Calendar(object):
+    """Base calendar class. This class doesn't do any formatting. It simply provides data to subclasses."""
+
+    def __init__(self, firstweekday=0):
+        """Initiate."""
+        self.firstweekday = firstweekday  # 0 = Doshanbe, 6 = Yekshanbe
+
+    def getfirstweekday(self):
+        """Get first weekday."""
+        return self._firstweekday % 7
+
+    def setfirstweekday(self, firstweekday):
+        """Set first weekday."""
+        self._firstweekday = firstweekday
+
+    firstweekday = property(getfirstweekday, setfirstweekday)
+
+    def iterweekdays(self):
+        """Return an iterator for one week of weekday numbers starting with the configured first one."""
+        for i in range(self.firstweekday, self.firstweekday + 7):
+            yield i % 7
+
+    def itermonthdates(self, year, month):
+        """Return an iterator for one month."""
+        for y, m, d in self.itermonthdays3(year, month):
+            yield jdatetime.date(y, m, d)
+
+    def itermonthdays(self, year, month):
+        """Like itermonthdates(), but will yield day numbers. For days outside the specified month the day number is 0."""
+        day1, ndays = monthrange(year, month)
+        days_before = (day1 - self.firstweekday) % 7
+        yield from repeat(0, days_before)
+        yield from range(1, ndays + 1)
+        days_after = (self.firstweekday - day1 - ndays) % 7
+        yield from repeat(0, days_after)
+
+    def itermonthdays2(self, year, month):
+        """Like itermonthdates(), but will yield (day number, weekday number) tuples. For days outside the specified month the day number is 0."""
+        for i, d in enumerate(self.itermonthdays(year, month), self.firstweekday):
+            yield d, i % 7
+
+    def itermonthdays3(self, year, month):
+        """Like itermonthdates(), but will yield (year, month, day) tuples.  Can be used for dates outside of datetime.date range."""
+        day1, ndays = monthrange(year, month)
+        days_before = (day1 - self.firstweekday) % 7
+        days_after = (self.firstweekday - day1 - ndays) % 7
+        y, m = _prevmonth(year, month)
+        end = _monthlen(y, m) + 1
+        for d in range(end - days_before, end):
+            yield y, m, d
+        for d in range(1, ndays + 1):
+            yield year, month, d
+        y, m = _nextmonth(year, month)
+        for d in range(1, days_after + 1):
+            yield y, m, d
+
+    def itermonthdays4(self, year, month):
+        """Like itermonthdates(), but will yield (year, month, day, day_of_week) tuples. Can be used for dates outside of datetime.date range."""
+        for i, (y, m, d) in enumerate(self.itermonthdays3(year, month)):
+            yield y, m, d, (self.firstweekday + i) % 7
+
+    def monthdatescalendar(self, year, month):
+        """Return a matrix (list of lists) representing a month's calendar.Each row represents a week; week entries are datetime.date values."""
+        dates = list(self.itermonthdates(year, month))
+        return [dates[i:i + 7] for i in range(0, len(dates), 7)]
+
+    def monthdays2calendar(self, year, month):
+        """Return a matrix representing a month's calendar."""
+        days = list(self.itermonthdays2(year, month))
+        return [days[i:i + 7] for i in range(0, len(days), 7)]
+
+    def monthdayscalendar(self, year, month):
+        """Return a matrix representing a month's calendar."""
+        days = list(self.itermonthdays(year, month))
+        return [days[i:i + 7] for i in range(0, len(days), 7)]
+
+    def yeardatescalendar(self, year, width=3):
+        """Return the data for the specified year ready for formatting."""
+        months = [
+            self.monthdatescalendar(year, i)
+            for i in range(Farvardin, Farvardin + 12)
+        ]
+        return [months[i:i + width] for i in range(0, len(months), width)]
+
+    def yeardays2calendar(self, year, width=3):
+        """Return the data for the specified year ready for formatting."""
+        months = [
+            self.monthdays2calendar(year, i)
+            for i in range(Farvardin, Farvardin + 12)
+        ]
+        return [months[i:i + width] for i in range(0, len(months), width)]
+
+    def yeardayscalendar(self, year, width=3):
+        """Return the data for the specified year ready for formatting."""
+        months = [
+            self.monthdayscalendar(year, i)
+            for i in range(Farvardin, Farvardin + 12)
+        ]
+        return [months[i:i + width] for i in range(0, len(months), width)]
+
+
+class TextCalendar(Calendar):
+    """Subclass of Calendar that outputs a calendar as a simple plain text similar to the UNIX program cal."""
+
+    def prweek(self, theweek, width):
+        """Print a single week (no newline)."""
+        print(self.formatweek(theweek, width), end='')
+
+    def formatday(self, day, weekday, width):
+        """Return a formatted day."""
+        if day == 0:
+            s = ''
+        else:
+            s = '%2i' % day  # right-align single-digit days
+        return s.center(width)
+
+    def formatweek(self, theweek, width):
+        """Return a single week in a string (no newline)."""
+        return ' '.join(self.formatday(d, wd, width) for (d, wd) in theweek)
+
+    def formatweekday(self, day, width):
+        """Return a formatted week day name."""
+        if width >= 9:
+            names = day_name
+        else:
+            names = day_abbr
+        return names[day][:width].center(width)
+
+    def formatweekheader(self, width):
+        """Return a header for a week."""
+        return ' '.join(self.formatweekday(i, width) for i in self.iterweekdays())
+
+    def formatmonthname(self, theyear, themonth, width, withyear=True):
+        """Return a formatted month name."""
+        s = month_name[themonth]
+        if withyear:
+            s = "%s %r" % (s, theyear)
+        return s.center(width)
+
+    def prmonth(self, theyear, themonth, w=0, l=0):
+        """Print a month's calendar."""
+        print(self.formatmonth(theyear, themonth, w, l), end='')
+
+    def formatmonth(self, theyear, themonth, w=0, l=0):
+        """Return a month's calendar string (multi-line)."""
+        w = max(2, w)
+        l = max(1, l)
+        s = self.formatmonthname(theyear, themonth, 7 * (w + 1) - 1)
+        s = s.rstrip()
+        s += '\n' * l
+        s += self.formatweekheader(w).rstrip()
+        s += '\n' * l
+        for week in self.monthdays2calendar(theyear, themonth):
+            s += self.formatweek(week, w).rstrip()
+            s += '\n' * l
+        return s
+
+    def formatyear(self, theyear, w=2, l=1, c=6, m=3):
+        """Return a year's calendar as a multi-line string."""
+        w = max(2, w)
+        l = max(1, l)
+        c = max(2, c)
+        colwidth = (w + 1) * 7 - 1
+        v = []
+        a = v.append
+        a(repr(theyear).center(colwidth * m + c * (m - 1)).rstrip())
+        a('\n' * l)
+        header = self.formatweekheader(w)
+        for (i, row) in enumerate(self.yeardays2calendar(theyear, m)):
+            # months in this row
+            months = range(m * i + 1, min(m * (i + 1) + 1, 13))
+            a('\n' * l)
+            names = (self.formatmonthname(theyear, k, colwidth, False)
+                     for k in months)
+            a(formatstring(names, colwidth, c).rstrip())
+            a('\n' * l)
+            headers = (header for k in months)
+            a(formatstring(headers, colwidth, c).rstrip())
+            a('\n' * l)
+            # max number of weeks for this row
+            height = max(len(cal) for cal in row)
+            for j in range(height):
+                weeks = []
+                for cal in row:
+                    if j >= len(cal):
+                        weeks.append('')
+                    else:
+                        weeks.append(self.formatweek(cal[j], w))
+                a(formatstring(weeks, colwidth, c).rstrip())
+                a('\n' * l)
+        return ''.join(v)
+
+    def pryear(self, theyear, w=0, l=0, c=6, m=3):
+        """Print a year's calendar."""
+        print(self.formatyear(theyear, w, l, c, m), end='')
+
+
+c = TextCalendar()
+
+firstweekday = c.getfirstweekday
+
+
+def setfirstweekday(firstweekday):
+    """Set first weekday."""
+    if not DOSHANBE <= firstweekday <= YEKSHANBE:
+        raise IllegalWeekdayError(firstweekday)
+    c.firstweekday = firstweekday
+
+
+monthcalendar = c.monthdayscalendar
+prweek = c.prweek
+week = c.formatweek
+weekheader = c.formatweekheader
+prmonth = c.prmonth
+month = c.formatmonth
+calendar = c.formatyear
+prcal = c.pryear
+
+# Spacing of month columns for multi-column year calendar
+_colwidth = 7 * 3 - 1  # Amount printed by prweek()
+_spacing = 6  # Number of spaces between columns
+
+
+def format(cols, colwidth=_colwidth, spacing=_spacing):
+    """Print multi-column formatting for year calendars."""
+    print(formatstring(cols, colwidth, spacing))
+
+
+def formatstring(cols, colwidth=_colwidth, spacing=_spacing):
+    """Return a string formatted from n strings, centered within n columns."""
+    spacing *= ' '
+    return spacing.join(c.center(colwidth) for c in cols)
+
+
+EPOCH = 1970
+_EPOCH_ORD = jdatetime.date(EPOCH, 1, 1).toordinal()
+
+
+def timegm(tuple):
+    """Unrelated but handy function to calculate Unix timestamp from GMT."""
+    year, month, day, hour, minute, second = tuple[:6]
+    days = jdatetime.date(year, month, 1).toordinal() - _EPOCH_ORD + day - 1
+    hours = days * 24 + hour
+    minutes = hours * 60 + minute
+    seconds = minutes * 60 + second
+    return seconds

{clox-0.6 → clox-0.8}/clox/params.py

@@ -2,7 +2,7 @@
 """clox params."""
 import pytz
 
-CLOX_VERSION = "0.6"
+CLOX_VERSION = "0.8"
 
 CLOX_OVERVIEW = '''
 Clox is a terminal-based clock application designed for terminal enthusiasts who appreciate simplicity,
@@ -24,7 +24,8 @@ HORIZONTAL_TIME_12H_FORMATS = ['%I:%M %p', '%I:%M %p.']
 VERTICAL_TIME_12H_FORMATS = ['%I\n%M\n%p', '%I\n%M\n%p.']
 DATE_FORMAT = "%A, %B %d, %Y"
 
-TIMEZONES_LIST = pytz.all_timezones
+TIMEZONES_LIST = list(map(lambda x: x.upper(), pytz.all_timezones))
+COUNTRIES_LIST = list(map(lambda x: x.upper(), pytz.country_timezones.keys()))
 
 
 FACES_MAP = {
@@ -57,4 +58,6 @@ FACES_MAP = {
 
 FACES_LIST = [-1] + sorted(FACES_MAP)
 
-CALENDAR_LIST = ["month", "year"]
+CALENDARS_LIST = ["month", "year"]
+
+DATE_SYSTEMS_LIST = ["gregorian", "jalali"]

{clox-0.6 → clox-0.8}/clox.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.2
 Name: clox
-Version: 0.6
+Version: 0.8
 Summary: A Geeky Clock for Terminal Enthusiasts
 Home-page: https://github.com/sepandhaghighi/clox
-Download-URL: https://github.com/sepandhaghighi/clox/tarball/v0.6
+Download-URL: https://github.com/sepandhaghighi/clox/tarball/v0.8
 Author: Sepand Haghighi
 Author-email: me@sepand.tech
 License: MIT
@@ -32,6 +32,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: AUTHORS.md
 Requires-Dist: art>=5.3
+Requires-Dist: jdatetime>=3.8.2
 Requires-Dist: pytz>=2019.2
 Dynamic: author
 Dynamic: author-email
@@ -103,13 +104,13 @@ Clox is a terminal-based clock application designed for terminal enthusiasts who
 ## Installation		
 
 ### Source Code
-- Download [Version 0.6](https://github.com/sepandhaghighi/clox/archive/v0.6.zip) or [Latest Source](https://github.com/sepandhaghighi/clox/archive/dev.zip)
+- Download [Version 0.8](https://github.com/sepandhaghighi/clox/archive/v0.8.zip) or [Latest Source](https://github.com/sepandhaghighi/clox/archive/dev.zip)
 - `pip install .`				
 
 ### PyPI
 
 - Check [Python Packaging User Guide](https://packaging.python.org/installing/)     
-- `pip install clox==0.6`						
+- `pip install clox==0.8`						
 
 
 ## Usage
@@ -142,16 +143,30 @@ clox
 clox --face=3
 ```
 * Use `--face=-1` for random mode
-* [Faces List](https://github.com/sepandhaghighi/clox/blob/main/FACES.md)
-* `clox --faces-list`
+* [Faces List](https://github.com/sepandhaghighi/clox/blob/main/FACES.md): `clox --faces-list`
+
 
 ### Timezone
 
 ```console
 clox --timezone="Etc/GMT+7"
 ```
-* [Timezones List](https://github.com/sepandhaghighi/clox/blob/main/TIMEZONES.md)
-* `clox --timezones-list`
+* [Timezones List](https://github.com/sepandhaghighi/clox/blob/main/TIMEZONES.md): `clox --timezones-list`
+
+
+### Country
+
+The `--country` argument allows you to specify a country using its **ISO 3166** code format
+
+ℹ️ When the `--country` argument is provided, the `--timezone` argument will be ignored
+
+ℹ️ If the specified country has multiple timezones, the first timezone will be selected automatically
+
+```console
+clox --country="DE"
+```
+* [Countries List](https://github.com/sepandhaghighi/clox/blob/main/COUNTRIES.md): `clox --countries-list`
+
 
 ### Vertical/Horizontal Shift
 
@@ -209,6 +224,16 @@ In this mode, the calendar will be displayed
 clox --calendar=month
 ```
 
+### Date System
+
+ℹ️ Valid choices: [`gregorian`, `jalali`]
+
+ℹ️ The default date system is `gregorian`
+
+```console
+clox --date-system=jalali
+```
+
 ## Screen Record
 
 <div align="center">
@@ -267,6 +292,21 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [0.8] - 2025-03-16
+### Added
+- `--country` argument
+- `--countries-list` argument
+- `COUNTRIES.md`
+### Changed
+- Input case sensitivity bug fixed
+- Test system modified
+- `README.md` updated
+## [0.7] - 2025-03-06
+### Added
+- Jalali calendar
+- `--date-system` argument
+### Changed
+- `README.md` updated
 ## [0.6] - 2025-02-25
 ### Added
 - `--calendar` argument
@@ -305,7 +345,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - `TIMEZONES.md`
 - `FACES.md`
 
-[Unreleased]: https://github.com/sepandhaghighi/clox/compare/v0.6...dev
+[Unreleased]: https://github.com/sepandhaghighi/clox/compare/v0.8...dev
+[0.8]: https://github.com/sepandhaghighi/clox/compare/v0.7...v0.8
+[0.7]: https://github.com/sepandhaghighi/clox/compare/v0.6...v0.7
 [0.6]: https://github.com/sepandhaghighi/clox/compare/v0.5...v0.6
 [0.5]: https://github.com/sepandhaghighi/clox/compare/v0.4...v0.5
 [0.4]: https://github.com/sepandhaghighi/clox/compare/v0.3...v0.4

{clox-0.6 → clox-0.8}/clox.egg-info/SOURCES.txt

@@ -1,5 +1,6 @@
 AUTHORS.md
 CHANGELOG.md
+COUNTRIES.md
 FACES.md
 LICENSE
 MANIFEST.in
@@ -12,6 +13,7 @@ setup.py
 clox/__init__.py
 clox/__main__.py
 clox/functions.py
+clox/jcalendar.py
 clox/params.py
 clox.egg-info/PKG-INFO
 clox.egg-info/SOURCES.txt

{clox-0.6 → clox-0.8}/clox.egg-info/requires.txt

@@ -1,2 +1,3 @@
 art>=5.3
+jdatetime>=3.8.2
 pytz>=2019.2

{clox-0.6 → clox-0.8}/dev-requirements.txt

@@ -1,3 +1,4 @@
+jdatetime==5.2.0
 pytz==2025.1
 art==6.4
 setuptools>=40.8.0

{clox-0.6 → clox-0.8}/requirements.txt

@@ -1,2 +1,3 @@
 art>=5.3
+jdatetime>=3.8.2
 pytz>=2019.2

{clox-0.6 → clox-0.8}/setup.py

@@ -29,7 +29,7 @@ def read_description():
 setup(
     name='clox',
     packages=['clox'],
-    version='0.6',
+    version='0.8',
     description='A Geeky Clock for Terminal Enthusiasts',
     long_description=read_description(),
     long_description_content_type='text/markdown',
@@ -37,7 +37,7 @@ setup(
     author='Sepand Haghighi',
     author_email='me@sepand.tech',
     url='https://github.com/sepandhaghighi/clox',
-    download_url='https://github.com/sepandhaghighi/clox/tarball/v0.6',
+    download_url='https://github.com/sepandhaghighi/clox/tarball/v0.8',
     keywords="clock time timer timezone terminal cli geek clox",
     project_urls={
         'Source': 'https://github.com/sepandhaghighi/clox'