mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-10-22 00:01:09 -06:00

* ENH: Show Recent File Image Keep Scale Change-Id: Ib8a6cf916eaee8e353bf858bc4f2ea503705809e * FIX: wipetower position problem jira: STUDIO-4914 Change-Id: I7b05d3c53931ed8ce3d4603ff21ee6ef675611e5 * FIX: dailytips adapts screen scale jira: STUDIO-5019 STUDIO-5026 STUDIO-5027 STUDIO-5028 STUDIO-5025 Change-Id: I63d3af1870218ba8e0f048a6ef03fb29fabe27cb * FIX: generate process preset based on template Jira: XXXX Change-Id: I50adf0790dc239307d236a4cebece860ef6beb16 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: object list plate name edit Change-Id: I61d3dcd7d9598d759a3a0b44cc77d2af2adca25a Jira: STUDIO-4937 * ENH:no longer checking nozzle type jira:[for nozzle type check] Change-Id: I0e88445a264f21b0c11519e9a22a165d05611d14 * ENH: improve first layer tree support First layer support can't be top interface, and min brim width of auto mode should be larger than 0. Jira: STUDIO-5010 Change-Id: I02f8b017b535f8a47965387e8679f692b1966e04 (cherry picked from commit 3e7d54abe352e8ab5f9d6492b5a86a96f9067f94) * ENH: version: bumped to 1.8 JIRA: no jira Change-Id: I50903098b59f1dd9a6b6cf7656cec7d388f3ff17 * ENH:try again after subscription failure jira:[Try again after subscription failure] Change-Id: Ibfb1e8e26eb166d786a372632a86ef98030db034 * ENH:display msg dialog once jira:[for http error msg] Change-Id: I12e9c155fdb567cac99c35b6feeef650269ba75d * ENH:remove config.json file Change-Id: Idfcf3a63fefe968e88153c26fb691fd05cd83dc4 * ENH:add protection in threads jira:[for random crash] Change-Id: I6286012dd77abccba461f7cd72a6fc531a84c95f * FIX: add protection for get_model_task_thread thread Jira: XXXX Change-Id: I3cbc17d181a0e13c658f31eaeb6a4df878e6df41 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: delete all compatible presets when delete third printer Jira: XXXX Change-Id: I1a294402627e7ab7a8c6701f20679b3d04aff059 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ci: update build version to 01.08.00.51 Change-Id: I20a01adacbdb5fe69c106b9efd029f7308136e10 * ENH: default open support_interface_not_for_body jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I48e084deb18633f9ec47a8ec4ec643163bf66318 * ENH:modified text with too low version jira:[for low version] Change-Id: I862a0defda976a35f326a8805e002330f2ed7fdf * NEW:update printer config file version Change-Id: I9a46b29b03beb67a3da0b8f76d8b5c4b3c482928 * FIX:The plane should rotate around the world coordinate system Jira: STUDIO-5054 Change-Id: I16e484b38d79cabd9473acf1abf3c5c6b0adc4c6 * ENH:translate for limit file size and so on Jira: STUDIO-5007 Change-Id: I2c279eb690841aa51cd8128f8028266cbc17e977 * ENH:use on_render_rotate_gizmos() replace GLGizmoRotate3D::on_render() Jira: STUDIO-4227 Change-Id: If9b9ea5596e59472d5fa87ac56aeb7f6ecc65643 * FIX: some mistakes in filament profiles jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ibe7f3650f2d9cf47561dd5f2ec591a5f6c553503 * FIX: fix shard_ptr is null Change-Id: I0187cf64ffbb08a2265a11900b5c865e9ac9678f * FIX:N1 printer image in dark mode JIRA:STUDIO-4057 Change-Id: I22c001d96839daf213d5096f6ff6e3d6398fa8c4 * FIX: create printer issue Jira: 5034 5059 5053 5034 create printer but filament is repeat 5039 create successful dialog remove to center 5053 create existing printer copywriting adjustments and preset updates Delete printer secondary confirmation dialog Change-Id: Ifb3822d1e168459d2af11e02b31ecaf3719d338a Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ENH:just don't check the nozzle diameter jira:[for nozzle check] Change-Id: I678e7d62832eaa14b9be47d6dce70f29ebd601f6 * NEW:p1 and x1 series added motor noise calibration JIRA: 5085 Change-Id: Id73cc2d34b6130f215d81ffcdc39ba6b241445bf * ci: update build version to 01.08.00.52 Change-Id: I93d800b413f2751d132fac53fbd9b191603d0352 * FIX: ObjectSetting changed when search plate JIRA: STUDIO-5095 Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I39b1ad997d51ac4224ff5ad2b3555f56da4bd911 * FIX: invalid support params in 3rd party profiles Many params are not right.Just use default jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I5c4a1e8b046940e174f5681a79031b5f20fcafc5 * ENH: update A1 mini start gcode Change x-axis freq sweep amp 5->10 jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I2e731cc6392c0204d5e4467bf4b933ab233bc157 * FIX: [STUDIO-4946] use utf8 path to create sub process Change-Id: I5873c114e8cd36978a7d50bf13c3aa7bf8b740ca Jira: STUDIO-4946 * FIX: fix a plate state not correct issue JIRA: no-jira the object and instance states lost after undo Change-Id: I527df9a7d426d994501a4ed5bbb198c7bbac810b * FIX: some translation Jira: 5096 5089 5036 5004 Change-Id: I4f1bd6e352b11451f5caf02cbc4eeb31dfa03eee Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: [STUDIO-4935] plate name edit in object list Change-Id: I271fa217281d0c7ceca61166497136628a66681e Jira: STUDIO-4935 * FIX: take custom root as AMS sync candicate Change-Id: I9c71babcd74238d1533b15d77a978b19997c70c0 Jira: none * FIX: modify some default support params in code 1. Modify default values of some supports params, so 3rd party profiles are easier to setup. 3. Fix a bug that organic support may cause crash. Jira: none Change-Id: Icae348d8fe5985f4287404e96089198a499283f2 (cherry picked from commit 8889cfc703b72e142f288e525b89c87619f2213c) * FIX: do not generate sheath for normal support Jira: none Change-Id: I8f3f3e39171055f8d18c06ceee8e245594273238 (cherry picked from commit 93bc7ecf4346f179f502bebc3cf47b0030b56e2c) * FIX: push_notification on GUI thread Change-Id: Iaec347f5684fe0f65d6418759518189b67033c42 Jira: STUDIO-5106 * ENH: CLI: add some params to support more functions 1. uptodate_filaments to support update the original filaments to newest config 2. allow_rotations/avoid_extrusion_cali_region for auto-arrange 3. skip_modified_gcodes to support skip modified gcodes JIRA: STUDIO-5112 Change-Id: I95c09af1b5462cce3bf27aea32228d6d1d1d201d * FIX: missed manually entered values for secondary processing Jira: STUDIO-4964 Change-Id: I5cf0da1ae77cccd34de05b4a0318a751ac9f6753 * FIX: Z hop is still enabled when upper boundary is zero. Jira: STUDIO-4893 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I5f46a02e1fbb15ff43e253e3a184aa6cc38e7598 * ENH: update default filaments for Bambu printers jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ic6380f39e546854ad0b7dc36929a8605c9ab3acc * ENH: dailytips modification 1. modify closing behavior 2. dailytips can adjust self size according to the canvas size. And also adjust GodeViewer legend window size 3. fix a button text encoding bug 4. support vertical/horizontal layout(horizontal layout currently not used) jira: new Change-Id: I8e0b6e85c455d0608d7388fb441829c1991ad01f * FIX: [4857 5097] export list and del preset two confirm issue Jira: 4857 5097 Change-Id: If7cc4967a663f575527a227e9c4ac31e0491930c * FIX: UUID conflict issue when referencing volume Jira: XXXX 3mf file standard Change-Id: I953a87294684ea85d03a95e7d2843c096904aeae Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: [4483 5003 5109] create printer and edit filament issue Jira: 4483 5003 5109 4483 dialog blink 5003 preset list too long 5109 encode Change-Id: I190e12272ca09f36b841f2f85a6cf60f2c2614bd Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: cloud use presets limit notify Change-Id: I6cc7b4e560cb83db0fc30921633b10531957128e Jira: STUDIO-5091, STUDIO-5104 * FIX: do user preset sync later on startup Change-Id: I0653a0438477b1c803ce1cddc66ef47f95616dae Jira: STUDIO-5106 * FIX: linux: pressing enter in height range will crash jira: STUDIO-4391 Change-Id: I6bf990951d1456f5b2605b8d62a05bceb3cc4c10 * FIX: failed to limit the max width of DropDown Jira: STUDIO-4503 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: Id9352d16f4bc016daade72a9c8d3d90164a1cb3d * FIX: not jump to preview after first wizard Change-Id: I8c94d66a91aa15a7874441a300b40438638bd33b Jira: STUDIO-5018 * ENH: CLI: clear custom gcodes when skip_modified_gcodes JIRA: STUDIO-5112 Change-Id: I2e7346d2ac57519029a4e80e5492c34d3d91ed77 * FIX: [4492 4851 4883 5121] create printer issue Jira: 4492 4851 4883 5121 Change-Id: If252b5f30be0403f79410aa8c00fc14b066d5bbd Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ENH: add 'edit preset' and 'delete preset' btn for each preset Jira: 5200 5113 Change-Id: I208ad63eb4b895306fa76db424da2e1df10a582e Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: add skip label before tool change Jira: 5074 github: 2776 Signed-off-by: qing.zhang <qing.zhang@bambulab.com> Change-Id: Icaafd3b45da1e78c1a82e7d17d7505d9439b9100 * FIX:Network test dark mode adaptation JIRA:STUDIO-2468 Change-Id: I20cb7f1fd8eca3ce852acb563c1cc87978e216dc * FIX:n1 external feed prompt pop-up without retry button JIRA: STUDIO-4696 Change-Id: I31069c72e29d3398469d71cdbc2a344a5430fc2c * FIX: not show device page when switch printer preset Change-Id: I00d8524625a4682b6a39876ddb66bf8bd928dbef Jira: none * ENH: Check the nozzle diameter when sending calibration Jira: 4977 Change-Id: Iabbba44583bbd9fbaaa889ca546ee0ccbb2aa77f * FIX: Generate UUID from objectID and volumeIndex Jira: XXXX Change-Id: I65147ef9b695f8af8de260d722e604b0e0bab563 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: disable filament_typep Jira: XXXX Change-Id: Ib605b33e4474525fbe49e70596fc09aa356f478a Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ci: update build version to 01.08.00.53 Change-Id: I1d574fa2cf2a4d0eb63a38eb8ced7587d06a4272 * ENH: refine display logic of param 1. Refine the display logic of "support_interface_not_for_body".Only toggle if support_filament is default and support_interface_filament is specified jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ia2af030c4531ad6b04a198bfe8a1677b3d20a800 * FIX: user preset sync token Change-Id: Id2aa865b778ee9ac4cfddb68ceef0374507b519b Jira: none * FIX: Bitmap cache not take effect Change-Id: I972098fdbda0b4542c6c759a8f5e1f0f2a30852b Jira: STUDIO-4991 * NEW: Open HotModel Link With GetParam-From bambustudio JIRA: NO JIRA Change-Id: I4ac49bac5ee0c50988c76a38b00b7ba7dc3201f5 * NEW:AmsMaterialsSetting Support for user-preset JIRA: STUDIO-5135 Change-Id: If848047cd5dbd059d440de30989c505c361305a7 * FIX: upload custom root preset fail Change-Id: I621c8d542dd604b07cc5df63d97d7a31558d3aba Jira: none * FIX: show custom filament in AMS filament list Change-Id: I79b9f8f2f08db8c52bbed76f1ea133baff383c00 Jira: none * FIX: dailytips window and gcodeviwer legend window size issue reset to original logic of dailytips and legend window size jira: new Change-Id: Iacb016bb222ba3f87317cfbe1f2b003802d773a5 * ENH: add text translation jira: new Change-Id: I780cfb8a0a64d806b5e0a414b6598e3b7bdf52dc * FIX: Delete and search object outside the plate JIRA: 1. STUDIO-5132 Deleting object outside the plate will crash 2. STUDIO-5146 The search function cannot search for object outside the plate Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I84cb3fe990a9c2a182e7434c262466a70545280e * FIX: [5149 5142 5141 5140 5136] create printer and filament issue Jira: 5149 5142 5141 5140 5136 5149 process preset name can not show all 5142 improt configs combobox not update 5141 disable modify filament_vendor 5140 disable input Bambu and Generic vendor 5136 preset list window adjust Change-Id: I111a23996146cc16cc7f533c8616d50223d34c40 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ci: update build version to 01.08.00.54 Change-Id: Ifd69c01a82f627a9c6cf4fe0d48a759563ee90e7 * FIX: print model from sdcard with p1p Change-Id: If85383ba762022ead3dd754ae02a08817b891114 Jira: none * FIX: dailytips text translation jira: STUDIO-2556 Change-Id: If44e503615b09ee1692f42ba1f998918ec5bd691 * FIX: clone shortcut key conflict with quit in macos jira: STUDIO-5166 Change-Id: I548f275bb68d3b0e6bb3cfad6fe93df09d507da3 * FIX:User preset material settings dependent on firmware JIRA: 5167 Change-Id: I82cf26848594b01155883ad0aa2e9ee77d371fb2 * ENH:update the description of nozzle detection Change-Id: Id27b25c69dc11fcf66fc82053af705906ae8c370 * FIX: [5159 5165 5171 5172] create printer and filament issue Jira: 5159 5165 5171 5172 5159 create printer dialog no refresh 5165 create printer 2 step dialog no refersh 5171 change font 5172 edit filament dialog darkUI issue input special character is prohibited '/' in preset name translate to '-' update printer combobox Change-Id: I5fa27836dab7f604f1a065c65efa099c7a2f0f96 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ci: update build version to 01.08.00.55 Change-Id: If1865d561cf274719204662314de163497759e89 * FIX:fix GLmodel deconstruction causing section not to be rendered Jira: STUDIO-5156 Change-Id: Ibb2f459920989ee54f7b827352dc8893424b4de6 * FIX: missing unlock cause device or resource busy Change-Id: I87563312ea9c6ce4e4e471da7ce7a02b53b64762 * FIX: some translation Change-Id: I9758cbc758030b5a3945697a50ca4898af9fcb1b * ci: update build version to 01.08.00.56 Change-Id: Id5ee53dd2ebb0b37b6927dc58b3cca94a1f66a83 * ENH: remove PLA GLOW in A1 mini jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Id99c1bbd4248e28df9150a85eecec831f6f32856 * ci: update build version to 01.08.00.57 Change-Id: Ib4dfa60f097128b76b95bb14ca04978619021b56 * Allow line width of nozzle diameter * 2.5 As it were, 1 mm would be disallowed but 0.99 would be allowed for 0.4 nozzle. 1 mm is the sane maximum and 0.99 is unnecessary tedious to write. * Russian translation update Russian translation Bambu Studio_v1.8.0 Beta * FIX: scale problem in needs_retraction jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Idfbe954b22fa6aa5769c55e46874fa6a80ecbf45 (cherry picked from commit 4e853f50b748e3af11e2d64862b6ee557fda361b) * ENH: CLI: support load_assemble_list JIRA: STUDIO-4848 Change-Id: Ife11533740988331ea71eac86c370e625970cb8b * FIX: align to Y not working This is a bug introduced in 7fbb650 when solving jira STUDIO-4695. Now we use a more decent way to solve it. Change-Id: I92deffcb9fe53e8a24c93fe973446ae37df07375 (cherry picked from commit bd98430dbd15eb6c9bb4b447990e0dcf8a50eef0) * ENH: Add buried points for cut and meshboolean JIRA: NONE Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I67ce498d0c335dd7a8582f56b880c2c8314f8541 * FIX: 5092 edit filament add scrolled window Jira: 5092 Change-Id: I53ae996b04e4e2f1b1ddce6a858d505001b11615 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: can not select user preset when create filament Jira: XXXX github: 1936 and fix add preset for printer dialog can not show selected printer Change-Id: Id4308c6bdca17d52d4aa321db359941aa87e0e45 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ENH: template filament don't be show in filament list and sort Jira: 5160 5179 Change-Id: I56a7e1897e1ef3c061dc66d318896413ca25b76b Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: [5174] export configs dialog issue filament name too long to can not show all Jira: 5174 Change-Id: I92018c9d7f86009b78b533592d899b4b5d78c3c8 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ENH: add filament Bambu TPU 95A HF 1.As title jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I752ec43da6297a6c172679997ce68f2318a7b8fb * ENH: modify some params with filaments 1.Modify the PEI bed temperature of PLA Basic, Matte, and Tough to 65 in A1 mini. Set the bed temperature for the first layer of Bambu PETG-CF to 65 and 70 for the other layers jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ia902bbb7f824082d5346709d781cac64296f47a8 * ENH: add more status during printing JIRA: STUDIO-5195 Change-Id: I85b3107839c6e2fdecbc10d90a876463e284468c Signed-off-by: Stone Li <stone.li@bambulab.com> * FIX:cut imgui has overlapping rendering on Apple Jira: STUDIO-5150 Change-Id: I7969e19dc189cd617026a183067dad628208955c * FIX:not TakeSnapshot for m_start_dragging_m Jira: STUDIO-5176 Change-Id: Ia03e3e2c2664dbdcffa19ec8d0fa97dfd95e6d35 * FIX: rendered color changes Jira: STUDIO-4956 during the drag processin connectors editing state Change-Id: I3027176ea9f93a9ba9d6a2052f41aaa4adef79f1 * FIX: merge the patch from Prusa Thanks for PrusaSlicer and YuSanka Jira:STUDIO-5175 commit 510d59687b3b19c4a0f4e6540620d0694dd1b7ac Author: YuSanka <yusanka@gmail.com> Date: Thu Oct 5 14:13:14 2023 +0200 Follow-up 1b451cdf: Fixed #11415 - Connectors disappear when slicing => only when using multiple cut planes AND excluding parts Change-Id: I9ccd5b85f482d723d21fccf5e104c9e0a9cc4849 * FIX:Press ESC directly to exit after entering the profile rendering rendering is not normal,Code from PrusaSlicer,thanks for PrusaSlicer and enricoturri1966 commit a078627552f54497ed0518dc7bc349d243576d19 Author: enricoturri1966 <enricoturri@seznam.cz> Date: Mon Jan 30 14:00:02 2023 +0100 Follow-up of 1218103fd620b319c56fd08116f81b581c537188 - Fixed gizmo missbehavior when closing a gizmo by resetting the selection clicking on the scene Jira: STUDIO-5164 Change-Id: I261da9dba2a5ac37f3e263c175fbccd80d8045bd * FIX: correct the strings and move create printer dialog center Jira: 5221 5183 Change-Id: Ida4eba63f0e962ffcc8000fcc04cf20849577217 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ENH: CLI: skip layer height limit validate when slicing for existing models JIRA: no jira Change-Id: I1444a28b500ca7d08ed2606eecfa5cfaf261105e * ENH:update the translation of auto refill jira:[for translation] Change-Id: Iaa7b4f3d7cd88c8b4f69a3db721ebd8ca8986eea * FIX: icon issue for copying Jira: STUDIO-4168 Icon issue when filling bed with copies Change-Id: I61a03ecae02b75602c236ed2810e9c9cfe5a19f9 (cherry picked from commit b5079f8a2e79f19f65803f23ef4fd83aff17c84a) * ENH: update some filament params 1. Modify texture bed temp to 65 2. Modify max-v-speed for ABS 3. Modify some params in Generic PA 4. Modify PLA,PVA params jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I42584a6015b8526f6bbb93024316968198bd76ce * FIX: 3770 printable checkbox incorrect display in darkUI Jira: 3770 Change-Id: I97f67d7a0ffc41f6ee625abeecc52ee4e73cf318 * FIX:Display garbled code in AmsMaterialsSetting pop-up Change-Id: I50531e939afa7715ae376bac47172ccf7b248114 * ENH:Modifying the Line Color of Transparent Materials JIRA: STUDIO-4311,5088,4983 Change-Id: I9e63413dc9cd7d523f0f7f1a2e32c4537a84467a * FIX: crash when async delete printer file Change-Id: I92c5e812d04da263338fb0eea2fd7583cf9ecde0 Jira: STUDIO-5222 * FIX: 3733 backup time not effective Jira: 3733 Change-Id: I50c2ce156fcbd0a17aa8a6777bce04aa6093c830 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: enable edit and delete preset btn and fix issue Jira: XXXX Change-Id: I724d7236b28fcc4746698f094531948a8fbb5d93 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX:send print job,file name displays error JIRA:3137 Change-Id: I1c113025d274a13fba1b845a58aada14058fadd4 * FIX: skip hold user preset from sync Change-Id: I2252246e19bd80903ad82170782ea49535d30d05 Jira: STUDIO-5185 * FIX: 5115 translations Jira: 5115 Change-Id: I21b03bdd4d28c0bb097226143177e763cf8c777f Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: add link for ironing parameter Change-Id: I451f5549db3ac2205aa5703a2e5edc831e946af8 * FIX: scale problem in lift type decide 1. Scale the travel threshhold jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ib594d640fe63b0919bc9318af88577513f7dbf30 * ENH: add small perimeter speed and threshold The original param is added by Prusa. Thanks orca for adding threshold. 1. Re add small perimeter speed and threhold. github: #2221 Change-Id: I35b269b26f085d80f0edca28650bb21fc04898d7 * FIX: modify the picture of pa manual cali Jira: STUDIO-5102 Change-Id: Id87898959ad4461b7bd2505b159271f2aa589c36 * FIX: Filament preset is the same with the first one Jira: STUDIO-4519 Filament preset is the same wit the first one, it should align with the last one. Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I304d0ff0fbc1c8948d410ea552e4d42b6a4e8fd9 * FIX: scoreDailog dark mode issue Jira: 4570 Change-Id: I8be97b306a1494f73e3bba678ecc864e7ff88ca3 * FIX: CLI: fix the slicing issue while only one object with multicolor using seq-print JIRA: no-jira Change-Id: Iea2d23ff8e484bf2fd58aa2f596a8e4e4292fe39 * ENH: open support wall count for normal support 1. open support wall count for normal support Enabling this option makes normal support stronger and gives better overhang quality, but also more difficult to removal. Jira: STUDIO-5192 2. fix a bug where tree support (hybrid style) may get overlapped extrusions near the walls. 3. fix a bug where raft layers can't be 1 in tree support Jira: STUDIO-5261 Change-Id: Iadc0c67a9b50b5b221c8e83d5aa22ed282018cf8 (cherry picked from commit c0bb0084e386cb70ed6e16edf93190e4b38f5b90) * FIX: compiling error on linux jira: none Change-Id: I1a4563503b5ddf74a1979cc0cee7a15b8aced904 (cherry picked from commit de52c6ca62c9f3a6314ddf5a856c1d8534329886) * ENH: add translation for small perimeter jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I95013649e4e0c07c0f04b89a91488814c8d228cc * FIX: clone shortcut key issue on macos jira: STUDIO-5166 Change-Id: I1967da1d443ed43bd750dad8e11560688d7bd533 * FIX: custom gcode window cannot paste/ navigate jira: STUDIO-5208、STUDIO-5070 Change-Id: I4ecb9d06cf5db0ae53a4678181aae9298bac106b * ENH: modify dailytips collapse & expand interaction jira: STUDIO-5209、STUDIO-5210 Change-Id: Ifb0b998e5004d4b49390ba5a250eaf4743bf3471 * ENH:Add shortcut keys and lists for objects search JIRA: STUDIO-5157 STUDIO-5158 STUDIO-5240 Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: Ic7cfaaa9b4bb8a85208bafab7fe3bafdb78f0045 * FIX:Re-calculate button with White Box displayed in dark mode JIRA: STUDIO-5098 Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Change-Id: I07cc6c72d5dbd03b72573cd27dd5938bb0e6a29a * NEW: display plate index when printing a task JIRA: STUDIO-2689 display on the thumbnail of the current task Change-Id: I5f1f46c56e9d1e9120a66d491551908dfad099d6 Signed-off-by: Stone Li <stone.li@bambulab.com> * ENH:fixed incorrect path prefix jira:[for file path prefix] Change-Id: Ie9e3999f02b78272e528ceceb479e746d46a7e6c * FIX: thumbnail is not clear in dark mode JIRA: STUDIO-5087 Change-Id: Ie86493ed71b5554095927f061509a1f551758b61 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> * FIX: translation Jira: XXXX Change-Id: Id03f0d704aa852632a907ea628d1277400112062 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ENH: first nozzle change to 0.4 and nozzle change to mm Jira: XXXX Change-Id: I14defd36442dbd7008e46782b08415b6244224f1 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * ENH:editing_window_width's value is small on the laptop Jira: STUDIO-5238 STUDIO-5265 apply_selected_connectors should check_and_update_connectors_state Change-Id: I8c2c1c920cc4d197d1908815a3e62f4962335451 * FIX: fix new_bed_shape's calculation process Jira: STUDIO-5122 Change-Id: I5f3e6a301a297123af28692c90bef6759f425b06 * ENH:update some translations jira:[STUDIO-5262] Change-Id: Idb1d3586888043ac325f272bc7a2b788adb3e9e5 * FIX: edit text command resets object settings Jira: STUDIO-4655 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: Iac25c4e40f1d0d32e6d1f40e62226cc22bc96042 * ci: update build version to 01.08.00.58 Change-Id: Iacfec02aa50c617e4c9fe566319b07b30d47dce1 * FIX: remove GetUserAgent Change-Id: I92886e1f0dcb091109231a10da8c19d51178e13b Jira: STUDIO-5205 * FIX: nozzle_diameter_map data structure adjustment Change-Id: Ifb724afc0fcf974e6d331e73ecac723107a102cf * ENH:add _A and _B for perform_with_groove Jira: STUDIO-5267 Change-Id: Iee3310dfa1cd8e6680310f0af0eff5c817490813 * ENH:is_equal for min_z and max_z Jira: STUDIO-5267 Change-Id: I9493883d8be9d44e26ddc9afe62b7e9eb09c5052 * ci: update build version to 01.08.00.59 Change-Id: Ie8ed29ccf5d6c94594eb2ab8b717416fbeace3bd * FIX:Image display unclear in light mode JIRA:5161 Change-Id: I134cc64a2af0dfff60c47d0ff09d78d9c0f86b3f * FIX:fix bugs of non manifold edge Jira: STUDIO-5267 Change-Id: I8ac9a2cf96da0bc07ee00b309e65611b92fd174d * ENH:nozzle type detection jira:[STUDIO-5246] Change-Id: Ic41a2161a0e41d23f56af93ad8ec34cc83ada0e3 * ENH: upadte P1S start gcode 1.turn on MC board fan by default on P1S jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I5b2f7868e350942fb8b7baf7d429e22a0987184a (cherry picked from commit e866a575b6b7d9552f7412f84272f4b48dfc3961) * ENH: improve support style's tooltip jira: none Change-Id: I8ee858d7052f04ce7ea6b226a500c7d1bf8a482f (cherry picked from commit 665f31c4fcde22bd894cbb4a5fb160635947f2a4) * ENH: set layer range error to warning 1. If layer range exceeds maximum/minimum layer range in printer settings,pop up a window to warn jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I0304ee790e557ecf967f355c171993d1f51b5057 * ENH: CLI: remove the warning of layer height JIRA: no jira Change-Id: Idaceee4f52611479fc3f4238d016d891b4dc8cd1 * FIX: the word search is not translated Jira: STUDIO-5224 The world search in the device panel is not translated. Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: Ia3d651c2159a3aad94e10cd0a6da98848f53ee2a (cherry picked from commit 4a46a0a4750d82d49c9523f4b668a1a00c41ed83) * FIX: Bitmap will flash when sending printing task Jira: STUDIO-5278 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: Ib0c8710b8d5d6b98fad043c950f054aa35bea965 * ENH:display the euler angle of rotation plane Jira: STUDIO-5268 Change-Id: I6b7b431931d60f1a9a832908400417781798c472 * ci: update build version to 01.08.00.60 Change-Id: I1c15b5c6437554c43327cd6b537f7a5860dba5a0 * ENH:cancel EnterReturnsTrue for imgui in cut Jira: STUDIO-5269 Change-Id: I2832e1dccaf9755448debe7b2bd56426f90dfe0d * ci: update build version to 01.08.00.61 Change-Id: Ib03e664a20990322c788686550c491d0139d8237 * FIX: some translation problems jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: If9f2af53b4f0bfa9469e84bcba68cc182df4a473 * add: Ukrainian lang support for 1.8 * fix linux * fix some string and colors * fix linux build error 2 * fix .gitignore * FIX: calibration selected preset is null in some case jira: STUDIO-5258 Change-Id: Iee63593c5f833c5a43e3b1d1c9ddb82f8c69569a * FIX: create filament issue Jira: 5296 5297 5295 5302 5311 5276 5296 create filament: list has same printer 5297 create filament: filament combobox has blank options 5298 edit filament: delete last preset prompt users 5302 create filament: filament combox has cili preset 5311 create filament: printer name too long to can not show all 5276 edit filament: PLA Aero filament type filter issue add prusa vendor Revised copy Change-Id: I5dcc615ce0951b1a9953fa12283f6090f5069045 * FIX: some translation Change-Id: Icb8614a0af18f96d15f3b97c17e0f6f708296847 * FIX:cancel is_equal for slicing function Jira: STUDIO-5267 Change-Id: I66d759aa2c968f8a28a6a5d8378929754f2db689 * FIX:UI stuck due to pop-up window with wrong chamber temperature JIRA: 5304 Change-Id: I1a49a7219b7a6f5700243704c348724e7930ce1a * FIX: allow input '+' and hide edit preset btn Change-Id: I97aec7c3ac4cc8b9d6c535f0126aaa1926553d86 * ENH: handle printer direct close and not retry Change-Id: I5dd55f8085cf6383a8420ab41e614ea6ae210c78 Jira: STUDIO-5305 * ci: update build version to 01.08.00.62 Change-Id: I09716bf79354b503197c751272fd3171e0abc8fd * add: new translation to ukr for AirFlow and Prusa * add: Texture Plate name fix * add new feature to localization .de, fix .it (#2876) * FIX:add slice_facet_for_cut_mesh api for cut tool and modify section_vertices_map 's traverse Jira: STUDIO-5267 Change-Id: Ifc4b183a4e4c4fdb4f47742f14f70a1ed93fa056 Change-Id: I52bfaef8926ef967b78a6cb712a1731a1b528a24 * FIX: Make the front smaller for Czech in device panel Jira: STUDIO-5151 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I315174b55f923da069854fb4fed8cf3937b82074 * FIX: there is no object can be jumped to in notification jira: new Change-Id: Ib81bf49236952ede24a2de126051572d63916e01 * FIX: add height range, modifier in Preview pane will crash jira: STUDIO-5340 1. fix crash at add height range, modifiers in Preview from objectList 2. fix an assert hit when slicing 3. fix an assert hit when enter AssembleView 4. forbidden popup menu by right-click objectList in Preview Change-Id: I444bc76b1a4307999b387e4f60386b2d272bd308 * FIX: Black spot in the sending printing task page Jira: STUDIO-5307 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I3bd97c063ec5f0faf7d12047da39f60ce55cae4b * FIX: reset_cut_by_contours should update_buffer_data Jira: STUDIO-5376 Change-Id: I5aacb1f7b65822031d7138abd61a45b09c743531 * ENH:editing_window_width's value is small on the laptop Jira: STUDIO-5238 STUDIO-5265 Change-Id: Ia958772bcb081817da621115f99328bb62770cd5 * ENH: bumped version to 1.8.1 Change-Id: I9d25403daa5b7b8ca415c0b364670da9e0f932b0 * FIX: create filament dialog: create btn can not show all Jira: 5310 5331 Change-Id: I185272c90d9ff1c3d6b47abbefbf488d0d965cca * FIX:update custom_texture when new_shape=false Jira: STUDIO-5287 Change-Id: I3add95f9f9345c14a48cc7467513d1b3ce95f4c9 * ENH:editing_window_width's value is small on the laptop Jira: STUDIO-5238 Change-Id: I9044129f4e0c8ca7469db05b3e547fca4754342a * FIX:add slash_to_back_slash for saving file path Jira: STUDIO-5287 Change-Id: I9f3c176cd0831c793958f08601c63efac98176a4 * FIX: a button color didn't response to dark mode change jira: STUDIO-5315 Change-Id: I95489f01ccd1f77b9e95b0d0f69e5398d2e88487 * FIX: height range layers displayed in wrong position jira: STUDIO-5341 Change-Id: I83918b4624f367efa54321f1898e1176cdb04ea9 * FIX: auto arranging issues with locked plates 1. global auto arranging may put items overlap with wipe tower if some plates are locked jira: STUDIO-5329 2. items outside bed may overlap with plate boundary if it's rotated jira: STUDIO-5329 3. plate-wise auto arranging uses wrong min_obj_distance if the plate is by-layer printing but global setting is by-object printing jira: STUDIO-5330 Change-Id: I5dba2f1317e183c9aeec1cb2bd227fbddf4316e6 (cherry picked from commit db1eac41efff5f1e8d5ac0af74c6fc7ab59fc253) * FIX: a mistake in upward machine jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ibdb26c3d904634f322aef0dc0c7b8867d9fb5854 * FIX:a blank pop-up appears JIRA:XXXX Change-Id: Ice92b55204e4897fec024a6d99412eb810bddd4a * FIX:fixed failure in updating nozzle type jira:[STUDIO-5248] Change-Id: Iad37b5d5b76d37cb1723ef21d7c39b1e3fcaf8d7 * FIX:fixed issue with AI monitoring settings jira:[STUDIO-5082] Change-Id: I967fe3c1e9da61a55bcbfaa2a8e067dd5af18f72 * FIX:fixed issue with lan mode jira:[STUDIO-5189] Change-Id: I1d0a05f19dcea154cf3ef2b61ed0546d3581905e * FIX:update text for loading or unloading filaments jira:[STUDIO-5231] Change-Id: Ic7729c3ec012485b3d87e3d01f11e87502c67895 * FIX: Revert "ENH: do not leave a gap for top... Revert "ENH: do not leave a gap for top interface if the top z distance is 0" This reverts commit 79ea32c7cbbdb7e689637980af7c36caf42284c9. Revert reason: the supports are impossible to remove in some cases. jira: STUDIO-5385 Change-Id: I376a6f4dfd78da6dfea68b9ac3d552cddd0b4272 (cherry picked from commit 34e38b705fde7f5d7f9a3a89c96a3627ce0c998e) * ENH: improve normal support's quality 1. Add a base_interface_layer when using Supp.W 2. Fix a bug where base_angle and interface_angle are wong jira: STUDIO-5386 Change-Id: I52ab32c63b3cd1e6e2ba6463b01ae26699cf13d3 (cherry picked from commit 92ddd4a10b793572a1fa009da5b9e44fcdf81de2) * NEW:tracking stl model files jira:[STUDIO-5372] Change-Id: Idb1275b07441f0cd06c24588d5f7c20f81f1556c * FIX: edit filament dialog: preset name too long to del btn nan't show Jira: 5336 5174 and verify string normalization Change-Id: I380c3bed2bf43d01094b68979a8b67f4187c0b93 * FIX: some translation Jira: 5232 5300 5334 Change-Id: Ie474ca823011e81aab82a9809af3d6e42980496b * FIX: some translation Change-Id: Iaabe6087bed3b7d47d911cf4fb51c770804e72fb * ENH: change default tree_support_wall_count to 0 Now normal support also uses this option, so we can't default it to 1, otherwise normal supports will be too hard to remove. jira: none Change-Id: Ic5700af5c17e3a7b265c8915f28b0db35c6e06e6 (cherry picked from commit 6b84a9826da108b76569e686bd9def0b23ae29fd) * FIX:The name of the material in the error prompt is empty JIRA:STUDIO-4907 Change-Id: I3cf44f099256a51f21a44a89c89c000f734d1f36 * ci: update build version to 01.08.01.51 Change-Id: Ib20f5a12b65472102befec0a2adf82744fc29c46 * FIX: imgui textinput cannot paste on macos jira: STUDIO-5070、STUDIO-5365 Change-Id: Iea8f41e12744ecda0fbb95c1a8f2e014a7cdc384 * FIX: not cache printer file list on error Change-Id: I99843aedbf14d3d1d553ccac9b0bd26403274a82 Jira: none * FIX: thread of close BBLUserPresetExceedLimit notify Change-Id: I9698134ba1cc91fc83eac441f900d68c4c4b556a * ENH: Resolve non manifold edges by fixing model interfaces Jira: STUDIO-5124 Change-Id: I7ea86be44acb80b6c4762a76208b4a031acd0b27 * FIX:nozzle type sync jira:[STUDIO-5248] Change-Id: I63d48628832473d8d371ed643dc8528b00382531 * FIX: array bound happen in TriangleSelector::deserialize Jira: STUDIO-5170 Change-Id: I92b72a887845b462fad208f13607293b44d3d333 * FIX:cropping rendering without considering assembly views Jira: STUDIO-5260 Change-Id: Ia56cf80b305ae05f25f06ec277f85b3c5430a6df * FIX: PA for custom filament not available in BL Studio github: 2971 Change-Id: I6ccd36a183e7367d69557300f7242f5403f4bb33 * FIX: Bitmap is way too small on Mac Jira: STUDIO-5393 Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Change-Id: I6b550669fa8cd5fc9bfa6ed96d64d19a949f01b2 * FIX: move shutdown wait to OnExit Change-Id: I70d9a2bb686525ae5273aa9d63e25691da4ab65c Jira: STUDIO-2884 * FIX: calibration manage result dialog issue on macos jira: STUDIO-4949 STUDIO-5378 Change-Id: I00abefd45a0d274a4b68bb1ab18debe8f91d169e * FIX: adjust bed shape dialog button UI style fix that button text is hard to see in dark mode jira: STUDIO-5247 Change-Id: I2cf5b3cdd2eff9b821bdf5525bec4f329fc58dd1 * FIX: 5331 rescale btn Jira: STUDIO-5331 Change-Id: If153424b8480e64b166018e3cd98c17db557d0a8 Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> * FIX: support do not generate jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Ide9709d95203185538e280517f7aa6136beeda44 * FIX: remove not match printer config ota cache Change-Id: Ib73fc2ea31fa2186061cfcb5a170bc59b9db84ca Jira: none * FIX:cancel the variable of "checkbox_size" as a fixed value Jira: STUDIO-5150 Change-Id: I30d876d141b8b35ab4a3fee4889993d87b7c1741 * ENH:add reset_cut_by_contours in on_load function Jira:STUDIO-5269 m_connector_size_tolerance default value is 0.1f Change-Id: I6c67fff3cb0c1190e9141ed6f68fbfa848679f35 * ENH:cancel EnterReturnsTrue for imgui in cut Jira: STUDIO-5269 Change-Id: Ifc4b183a4e4c4fdb4f47742f14f70a1ed93fa056 Signed-off-by: zhou.xu <zhou.xu@bambulab.com> * FIX: dailytips should not change content frequently when slicing all jira: STUDIO-5234 Change-Id: Icb7e9c28404d9db8ebed58d937e13f89c5403b5c * FIX: objectList clone shortcut key issue jira: new Change-Id: Ia75bf58a7d53f962e1af6c2fd97497270b7eea84 * ENH:handling cases without msgs jira:[STUDIO-5401 STUDIO-5399] Change-Id: Iae651d5a19a45b0138a6aa621326a8b4a9649824 * ENH: optimize param description jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: Id0ca9224227a716b21fc0b8430722264dc319344 * ENH: add translation jira:[NEW] Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Change-Id: I3b1f04fee3cd6322793794ad8b8707859f6c7d26 * FIX: close edit preset paramsDialog, mac unresponsive Jira: 5298 Change-Id: I021e00567354cfb1f2f5f1f2bf6ba1fc35b164c5 * ENH:disable AI monitoring on the p1p series Change-Id: I514bb1fb1ced6c03dd619230a9adac3be63f2de2 * ci: update build version to 01.08.01.52 Change-Id: I9f5e30d3fc4b7ef9321c522d3c18fce98f03742f * FIX: close edit preset paramsDialog, mac unresponsive Change-Id: Ic816754a20b7f6a5cdb46475750eb301fec3ad3a * FIX: organic support not work with raft only There is no raft generated when only raft enabled but no support needed. jira: none Change-Id: Ic0c9269e2f98038d85c9bc54e4a85f892dc5d764 * FIX: CLI: add object config when assemble JIRA: no jira Change-Id: I945f820fb58f2f643170b4b0b66742f6bbbdfd29 * FIX: delete preset prompt Jira: XXXX Change-Id: I6511c806c56393d4f6bd72d1c506da59675d49ff * FIX:Reorganize the assignment of variables of "m_editing_window_width" Jira: STUDIO-5238 Change-Id: If369916f3f5c21510f5f297bfd05c1230bdda7a4 * ENH: CLI: re-compute flush_volumes_matrix when it is missed Change-Id: Ie8f53c6bef003b1434de02ea14de5787b376484f * FIX: some translation for delete filament Change-Id: Ib46a8eba33f2e21016476aaab4a57a740e86b1b8 * FIX: scrolled window / del preset / edit filament issue Jira: 5092 GitHub: 1936 edit filament: just one preset, the scroll bar obscures the preset name edit filament: delete selected preset, click no, but preset be deleted from UI edit filament: serial sometimes displays incorrectly Change-Id: Ibc91609e252179de0c05ca065099756da6631165 * ci: update build version to 01.08.01.53 Change-Id: I5563a2c0812ab9a0d7727df27e17e681066ffa08 --------- Signed-off-by: maosheng.wei <maosheng.wei@bambulab.com> Signed-off-by: xun.zhang <xun.zhang@bambulab.com> Signed-off-by: Kunlong Ma <kunlong.ma@bambulab.com> Signed-off-by: wenjie.guo <wenjie.guo@bambulab.com> Signed-off-by: qing.zhang <qing.zhang@bambulab.com> Signed-off-by: Stone Li <stone.li@bambulab.com> Signed-off-by: zhou.xu <zhou.xu@bambulab.com> Co-authored-by: zorro.zhang <zorro.zhang@bambulab.com> Co-authored-by: liz.li <liz.li@bambulab.com> Co-authored-by: maosheng.wei <maosheng.wei@bambulab.com> Co-authored-by: chunmao.guo <chunmao.guo@bambulab.com> Co-authored-by: tao wang <tao.wang@bambulab.com> Co-authored-by: Arthur <arthur.tang@bambulab.com> Co-authored-by: lane.wei <lane.wei@bambulab.com> Co-authored-by: gerrit <gerrit@bambulab.com> Co-authored-by: xun.zhang <xun.zhang@bambulab.com> Co-authored-by: zhou.xu <zhou.xu@bambulab.com> Co-authored-by: hu.wang <hu.wang@bambulab.com> Co-authored-by: Kunlong Ma <kunlong.ma@bambulab.com> Co-authored-by: wenjie.guo <wenjie.guo@bambulab.com> Co-authored-by: qing.zhang <qing.zhang@bambulab.com> Co-authored-by: zhimin.zeng <zhimin.zeng@bambulab.com> Co-authored-by: the Raz <rasmus@abc.se> Co-authored-by: Andy <andylg@yandex.ru> Co-authored-by: Stone Li <stone.li@bambulab.com> Co-authored-by: enricoturri1966 <enricoturri@seznam.cz> Co-authored-by: Dmytro Chystiakov <dlchistyakov@gmail.com> Co-authored-by: Heiko Liebscher <hliebscher@idn.de>
1607 lines
66 KiB
C++
1607 lines
66 KiB
C++
#include "PresetUpdater.hpp"
|
|
|
|
#include <algorithm>
|
|
#include <thread>
|
|
#include <unordered_map>
|
|
#include <ostream>
|
|
#include <utility>
|
|
#include <stdexcept>
|
|
#include <boost/format.hpp>
|
|
#include <boost/algorithm/string.hpp>
|
|
#include <boost/filesystem.hpp>
|
|
#include <boost/filesystem/string_file.hpp>
|
|
#include <boost/filesystem/fstream.hpp>
|
|
#include <boost/lexical_cast.hpp>
|
|
#include <boost/log/trivial.hpp>
|
|
|
|
#include <wx/app.h>
|
|
#include <wx/msgdlg.h>
|
|
|
|
#include "libslic3r/libslic3r.h"
|
|
#include "libslic3r/format.hpp"
|
|
#include "libslic3r/Utils.hpp"
|
|
#include "libslic3r/PresetBundle.hpp"
|
|
#include "slic3r/GUI/GUI.hpp"
|
|
#include "slic3r/GUI/GUI_App.hpp"
|
|
#include "slic3r/GUI/I18N.hpp"
|
|
#include "slic3r/GUI/UpdateDialogs.hpp"
|
|
#include "slic3r/GUI/ConfigWizard.hpp"
|
|
#include "slic3r/GUI/GUI_App.hpp"
|
|
#include "slic3r/GUI/Plater.hpp"
|
|
#include "slic3r/GUI/format.hpp"
|
|
#include "slic3r/GUI/NotificationManager.hpp"
|
|
#include "slic3r/Utils/Http.hpp"
|
|
#include "slic3r/Config/Version.hpp"
|
|
#include "slic3r/Config/Snapshot.hpp"
|
|
#include "slic3r/GUI/MarkdownTip.hpp"
|
|
#include "libslic3r/miniz_extension.hpp"
|
|
#include "slic3r/GUI/GUI_Utils.hpp"
|
|
|
|
namespace fs = boost::filesystem;
|
|
using Slic3r::GUI::Config::Index;
|
|
using Slic3r::GUI::Config::Version;
|
|
using Slic3r::GUI::Config::Snapshot;
|
|
using Slic3r::GUI::Config::SnapshotDB;
|
|
|
|
|
|
// FIXME: Incompat bundle resolution doesn't deal with inherited user presets
|
|
|
|
namespace Slic3r {
|
|
|
|
|
|
static const char *INDEX_FILENAME = "index.idx";
|
|
static const char *TMP_EXTENSION = ".data";
|
|
|
|
|
|
void copy_file_fix(const fs::path &source, const fs::path &target)
|
|
{
|
|
BOOST_LOG_TRIVIAL(debug) << format("PresetUpdater: Copying %1% -> %2%", source, target);
|
|
std::string error_message;
|
|
//CopyFileResult cfr = Slic3r::GUI::copy_file_gui(source.string(), target.string(), error_message, false);
|
|
CopyFileResult cfr = copy_file(source.string(), target.string(), error_message, false);
|
|
if (cfr != CopyFileResult::SUCCESS) {
|
|
BOOST_LOG_TRIVIAL(error) << "Copying failed(" << cfr << "): " << error_message;
|
|
throw Slic3r::CriticalException(GUI::format(
|
|
_L("Copying of file %1% to %2% failed: %3%"),
|
|
source, target, error_message));
|
|
}
|
|
// Permissions should be copied from the source file by copy_file(). We are not sure about the source
|
|
// permissions, let's rewrite them with 644.
|
|
static constexpr const auto perms = fs::owner_read | fs::owner_write | fs::group_read | fs::others_read;
|
|
fs::permissions(target, perms);
|
|
}
|
|
|
|
struct Update
|
|
{
|
|
fs::path source;
|
|
fs::path target;
|
|
|
|
Version version;
|
|
std::string vendor;
|
|
//BBS: use changelog string instead of url
|
|
std::string change_log;
|
|
std::string descriptions;
|
|
|
|
bool forced_update;
|
|
//BBS: add directory support
|
|
bool is_directory {false};
|
|
|
|
Update() {}
|
|
//BBS: add directory support
|
|
//BBS: use changelog string instead of url
|
|
Update(fs::path &&source, fs::path &&target, const Version &version, std::string vendor, std::string changelog, std::string description, bool forced = false, bool is_dir = false)
|
|
: source(std::move(source))
|
|
, target(std::move(target))
|
|
, version(version)
|
|
, vendor(std::move(vendor))
|
|
, change_log(std::move(changelog))
|
|
, descriptions(std::move(description))
|
|
, forced_update(forced)
|
|
, is_directory(is_dir)
|
|
{}
|
|
|
|
//BBS: add directory support
|
|
void install() const
|
|
{
|
|
if (is_directory) {
|
|
copy_directory_recursively(source, target);
|
|
}
|
|
else {
|
|
copy_file_fix(source, target);
|
|
}
|
|
}
|
|
|
|
friend std::ostream& operator<<(std::ostream& os, const Update &self)
|
|
{
|
|
os << "Update(" << self.source.string() << " -> " << self.target.string() << ')';
|
|
return os;
|
|
}
|
|
};
|
|
|
|
struct Incompat
|
|
{
|
|
fs::path bundle;
|
|
Version version;
|
|
std::string vendor;
|
|
//BBS: add directory support
|
|
bool is_directory {false};
|
|
|
|
Incompat(fs::path &&bundle, const Version &version, std::string vendor, bool is_dir = false)
|
|
: bundle(std::move(bundle))
|
|
, version(version)
|
|
, vendor(std::move(vendor))
|
|
, is_directory(is_dir)
|
|
{}
|
|
|
|
void remove() {
|
|
// Remove the bundle file
|
|
if (is_directory) {
|
|
if (fs::exists(bundle))
|
|
fs::remove_all(bundle);
|
|
}
|
|
else {
|
|
if (fs::exists(bundle))
|
|
fs::remove(bundle);
|
|
}
|
|
}
|
|
|
|
friend std::ostream& operator<<(std::ostream& os , const Incompat &self) {
|
|
os << "Incompat(" << self.bundle.string() << ')';
|
|
return os;
|
|
}
|
|
};
|
|
|
|
struct Updates
|
|
{
|
|
std::vector<Incompat> incompats;
|
|
std::vector<Update> updates;
|
|
};
|
|
|
|
|
|
wxDEFINE_EVENT(EVT_SLIC3R_VERSION_ONLINE, wxCommandEvent);
|
|
wxDEFINE_EVENT(EVT_SLIC3R_EXPERIMENTAL_VERSION_ONLINE, wxCommandEvent);
|
|
|
|
|
|
struct PresetUpdater::priv
|
|
{
|
|
std::vector<Index> index_db;
|
|
|
|
bool enabled_version_check;
|
|
bool enabled_config_update;
|
|
std::string version_check_url;
|
|
|
|
fs::path cache_path;
|
|
fs::path rsrc_path;
|
|
fs::path vendor_path;
|
|
|
|
bool cancel;
|
|
std::thread thread;
|
|
|
|
bool has_waiting_updates { false };
|
|
Updates waiting_updates;
|
|
bool has_waiting_printer_updates { false };
|
|
Updates waiting_printer_updates;
|
|
|
|
struct Resource
|
|
{
|
|
std::string version;
|
|
std::string description;
|
|
std::string url;
|
|
std::string cache_root;
|
|
std::vector<std::string> sub_caches;
|
|
};
|
|
|
|
priv();
|
|
|
|
void set_download_prefs(AppConfig *app_config);
|
|
bool get_file(const std::string &url, const fs::path &target_path) const;
|
|
//BBS: refine preset update logic
|
|
bool extract_file(const fs::path &source_path, const fs::path &dest_path = {});
|
|
void prune_tmps() const;
|
|
void sync_version() const;
|
|
void parse_version_string(const std::string& body) const;
|
|
void sync_resources(std::string http_url, std::map<std::string, Resource> &resources, bool check_patch = false, std::string current_version="", std::string changelog_file="");
|
|
void sync_config(std::string http_url, const VendorMap vendors);
|
|
void sync_tooltip(std::string http_url, std::string language);
|
|
void sync_plugins(std::string http_url, std::string plugin_version);
|
|
void sync_printer_config(std::string http_url);
|
|
bool get_cached_plugins_version(std::string &cached_version);
|
|
|
|
//BBS: refine preset update logic
|
|
bool install_bundles_rsrc(std::vector<std::string> bundles, bool snapshot) const;
|
|
void check_installed_vendor_profiles() const;
|
|
Updates get_printer_config_updates(bool update = false) const;
|
|
Updates get_config_updates(const Semver& old_slic3r_version) const;
|
|
bool perform_updates(Updates &&updates, bool snapshot = true) const;
|
|
void set_waiting_updates(Updates u);
|
|
};
|
|
|
|
//BBS: change directories by design
|
|
PresetUpdater::priv::priv()
|
|
: cache_path(fs::path(Slic3r::data_dir()) / "ota")
|
|
, rsrc_path(fs::path(resources_dir()) / "profiles")
|
|
, vendor_path(fs::path(Slic3r::data_dir()) / PRESET_SYSTEM_DIR)
|
|
, cancel(false)
|
|
{
|
|
//BBS: refine preset updater logic
|
|
enabled_version_check = true;
|
|
set_download_prefs(GUI::wxGetApp().app_config);
|
|
// Install indicies from resources. Only installs those that are either missing or older than in resources.
|
|
check_installed_vendor_profiles();
|
|
perform_updates(get_printer_config_updates(), false);
|
|
// Load indices from the cache directory.
|
|
//index_db = Index::load_db();
|
|
}
|
|
|
|
// Pull relevant preferences from AppConfig
|
|
void PresetUpdater::priv::set_download_prefs(AppConfig *app_config)
|
|
{
|
|
version_check_url = app_config->version_check_url();
|
|
//TODO: for debug currently
|
|
if (version_check_url.empty())
|
|
enabled_config_update = true;
|
|
else
|
|
enabled_config_update = false;
|
|
}
|
|
|
|
//BBS: refine the Preset Updater logic
|
|
// Downloads a file (http get operation). Cancels if the Updater is being destroyed.
|
|
bool PresetUpdater::priv::get_file(const std::string &url, const fs::path &target_path) const
|
|
{
|
|
bool res = false;
|
|
fs::path tmp_path = target_path;
|
|
tmp_path += format(".%1%%2%", get_current_pid(), TMP_EXTENSION);
|
|
|
|
BOOST_LOG_TRIVIAL(info) << format("[BBS Updater]download file `%1%`, stored to `%2%`, tmp path `%3%`",
|
|
url,
|
|
target_path.string(),
|
|
tmp_path.string());
|
|
|
|
Slic3r::Http::get(url)
|
|
.on_progress([this](Slic3r::Http::Progress, bool &cancel_http) {
|
|
if (cancel) {
|
|
cancel_http = true;
|
|
}
|
|
})
|
|
.on_error([&](std::string body, std::string error, unsigned http_status) {
|
|
(void)body;
|
|
BOOST_LOG_TRIVIAL(error) << format("[BBS Updater]getting: `%1%`: http status %2%, %3%",
|
|
url,
|
|
http_status,
|
|
error);
|
|
})
|
|
.on_complete([&](std::string body, unsigned /* http_status */) {
|
|
fs::fstream file(tmp_path, std::ios::out | std::ios::binary | std::ios::trunc);
|
|
file.write(body.c_str(), body.size());
|
|
file.close();
|
|
fs::rename(tmp_path, target_path);
|
|
res = true;
|
|
})
|
|
.perform_sync();
|
|
|
|
return res;
|
|
}
|
|
|
|
//BBS: refine preset update logic
|
|
bool PresetUpdater::priv::extract_file(const fs::path &source_path, const fs::path &dest_path)
|
|
{
|
|
bool res = true;
|
|
std::string file_path = source_path.string();
|
|
std::string parent_path = (!dest_path.empty() ? dest_path : source_path.parent_path()).string();
|
|
mz_zip_archive archive;
|
|
mz_zip_zero_struct(&archive);
|
|
|
|
if (!open_zip_reader(&archive, file_path))
|
|
{
|
|
BOOST_LOG_TRIVIAL(error) << "Unable to open zip reader for "<<file_path;
|
|
return false;
|
|
}
|
|
|
|
mz_uint num_entries = mz_zip_reader_get_num_files(&archive);
|
|
|
|
mz_zip_archive_file_stat stat;
|
|
// we first loop the entries to read from the archive the .amf file only, in order to extract the version from it
|
|
for (mz_uint i = 0; i < num_entries; ++i)
|
|
{
|
|
if (mz_zip_reader_file_stat(&archive, i, &stat))
|
|
{
|
|
std::string dest_file = parent_path+"/"+stat.m_filename;
|
|
if (stat.m_is_directory) {
|
|
fs::path dest_path(dest_file);
|
|
if (!fs::exists(dest_path))
|
|
fs::create_directories(dest_path);
|
|
continue;
|
|
}
|
|
else if (stat.m_uncomp_size == 0) {
|
|
BOOST_LOG_TRIVIAL(warning) << "[BBL Updater]Unzip: invalid size for file "<<stat.m_filename;
|
|
continue;
|
|
}
|
|
try
|
|
{
|
|
res = mz_zip_reader_extract_to_file(&archive, stat.m_file_index, dest_file.c_str(), 0);
|
|
if (!res) {
|
|
BOOST_LOG_TRIVIAL(error) << "[BBL Updater]extract file "<<stat.m_filename<<" to dest "<<dest_file<<" failed";
|
|
close_zip_reader(&archive);
|
|
return res;
|
|
}
|
|
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]successfully extract file " << stat.m_file_index << " to "<<dest_file;
|
|
}
|
|
catch (const std::exception& e)
|
|
{
|
|
// ensure the zip archive is closed and rethrow the exception
|
|
close_zip_reader(&archive);
|
|
BOOST_LOG_TRIVIAL(error) << "[BBL Updater]Archive read exception:"<<e.what();
|
|
return false;
|
|
}
|
|
}
|
|
else {
|
|
BOOST_LOG_TRIVIAL(warning) << "[BBL Updater]Unzip: read file stat failed";
|
|
}
|
|
}
|
|
close_zip_reader(&archive);
|
|
|
|
return true;
|
|
}
|
|
|
|
// Remove leftover paritally downloaded files, if any.
|
|
void PresetUpdater::priv::prune_tmps() const
|
|
{
|
|
for (auto &dir_entry : boost::filesystem::directory_iterator(cache_path))
|
|
if (is_plain_file(dir_entry) && dir_entry.path().extension() == TMP_EXTENSION) {
|
|
BOOST_LOG_TRIVIAL(debug) << "[BBL Updater]remove old cached files: " << dir_entry.path().string();
|
|
fs::remove(dir_entry.path());
|
|
}
|
|
}
|
|
|
|
//BBS: refine the Preset Updater logic
|
|
// Get Slic3rPE version available online, save in AppConfig.
|
|
void PresetUpdater::priv::sync_version() const
|
|
{
|
|
if (! enabled_version_check) { return; }
|
|
|
|
#if 0
|
|
Http::get(version_check_url)
|
|
.size_limit(SLIC3R_VERSION_BODY_MAX)
|
|
.on_progress([this](Http::Progress, bool &cancel) {
|
|
cancel = this->cancel;
|
|
})
|
|
.on_error([&](std::string body, std::string error, unsigned http_status) {
|
|
(void)body;
|
|
BOOST_LOG_TRIVIAL(error) << format("Error getting: `%1%`: HTTP %2%, %3%",
|
|
version_check_url,
|
|
http_status,
|
|
error);
|
|
})
|
|
.on_complete([&](std::string body, unsigned /* http_status */) {
|
|
boost::trim(body);
|
|
parse_version_string(body);
|
|
})
|
|
.perform_sync();
|
|
#endif
|
|
}
|
|
|
|
// Parses version string obtained in sync_version() and sends events to UI thread.
|
|
// Version string must contain release version on first line. Follows non-mandatory alpha / beta releases on following lines (alpha=2.0.0-alpha1).
|
|
void PresetUpdater::priv::parse_version_string(const std::string& body) const
|
|
{
|
|
#if 0
|
|
// release version
|
|
std::string version;
|
|
const auto first_nl_pos = body.find_first_of("\n\r");
|
|
if (first_nl_pos != std::string::npos)
|
|
version = body.substr(0, first_nl_pos);
|
|
else
|
|
version = body;
|
|
boost::optional<Semver> release_version = Semver::parse(version);
|
|
if (!release_version) {
|
|
BOOST_LOG_TRIVIAL(error) << format("Received invalid contents from `%1%`: Not a correct semver: `%2%`", SLIC3R_APP_NAME, version);
|
|
return;
|
|
}
|
|
BOOST_LOG_TRIVIAL(info) << format("Got %1% online version: `%2%`. Sending to GUI thread...", SLIC3R_APP_NAME, version);
|
|
wxCommandEvent* evt = new wxCommandEvent(EVT_SLIC3R_VERSION_ONLINE);
|
|
evt->SetString(GUI::from_u8(version));
|
|
GUI::wxGetApp().QueueEvent(evt);
|
|
|
|
// alpha / beta version
|
|
std::vector<std::string> prerelease_versions;
|
|
size_t nexn_nl_pos = first_nl_pos;
|
|
while (nexn_nl_pos != std::string::npos && body.size() > nexn_nl_pos + 1) {
|
|
const auto last_nl_pos = nexn_nl_pos;
|
|
nexn_nl_pos = body.find_first_of("\n\r", last_nl_pos + 1);
|
|
std::string line;
|
|
if (nexn_nl_pos == std::string::npos)
|
|
line = body.substr(last_nl_pos + 1);
|
|
else
|
|
line = body.substr(last_nl_pos + 1, nexn_nl_pos - last_nl_pos - 1);
|
|
|
|
// alpha
|
|
if (line.substr(0, 6) == "alpha=") {
|
|
version = line.substr(6);
|
|
if (!Semver::parse(version)) {
|
|
BOOST_LOG_TRIVIAL(error) << format("Received invalid contents for alpha release from `%1%`: Not a correct semver: `%2%`", SLIC3R_APP_NAME, version);
|
|
return;
|
|
}
|
|
prerelease_versions.emplace_back(version);
|
|
// beta
|
|
}
|
|
else if (line.substr(0, 5) == "beta=") {
|
|
version = line.substr(5);
|
|
if (!Semver::parse(version)) {
|
|
BOOST_LOG_TRIVIAL(error) << format("Received invalid contents for beta release from `%1%`: Not a correct semver: `%2%`", SLIC3R_APP_NAME, version);
|
|
return;
|
|
}
|
|
prerelease_versions.emplace_back(version);
|
|
}
|
|
}
|
|
// find recent version that is newer than last full release.
|
|
boost::optional<Semver> recent_version;
|
|
for (const std::string& ver_string : prerelease_versions) {
|
|
boost::optional<Semver> ver = Semver::parse(ver_string);
|
|
if (ver && *release_version < *ver && ((recent_version && *recent_version < *ver) || !recent_version)) {
|
|
recent_version = ver;
|
|
version = ver_string;
|
|
}
|
|
}
|
|
if (recent_version) {
|
|
BOOST_LOG_TRIVIAL(info) << format("Got %1% online version: `%2%`. Sending to GUI thread...", SLIC3R_APP_NAME, version);
|
|
wxCommandEvent* evt = new wxCommandEvent(EVT_SLIC3R_EXPERIMENTAL_VERSION_ONLINE);
|
|
evt->SetString(GUI::from_u8(version));
|
|
GUI::wxGetApp().QueueEvent(evt);
|
|
}
|
|
#endif
|
|
return;
|
|
}
|
|
|
|
//BBS: refine the Preset Updater logic
|
|
// Download vendor indices. Also download new bundles if an index indicates there's a new one available.
|
|
// Both are saved in cache.
|
|
void PresetUpdater::priv::sync_resources(std::string http_url, std::map<std::string, Resource> &resources, bool check_patch, std::string current_version_str, std::string changelog_file)
|
|
{
|
|
std::map<std::string, Resource> resource_list;
|
|
|
|
BOOST_LOG_TRIVIAL(info) << boost::format("[BBL Updater]: sync_resources get preferred setting version for app version %1%, url: %2%, current_version_str %3%, check_patch %4%")%SLIC3R_APP_NAME%http_url%current_version_str%check_patch;
|
|
|
|
std::string query_params = "?";
|
|
bool first = true;
|
|
for (auto resource_it : resources) {
|
|
if (cancel) { return; }
|
|
auto resource_name = resource_it.first;
|
|
boost::to_lower(resource_name);
|
|
std::string query_resource = (boost::format("%1%=%2%")
|
|
% resource_name % resource_it.second.version).str();
|
|
if (!first) query_params += "&";
|
|
query_params += query_resource;
|
|
first = false;
|
|
}
|
|
|
|
std::string url = http_url;
|
|
url += query_params;
|
|
Slic3r::Http http = Slic3r::Http::get(url);
|
|
BOOST_LOG_TRIVIAL(info) << boost::format("[BBL Updater]: sync_resources request_url: %1%")%url;
|
|
http.on_progress([this](Slic3r::Http::Progress, bool &cancel_http) {
|
|
if (cancel) {
|
|
cancel_http = true;
|
|
}
|
|
})
|
|
.on_complete([this, &resource_list, resources](std::string body, unsigned) {
|
|
try {
|
|
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]: request_resources, body=" << body;
|
|
|
|
json j = json::parse(body);
|
|
std::string message = j["message"].get<std::string>();
|
|
|
|
if (message == "success") {
|
|
json resource = j.at("resources");
|
|
if (resource.is_array()) {
|
|
for (auto iter = resource.begin(); iter != resource.end(); iter++) {
|
|
std::string version;
|
|
std::string url;
|
|
std::string resource;
|
|
std::string description;
|
|
for (auto sub_iter = iter.value().begin(); sub_iter != iter.value().end(); sub_iter++) {
|
|
if (boost::iequals(sub_iter.key(), "type")) {
|
|
resource = sub_iter.value();
|
|
BOOST_LOG_TRIVIAL(trace) << "[BBL Updater]: get version of settings's type, " << sub_iter.value();
|
|
} else if (boost::iequals(sub_iter.key(), "version")) {
|
|
version = sub_iter.value();
|
|
} else if (boost::iequals(sub_iter.key(), "description")) {
|
|
description = sub_iter.value();
|
|
} else if (boost::iequals(sub_iter.key(), "url")) {
|
|
url = sub_iter.value();
|
|
}
|
|
}
|
|
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]: get type " << resource << ", version " << version << ", url " << url;
|
|
|
|
resource_list.emplace(resource, Resource{version, description, url});
|
|
}
|
|
}
|
|
} else {
|
|
BOOST_LOG_TRIVIAL(error) << "[BBL Updater]: get version of settings failed, body=" << body;
|
|
}
|
|
} catch (std::exception &e) {
|
|
BOOST_LOG_TRIVIAL(error) << (boost::format("[BBL Updater]: get version of settings failed, exception=%1% body=%2%") % e.what() % body).str();
|
|
} catch (...) {
|
|
BOOST_LOG_TRIVIAL(error) << "[BBL Updater]: get version of settings failed, body=" << body;
|
|
}
|
|
})
|
|
.on_error([&](std::string body, std::string error, unsigned status) {
|
|
BOOST_LOG_TRIVIAL(error) << boost::format("[BBL Updater]: status=%1%, error=%2%, body=%3%") % status % error % body;
|
|
})
|
|
.perform_sync();
|
|
|
|
for (auto & resource_it : resources) {
|
|
if (cancel) { return; }
|
|
|
|
auto resource = resource_it.second;
|
|
std::string resource_name = resource_it.first;
|
|
boost::to_lower(resource_name);
|
|
auto resource_update = resource_list.find(resource_name);
|
|
if (resource_update == resource_list.end()) {
|
|
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]Vendor " << resource_name << " can not get setting versions online";
|
|
continue;
|
|
}
|
|
Semver online_version = resource_update->second.version;
|
|
// Semver current_version = get_version_from_json(vendor_root_config.string());
|
|
Semver current_version = current_version_str.empty()?resource.version:current_version_str;
|
|
bool version_match = ((online_version.maj() == current_version.maj()) && (online_version.min() == current_version.min()));
|
|
if (version_match && check_patch) {
|
|
int online_cc_patch = online_version.patch()/100;
|
|
int current_cc_patch = current_version.patch()/100;
|
|
if (online_cc_patch != current_cc_patch) {
|
|
version_match = false;
|
|
BOOST_LOG_TRIVIAL(warning) << boost::format("[BBL Updater]: online patch CC not match: online_cc_patch=%1%, current_cc_patch=%2%") % online_cc_patch % current_cc_patch;
|
|
}
|
|
}
|
|
if (version_match && (current_version < online_version)) {
|
|
if (cancel) { return; }
|
|
|
|
// need to download the online files
|
|
fs::path cache_path(resource.cache_root);
|
|
std::string online_url = resource_update->second.url;
|
|
std::string cache_file_path = (fs::temp_directory_path() / (fs::unique_path().string() + TMP_EXTENSION)).string();
|
|
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]Downloading resource: " << resource_name << ", version " << online_version.to_string();
|
|
if (!get_file(online_url, cache_file_path)) {
|
|
BOOST_LOG_TRIVIAL(warning) << "[BBL Updater]download resource " << resource_name << " failed, url: " << online_url;
|
|
continue;
|
|
}
|
|
if (cancel) { return; }
|
|
|
|
// remove previous files before
|
|
if (resource.sub_caches.empty()) {
|
|
if (fs::exists(cache_path)) {
|
|
fs::remove_all(cache_path);
|
|
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]remove cache path " << cache_path.string();
|
|
}
|
|
} else {
|
|
for (auto sub : resource.sub_caches) {
|
|
if (fs::exists(cache_path / sub)) {
|
|
fs::remove_all(cache_path / sub);
|
|
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]remove cache path " << (cache_path / sub).string();
|
|
}
|
|
}
|
|
}
|
|
// extract the file downloaded
|
|
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]start to unzip the downloaded file " << cache_file_path << " to "<<cache_path;
|
|
fs::create_directories(cache_path);
|
|
if (!extract_file(cache_file_path, cache_path)) {
|
|
BOOST_LOG_TRIVIAL(warning) << "[BBL Updater]extract resource " << resource_it.first << " failed, path: " << cache_file_path;
|
|
continue;
|
|
}
|
|
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]finished unzip the downloaded file " << cache_file_path;
|
|
|
|
// save the description to disk
|
|
if (changelog_file.empty())
|
|
changelog_file = (cache_path / "changelog.json").string();
|
|
else
|
|
changelog_file = (cache_path / changelog_file).string();
|
|
|
|
try {
|
|
json j;
|
|
//record the headers
|
|
j["version"] = resource_update->second.version;
|
|
j["description"] = resource_update->second.description;
|
|
|
|
boost::nowide::ofstream c;
|
|
c.open(changelog_file, std::ios::out | std::ios::trunc);
|
|
c << std::setw(4) << j << std::endl;
|
|
c.close();
|
|
}
|
|
catch(std::exception &err) {
|
|
BOOST_LOG_TRIVIAL(error) << __FUNCTION__<< ": save to "<<changelog_file<<" got a generic exception, reason = " << err.what();
|
|
}
|
|
|
|
resource_it.second = resource_update->second;
|
|
}
|
|
else {
|
|
BOOST_LOG_TRIVIAL(warning) << boost::format("[BBL Updater]: online version=%1%, current_version=%2%, no need to download") % online_version.to_string() % current_version.to_string();
|
|
}
|
|
}
|
|
}
|
|
|
|
//BBS: refine the Preset Updater logic
|
|
// Download vendor indices. Also download new bundles if an index indicates there's a new one available.
|
|
// Both are saved in cache.
|
|
void PresetUpdater::priv::sync_config(std::string http_url, const VendorMap vendors)
|
|
{
|
|
std::map<std::string, std::pair<Semver, std::string>> vendor_list;
|
|
std::map<std::string, std::string> vendor_descriptions;
|
|
|
|
BOOST_LOG_TRIVIAL(info) << boost::format("[BBL Updater]: sync_config Syncing configuration enter");
|
|
|
|
if (!enabled_config_update) { return; }
|
|
|
|
BOOST_LOG_TRIVIAL(info) << boost::format("[BBL Updater]: sync_config get preferred setting version for app version %1%, http_url: %2%")%SLIC3R_VERSION%http_url;
|
|
|
|
std::string app_version = SLIC3R_VERSION;
|
|
std::string query_version = app_version.substr(0, 6) + "00.00";
|
|
std::string query_params = "?";
|
|
std::string vendor_string = PresetBundle::BBL_BUNDLE;
|
|
boost::to_lower(vendor_string);
|
|
std::string query_vendor = (boost::format("slicer/settings/%1%=%2%")%vendor_string % query_version ).str();
|
|
query_params += query_vendor;
|
|
/*bool first = true;
|
|
for (auto vendor_it :vendors) {
|
|
if (cancel) { return; }
|
|
|
|
const VendorProfile& vendor_profile = vendor_it.second;
|
|
std::string vendor_name = vendor_profile.id;
|
|
boost::to_lower(vendor_name);
|
|
|
|
std::string query_vendor = (boost::format("slicer/settings/%1%=%2%")
|
|
% vendor_name
|
|
% GUI::VersionInfo::convert_full_version(SLIC3R_VERSION)
|
|
).str();
|
|
if (!first)
|
|
query_params += "&";
|
|
query_params += query_vendor;
|
|
}*/
|
|
|
|
std::string url = http_url;
|
|
url += query_params;
|
|
Slic3r::Http http = Slic3r::Http::get(url);
|
|
BOOST_LOG_TRIVIAL(info) << boost::format("[BBL Updater]: sync_config request_url: %1%")%url;
|
|
http.on_progress([this](Slic3r::Http::Progress, bool &cancel_http) {
|
|
if (cancel) {
|
|
cancel_http = true;
|
|
}
|
|
})
|
|
.on_complete(
|
|
[this, &vendor_list, &vendor_descriptions, vendors](std::string body, unsigned) {
|
|
try {
|
|
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]::body=" << body;
|
|
|
|
json j = json::parse(body);
|
|
std::string message = j["message"].get<std::string>();
|
|
|
|
if (message == "success") {
|
|
json resource =j.at("resources");
|
|
if (resource.is_array()) {
|
|
for (auto iter = resource.begin(); iter != resource.end(); iter++) {
|
|
Semver version;
|
|
std::string url;
|
|
std::string type;
|
|
std::string vendor;
|
|
std::string description;
|
|
for (auto sub_iter = iter.value().begin(); sub_iter != iter.value().end(); sub_iter++) {
|
|
if (boost::iequals(sub_iter.key(),"type")) {
|
|
type = sub_iter.value();
|
|
BOOST_LOG_TRIVIAL(trace) << "[BBL Updater]: get version of settings's type, " << sub_iter.value();
|
|
}
|
|
else if (boost::iequals(sub_iter.key(),"version")) {
|
|
version = *(Semver::parse(sub_iter.value()));
|
|
}
|
|
else if (boost::iequals(sub_iter.key(),"description")) {
|
|
description = sub_iter.value();
|
|
}
|
|
else if (boost::iequals(sub_iter.key(),"url")) {
|
|
url = sub_iter.value();
|
|
}
|
|
}
|
|
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]: get type "<< type <<", version "<<version.to_string()<<", url " << url;
|
|
|
|
for (auto vendor_it :vendors) {
|
|
const VendorProfile& vendor_profile = vendor_it.second;
|
|
std::string vendor_name = vendor_profile.id;
|
|
boost::to_lower(vendor_name);
|
|
if (type.find(vendor_name) != std::string::npos) {
|
|
vendor = vendor_profile.id;
|
|
break;
|
|
}
|
|
}
|
|
if (!vendor.empty()) {
|
|
vendor_list.emplace(vendor, std::pair<Semver, std::string>(version, url));
|
|
vendor_descriptions.emplace(vendor, description);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else {
|
|
BOOST_LOG_TRIVIAL(error) << "[BBL Updater]: get version of settings failed, body=" << body;
|
|
}
|
|
}
|
|
catch (std::exception& e) {
|
|
BOOST_LOG_TRIVIAL(error) << (boost::format("[BBL Updater]: get version of settings failed, exception=%1% body=%2%")
|
|
% e.what()
|
|
% body).str();
|
|
}
|
|
catch (...) {
|
|
BOOST_LOG_TRIVIAL(error) << "[BBL Updater]: get version of settings failed,, body=" << body;
|
|
}
|
|
}
|
|
)
|
|
.on_error([&](std::string body, std::string error, unsigned status) {
|
|
BOOST_LOG_TRIVIAL(error) << boost::format("[BBL Updater]: status=%1%, error=%2%, body=%3%")
|
|
% status
|
|
% error
|
|
% body;
|
|
}
|
|
)
|
|
.perform_sync();
|
|
|
|
for (auto vendor_it :vendors) {
|
|
if (cancel) { return; }
|
|
|
|
const VendorProfile& vendor_profile = vendor_it.second;
|
|
std::string vendor_name = vendor_profile.id;
|
|
auto vendor_update = vendor_list.find(vendor_name);
|
|
if (vendor_update == vendor_list.end()) {
|
|
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]Vendor " << vendor_name << " can not get setting versions online";
|
|
continue;
|
|
}
|
|
Semver online_version = vendor_update->second.first;
|
|
//Semver current_version = get_version_from_json(vendor_root_config.string());
|
|
Semver current_version = vendor_profile.config_version;
|
|
bool version_match = ((online_version.maj() == current_version.maj()) && (online_version.min() == current_version.min()));
|
|
if (version_match && (current_version < online_version)) {
|
|
auto cache_file = cache_path / (vendor_name+".json");
|
|
auto cache_print_dir = (cache_path / vendor_name / PRESET_PRINT_NAME);
|
|
auto cache_filament_dir = (cache_path / vendor_name / PRESET_FILAMENT_NAME);
|
|
auto cache_machine_dir = (cache_path / vendor_name / PRESET_PRINTER_NAME);
|
|
|
|
if (( fs::exists(cache_file))
|
|
&&( fs::exists(cache_print_dir))
|
|
&&( fs::exists(cache_filament_dir))
|
|
&&( fs::exists(cache_machine_dir))) {
|
|
Semver version = get_version_from_json(cache_file.string());
|
|
bool cached_version_match = ((online_version.maj() == version.maj()) && (online_version.min() == version.min()));
|
|
if (cached_version_match && (version >= online_version)) {
|
|
//already downloaded before
|
|
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]Vendor " << vendor_name << ", already cached a version "<<version.to_string();
|
|
continue;
|
|
}
|
|
}
|
|
if (cancel) { return; }
|
|
|
|
//need to download the online files
|
|
std::string online_url = vendor_update->second.second;
|
|
std::string cache_file_path = (cache_path / (vendor_name + TMP_EXTENSION)).string();
|
|
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]Downloading online settings for vendor: " << vendor_name<<", version "<<online_version.to_string();
|
|
if (!get_file(online_url, cache_file_path)) {
|
|
BOOST_LOG_TRIVIAL(warning) << "[BBL Updater]download settings for vendor "<<vendor_name<<" failed, url: " << online_url;
|
|
continue;
|
|
}
|
|
if (cancel) { return; }
|
|
|
|
//remove previous files before
|
|
if (fs::exists(cache_print_dir))
|
|
fs::remove_all(cache_print_dir);
|
|
if (fs::exists(cache_filament_dir))
|
|
fs::remove_all(cache_filament_dir);
|
|
if (fs::exists(cache_machine_dir))
|
|
fs::remove_all(cache_machine_dir);
|
|
//extract the file downloaded
|
|
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]start to unzip the downloaded file "<< cache_file_path;
|
|
if (!extract_file(cache_file_path)) {
|
|
BOOST_LOG_TRIVIAL(warning) << "[BBL Updater]extract settings for vendor "<<vendor_name<<" failed, path: " << cache_file_path;
|
|
continue;
|
|
}
|
|
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]finished unzip the downloaded file "<< cache_file_path;
|
|
|
|
auto vendor_description = vendor_descriptions.find(vendor_name);
|
|
if (vendor_description != vendor_descriptions.end()) {
|
|
//save the description to disk
|
|
std::string changelog_file = (cache_path / (vendor_name + ".changelog")).string();
|
|
|
|
boost::nowide::ofstream c;
|
|
c.open(changelog_file, std::ios::out | std::ios::trunc);
|
|
c << vendor_description->second << std::endl;
|
|
c.close();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void PresetUpdater::priv::sync_tooltip(std::string http_url, std::string language)
|
|
{
|
|
try {
|
|
std::string common_version = "00.00.00.00";
|
|
std::string language_version = "00.00.00.00";
|
|
fs::path cache_root = fs::path(data_dir()) / "resources/tooltip";
|
|
try {
|
|
auto vf = cache_root / "common" / "version";
|
|
if (fs::exists(vf)) fs::load_string_file(vf, common_version);
|
|
vf = cache_root / language / "version";
|
|
if (fs::exists(vf)) fs::load_string_file(vf, language_version);
|
|
} catch (...) {}
|
|
std::map<std::string, Resource> resources
|
|
{
|
|
{"slicer/tooltip/common", { common_version, "", "", (cache_root / "common").string() }},
|
|
{"slicer/tooltip/" + language, { language_version, "", "", (cache_root / language).string() }}
|
|
};
|
|
sync_resources(http_url, resources);
|
|
for (auto &r : resources) {
|
|
if (!r.second.url.empty()) {
|
|
GUI::MarkdownTip::Reload();
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
catch (std::exception& e) {
|
|
BOOST_LOG_TRIVIAL(warning) << format("[BBL Updater] sync_tooltip: %1%", e.what());
|
|
}
|
|
}
|
|
|
|
// return true means there are plugins files
|
|
bool PresetUpdater::priv::get_cached_plugins_version(std::string& cached_version)
|
|
{
|
|
std::string data_dir_str = data_dir();
|
|
boost::filesystem::path data_dir_path(data_dir_str);
|
|
auto cache_folder = data_dir_path / "ota";
|
|
std::string network_library, player_library;
|
|
bool has_plugins = false;
|
|
|
|
#if defined(_MSC_VER) || defined(_WIN32)
|
|
network_library = cache_folder.string() + "/bambu_networking.dll";
|
|
player_library = cache_folder.string() + "/BambuSource.dll";
|
|
#elif defined(__WXMAC__)
|
|
network_library = cache_folder.string() + "/libbambu_networking.dylib";
|
|
player_library = cache_folder.string() + "/libBambuSource.dylib";
|
|
#else
|
|
network_library = cache_folder.string() + "/libbambu_networking.so";
|
|
player_library = cache_folder.string() + "/libBambuSource.so";
|
|
#endif
|
|
|
|
if (boost::filesystem::exists(network_library)
|
|
&& boost::filesystem::exists(player_library))
|
|
{
|
|
std::string changelog_file = cache_folder.string() + "/network_plugins.json";
|
|
has_plugins = true;
|
|
try {
|
|
boost::nowide::ifstream ifs(changelog_file);
|
|
json j;
|
|
ifs >> j;
|
|
|
|
cached_version = j["version"];
|
|
}
|
|
catch(nlohmann::detail::parse_error &err) {
|
|
BOOST_LOG_TRIVIAL(error) << __FUNCTION__<< ": parse "<<changelog_file<<" got a nlohmann::detail::parse_error, reason = " << err.what();
|
|
//throw ConfigurationError(format("Failed loading json file \"%1%\": %2%", file_path, err.what()));
|
|
}
|
|
}
|
|
|
|
return has_plugins;
|
|
}
|
|
|
|
void PresetUpdater::priv::sync_plugins(std::string http_url, std::string plugin_version)
|
|
{
|
|
if (plugin_version == "00.00.00.00") {
|
|
BOOST_LOG_TRIVIAL(info) << "non need to sync plugins for there is no plugins currently.";
|
|
return;
|
|
}
|
|
std::string curr_version = SLIC3R_VERSION;
|
|
std::string using_version = curr_version.substr(0, 9) + "00";
|
|
|
|
std::string cached_version;
|
|
get_cached_plugins_version(cached_version);
|
|
if (!cached_version.empty()) {
|
|
bool need_delete_cache = false;
|
|
Semver current_semver = curr_version;
|
|
Semver cached_semver = cached_version;
|
|
|
|
int curent_patch_cc = current_semver.patch()/100;
|
|
int cached_patch_cc = cached_semver.patch()/100;
|
|
int curent_patch_dd = current_semver.patch()%100;
|
|
int cached_patch_dd = cached_semver.patch()%100;
|
|
if ((cached_semver.maj() != current_semver.maj())
|
|
|| (cached_semver.min() != current_semver.min())
|
|
|| (curent_patch_cc != cached_patch_cc))
|
|
{
|
|
need_delete_cache = true;
|
|
BOOST_LOG_TRIVIAL(info) << boost::format("cached plugins version %1% not match with current %2%")%cached_version%curr_version;
|
|
}
|
|
else if (cached_patch_dd <= curent_patch_dd) {
|
|
need_delete_cache = true;
|
|
BOOST_LOG_TRIVIAL(info) << boost::format("cached plugins version %1% not newer than current %2%")%cached_version%curr_version;
|
|
}
|
|
else {
|
|
plugin_version = cached_version;
|
|
}
|
|
|
|
if (need_delete_cache) {
|
|
std::string data_dir_str = data_dir();
|
|
boost::filesystem::path data_dir_path(data_dir_str);
|
|
auto cache_folder = data_dir_path / "ota";
|
|
|
|
#if defined(_MSC_VER) || defined(_WIN32)
|
|
auto network_library = cache_folder / "bambu_networking.dll";
|
|
auto player_library = cache_folder / "BambuSource.dll";
|
|
#elif defined(__WXMAC__)
|
|
auto network_library = cache_folder / "libbambu_networking.dylib";
|
|
auto player_library = cache_folder / "libBambuSource.dylib";
|
|
#else
|
|
auto network_library = cache_folder / "libbambu_networking.so";
|
|
auto player_library = cache_folder / "libBambuSource.so";
|
|
#endif
|
|
auto changelog_file = cache_folder / "network_plugins.json";
|
|
|
|
if (boost::filesystem::exists(network_library))
|
|
{
|
|
|
|
BOOST_LOG_TRIVIAL(info) << "[remove_old_networking_plugins] remove the file "<<network_library.string();
|
|
try {
|
|
fs::remove(network_library);
|
|
} catch (...) {
|
|
BOOST_LOG_TRIVIAL(error) << "Failed removing the plugins file " << network_library.string();
|
|
}
|
|
}
|
|
if (boost::filesystem::exists(player_library))
|
|
{
|
|
|
|
BOOST_LOG_TRIVIAL(info) << "[remove_old_networking_plugins] remove the file "<<player_library.string();
|
|
try {
|
|
fs::remove(player_library);
|
|
} catch (...) {
|
|
BOOST_LOG_TRIVIAL(error) << "Failed removing the plugins file " << player_library.string();
|
|
}
|
|
}
|
|
if (boost::filesystem::exists(changelog_file))
|
|
{
|
|
|
|
BOOST_LOG_TRIVIAL(info) << "[remove_old_networking_plugins] remove the file "<<changelog_file.string();
|
|
try {
|
|
fs::remove(changelog_file);
|
|
} catch (...) {
|
|
BOOST_LOG_TRIVIAL(error) << "Failed removing the plugins file " << changelog_file.string();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
try {
|
|
std::map<std::string, Resource> resources
|
|
{
|
|
{"slicer/plugins/cloud", { using_version, "", "", cache_path.string(), {"plugins"}}}
|
|
};
|
|
sync_resources(http_url, resources, true, plugin_version, "network_plugins.json");
|
|
}
|
|
catch (std::exception& e) {
|
|
BOOST_LOG_TRIVIAL(warning) << format("[BBL Updater] sync_plugins: %1%", e.what());
|
|
}
|
|
|
|
bool result = get_cached_plugins_version(cached_version);
|
|
if (result) {
|
|
BOOST_LOG_TRIVIAL(info) << format("[BBL Updater] found new plugins: %1%, prompt to update", cached_version);
|
|
GUI::wxGetApp().plater()->get_notification_manager()->push_notification(GUI::NotificationType::BBLPluginUpdateAvailable);
|
|
}
|
|
}
|
|
|
|
void PresetUpdater::priv::sync_printer_config(std::string http_url)
|
|
{
|
|
std::string curr_version = SLIC3R_VERSION;
|
|
std::string using_version = curr_version.substr(0, 6) + "00.00";
|
|
|
|
std::string cached_version;
|
|
std::string data_dir_str = data_dir();
|
|
boost::filesystem::path data_dir_path(data_dir_str);
|
|
auto config_folder = data_dir_path / "printers";
|
|
auto cache_folder = data_dir_path / "ota" / "printers";
|
|
|
|
try {
|
|
boost::filesystem::load_string_file(config_folder / "version.txt", curr_version);
|
|
boost::algorithm::trim(curr_version);
|
|
} catch (...) {}
|
|
try {
|
|
boost::filesystem::load_string_file(cache_folder / "version.txt", cached_version);
|
|
boost::algorithm::trim(cached_version);
|
|
} catch (...) {}
|
|
if (!cached_version.empty()) {
|
|
bool need_delete_cache = false;
|
|
Semver current_semver = curr_version;
|
|
Semver cached_semver = cached_version;
|
|
|
|
if ((cached_semver.maj() != current_semver.maj()) || (cached_semver.min() != current_semver.min())) {
|
|
need_delete_cache = true;
|
|
BOOST_LOG_TRIVIAL(info) << boost::format("cached printer config version %1% not match with current %2%") % cached_version % curr_version;
|
|
} else if (cached_semver.patch() <= current_semver.patch()) {
|
|
need_delete_cache = true;
|
|
BOOST_LOG_TRIVIAL(info) << boost::format("cached printer config version %1% not newer than current %2%") % cached_version % curr_version;
|
|
} else {
|
|
using_version = cached_version;
|
|
}
|
|
|
|
if (need_delete_cache) {
|
|
boost::system::error_code ec;
|
|
boost::filesystem::remove_all(cache_folder, ec);
|
|
cached_version = curr_version;
|
|
}
|
|
}
|
|
|
|
try {
|
|
std::map<std::string, Resource> resources{{"slicer/printer/bbl", {using_version, "", "", cache_folder.string()}}};
|
|
sync_resources(http_url, resources, false, cached_version, "printer.json");
|
|
} catch (std::exception &e) {
|
|
BOOST_LOG_TRIVIAL(warning) << format("[BBL Updater] sync_printer_config: %1%", e.what());
|
|
}
|
|
|
|
bool result = false;
|
|
try {
|
|
boost::filesystem::load_string_file(cache_folder / "version.txt", cached_version);
|
|
boost::algorithm::trim(cached_version);
|
|
result = true;
|
|
} catch (...) {}
|
|
if (result) {
|
|
BOOST_LOG_TRIVIAL(info) << format("[BBL Updater] found new printer config: %1%, prompt to update", cached_version);
|
|
waiting_printer_updates = get_printer_config_updates(true);
|
|
if (waiting_printer_updates.updates.size() > 0) {
|
|
has_waiting_printer_updates = true;
|
|
GUI::wxGetApp().plater()->get_notification_manager()->push_notification(GUI::NotificationType::BBLPrinterConfigUpdateAvailable);
|
|
}
|
|
}
|
|
}
|
|
|
|
bool PresetUpdater::priv::install_bundles_rsrc(std::vector<std::string> bundles, bool snapshot) const
|
|
{
|
|
Updates updates;
|
|
|
|
BOOST_LOG_TRIVIAL(info) << format("Installing %1% bundles from resources ...", bundles.size());
|
|
|
|
for (const auto &bundle : bundles) {
|
|
auto path_in_rsrc = (this->rsrc_path / bundle).replace_extension(".json");
|
|
auto path_in_vendors = (this->vendor_path / bundle).replace_extension(".json");
|
|
updates.updates.emplace_back(std::move(path_in_rsrc), std::move(path_in_vendors), Version(), bundle, "", "");
|
|
|
|
//BBS: add directory support
|
|
auto print_in_rsrc = (this->rsrc_path / bundle / PRESET_PRINT_NAME);
|
|
auto print_in_vendors = (this->vendor_path / bundle / PRESET_PRINT_NAME);
|
|
fs::path print_folder(print_in_vendors);
|
|
if (fs::exists(print_folder))
|
|
fs::remove_all(print_folder);
|
|
fs::create_directories(print_folder);
|
|
updates.updates.emplace_back(std::move(print_in_rsrc), std::move(print_in_vendors), Version(), bundle, "", "", false, true);
|
|
|
|
auto filament_in_rsrc = (this->rsrc_path / bundle / PRESET_FILAMENT_NAME);
|
|
auto filament_in_vendors = (this->vendor_path / bundle / PRESET_FILAMENT_NAME);
|
|
fs::path filament_folder(filament_in_vendors);
|
|
if (fs::exists(filament_folder))
|
|
fs::remove_all(filament_folder);
|
|
fs::create_directories(filament_folder);
|
|
updates.updates.emplace_back(std::move(filament_in_rsrc), std::move(filament_in_vendors), Version(), bundle, "", "", false, true);
|
|
|
|
auto machine_in_rsrc = (this->rsrc_path / bundle / PRESET_PRINTER_NAME);
|
|
auto machine_in_vendors = (this->vendor_path / bundle / PRESET_PRINTER_NAME);
|
|
fs::path machine_folder(machine_in_vendors);
|
|
if (fs::exists(machine_folder))
|
|
fs::remove_all(machine_folder);
|
|
fs::create_directories(machine_folder);
|
|
updates.updates.emplace_back(std::move(machine_in_rsrc), std::move(machine_in_vendors), Version(), bundle, "", "", false, true);
|
|
}
|
|
|
|
return perform_updates(std::move(updates), snapshot);
|
|
}
|
|
|
|
|
|
//BBS: refine preset update logic
|
|
// Install indicies from resources. Only installs those that are either missing or older than in resources.
|
|
void PresetUpdater::priv::check_installed_vendor_profiles() const
|
|
{
|
|
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]:Checking whether the profile from resource is newer";
|
|
|
|
AppConfig *app_config = GUI::wxGetApp().app_config;
|
|
const auto enabled_vendors = app_config->vendors();
|
|
|
|
//BBS: refine the init check logic
|
|
std::vector<std::string> bundles;
|
|
for (auto &dir_entry : boost::filesystem::directory_iterator(rsrc_path)) {
|
|
const auto &path = dir_entry.path();
|
|
std::string file_path = path.string();
|
|
if (is_json_file(file_path)) {
|
|
const auto path_in_vendor = vendor_path / path.filename();
|
|
std::string vendor_name = path.filename().string();
|
|
// Remove the .json suffix.
|
|
vendor_name.erase(vendor_name.size() - 5);
|
|
if (enabled_config_update) {
|
|
if ( fs::exists(path_in_vendor)) {
|
|
if (enabled_vendors.find(vendor_name) != enabled_vendors.end()) {
|
|
Semver resource_ver = get_version_from_json(file_path);
|
|
Semver vendor_ver = get_version_from_json(path_in_vendor.string());
|
|
|
|
bool version_match = ((resource_ver.maj() == vendor_ver.maj()) && (resource_ver.min() == vendor_ver.min()));
|
|
|
|
if (!version_match || (vendor_ver < resource_ver)) {
|
|
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]:found vendor "<<vendor_name<<" newer version "<<resource_ver.to_string() <<" from resource, old version "<<vendor_ver.to_string();
|
|
bundles.push_back(vendor_name);
|
|
}
|
|
}
|
|
else {
|
|
//need to be removed because not installed
|
|
fs::remove(path_in_vendor);
|
|
const auto path_of_vendor = vendor_path / vendor_name;
|
|
if (fs::exists(path_of_vendor))
|
|
fs::remove_all(path_of_vendor);
|
|
}
|
|
}
|
|
else if ((vendor_name == PresetBundle::BBL_BUNDLE) || (enabled_vendors.find(vendor_name) != enabled_vendors.end())) {//if vendor has no file, copy it from resource for BBL
|
|
bundles.push_back(vendor_name);
|
|
}
|
|
}
|
|
else if ((vendor_name == PresetBundle::BBL_BUNDLE) || (enabled_vendors.find(vendor_name) != enabled_vendors.end())) { //always update configs from resource to vendor for BBL
|
|
bundles.push_back(vendor_name);
|
|
}
|
|
}
|
|
}
|
|
|
|
if (bundles.size() > 0)
|
|
install_bundles_rsrc(bundles, false);
|
|
}
|
|
|
|
Updates PresetUpdater::priv::get_printer_config_updates(bool update) const
|
|
{
|
|
std::string data_dir_str = data_dir();
|
|
boost::filesystem::path data_dir_path(data_dir_str);
|
|
boost::filesystem::path resc_dir_path(resources_dir());
|
|
auto config_folder = data_dir_path / "printers";
|
|
auto resc_folder = (update ? cache_path : resc_dir_path) / "printers";
|
|
std::string curr_version;
|
|
std::string resc_version;
|
|
try {
|
|
boost::filesystem::load_string_file(resc_folder / "version.txt", resc_version);
|
|
boost::algorithm::trim(resc_version);
|
|
} catch (...) {}
|
|
try {
|
|
boost::filesystem::load_string_file(config_folder / "version.txt", curr_version);
|
|
boost::algorithm::trim(curr_version);
|
|
} catch (...) {}
|
|
|
|
if (!curr_version.empty()) {
|
|
Semver curr_ver = curr_version;
|
|
Semver resc_ver = resc_version;
|
|
|
|
bool version_match = ((resc_ver.maj() == curr_ver.maj()) && (resc_ver.min() == curr_ver.min()));
|
|
|
|
if (!version_match || (curr_ver < resc_ver)) {
|
|
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]:found newer version " << resc_version << " from resource, old version " << curr_version;
|
|
} else {
|
|
return {};
|
|
}
|
|
}
|
|
Updates updates;
|
|
Version version;
|
|
version.config_version = resc_version;
|
|
std::string change_log;
|
|
if (update) {
|
|
std::string changelog_file = (resc_folder / "printer.json").string();
|
|
try {
|
|
boost::nowide::ifstream ifs(changelog_file);
|
|
json j;
|
|
ifs >> j;
|
|
version.comment = j["description"];
|
|
} catch (...) {}
|
|
}
|
|
updates.updates.emplace_back(std::move(resc_folder), std::move(config_folder), version, "bbl", change_log, version.comment, false, true);
|
|
return updates;
|
|
}
|
|
|
|
// Generates a list of bundle updates that are to be performed.
|
|
// Version of slic3r that was running the last time and which was read out from PrusaSlicer.ini is provided
|
|
// as a parameter.
|
|
//BBS: refine the Preset Updater logic
|
|
Updates PresetUpdater::priv::get_config_updates(const Semver &old_slic3r_version) const
|
|
{
|
|
Updates updates;
|
|
|
|
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]:Checking for cached configuration updates...";
|
|
|
|
for (auto &dir_entry : boost::filesystem::directory_iterator(cache_path)) {
|
|
const auto &path = dir_entry.path();
|
|
std::string file_path = path.string();
|
|
if (is_json_file(file_path)) {
|
|
const auto path_in_vendor = vendor_path / path.filename();
|
|
std::string vendor_name = path.filename().string();
|
|
// Remove the .json suffix.
|
|
vendor_name.erase(vendor_name.size() - 5);
|
|
auto print_in_cache = (cache_path / vendor_name / PRESET_PRINT_NAME);
|
|
auto filament_in_cache = (cache_path / vendor_name / PRESET_FILAMENT_NAME);
|
|
auto machine_in_cache = (cache_path / vendor_name / PRESET_PRINTER_NAME);
|
|
|
|
if (( fs::exists(path_in_vendor))
|
|
&&( fs::exists(print_in_cache))
|
|
&&( fs::exists(filament_in_cache))
|
|
&&( fs::exists(machine_in_cache))) {
|
|
Semver vendor_ver = get_version_from_json(path_in_vendor.string());
|
|
|
|
std::map<std::string, std::string> key_values;
|
|
std::vector<std::string> keys(3);
|
|
Semver cache_ver;
|
|
keys[0] = BBL_JSON_KEY_VERSION;
|
|
keys[1] = BBL_JSON_KEY_DESCRIPTION;
|
|
keys[2] = BBL_JSON_KEY_FORCE_UPDATE;
|
|
get_values_from_json(file_path, keys, key_values);
|
|
std::string description = key_values[BBL_JSON_KEY_DESCRIPTION];
|
|
bool force_update = false;
|
|
if (key_values.find(BBL_JSON_KEY_FORCE_UPDATE) != key_values.end())
|
|
force_update = (key_values[BBL_JSON_KEY_FORCE_UPDATE] == "1")?true:false;
|
|
auto config_version = Semver::parse(key_values[BBL_JSON_KEY_VERSION]);
|
|
if (config_version)
|
|
cache_ver = *config_version;
|
|
|
|
std::string changelog;
|
|
std::string changelog_file = (cache_path / (vendor_name + ".changelog")).string();
|
|
boost::nowide::ifstream ifs(changelog_file);
|
|
if (ifs) {
|
|
std::ostringstream oss;
|
|
oss<< ifs.rdbuf();
|
|
changelog = oss.str();
|
|
//ifs>>changelog;
|
|
ifs.close();
|
|
}
|
|
|
|
bool version_match = ((vendor_ver.maj() == cache_ver.maj()) && (vendor_ver.min() == cache_ver.min()));
|
|
if (version_match && (vendor_ver < cache_ver)) {
|
|
Semver app_ver = *Semver::parse(SLIC3R_VERSION);
|
|
if (cache_ver.maj() == app_ver.maj()){
|
|
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]:need to update settings from "<<vendor_ver.to_string()<<" to newer version "<<cache_ver.to_string() <<", app version "<<SLIC3R_VERSION;
|
|
Version version;
|
|
version.config_version = cache_ver;
|
|
version.comment = description;
|
|
|
|
updates.updates.emplace_back(std::move(file_path), std::move(path_in_vendor.string()), std::move(version), vendor_name, changelog, description, force_update, false);
|
|
|
|
//BBS: add directory support
|
|
auto print_in_vendors = (vendor_path / vendor_name / PRESET_PRINT_NAME);
|
|
updates.updates.emplace_back(std::move(print_in_cache), std::move(print_in_vendors.string()), Version(), vendor_name, "", "", force_update, true);
|
|
|
|
auto filament_in_vendors = (vendor_path / vendor_name / PRESET_FILAMENT_NAME);
|
|
updates.updates.emplace_back(std::move(filament_in_cache), std::move(filament_in_vendors.string()), Version(), vendor_name, "", "", force_update, true);
|
|
|
|
auto machine_in_vendors = (vendor_path / vendor_name / PRESET_PRINTER_NAME);
|
|
updates.updates.emplace_back(std::move(machine_in_cache), std::move(machine_in_vendors.string()), Version(), vendor_name, "", "", force_update, true);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return updates;
|
|
}
|
|
|
|
//BBS: switch to new BBL.json configs
|
|
bool PresetUpdater::priv::perform_updates(Updates &&updates, bool snapshot) const
|
|
{
|
|
//std::string vendor_path;
|
|
//std::string vendor_name;
|
|
if (updates.incompats.size() > 0) {
|
|
//if (snapshot) {
|
|
// BOOST_LOG_TRIVIAL(info) << "Taking a snapshot...";
|
|
// if (! GUI::Config::take_config_snapshot_cancel_on_error(*GUI::wxGetApp().app_config, Snapshot::SNAPSHOT_DOWNGRADE, "",
|
|
// _u8L("Continue and install configuration updates?")))
|
|
// return false;
|
|
//}
|
|
BOOST_LOG_TRIVIAL(info) << format("[BBL Updater]:Deleting %1% incompatible bundles", updates.incompats.size());
|
|
|
|
for (auto &incompat : updates.incompats) {
|
|
BOOST_LOG_TRIVIAL(info) << '\t' << incompat;
|
|
incompat.remove();
|
|
}
|
|
} else if (updates.updates.size() > 0) {
|
|
//if (snapshot) {
|
|
// BOOST_LOG_TRIVIAL(info) << "Taking a snapshot...";
|
|
// if (! GUI::Config::take_config_snapshot_cancel_on_error(*GUI::wxGetApp().app_config, Snapshot::SNAPSHOT_UPGRADE, "",
|
|
// _u8L("Continue and install configuration updates?")))
|
|
// return false;
|
|
//}
|
|
|
|
BOOST_LOG_TRIVIAL(info) << format("[BBL Updater]:Performing %1% updates", updates.updates.size());
|
|
|
|
for (const auto &update : updates.updates) {
|
|
BOOST_LOG_TRIVIAL(info) << '\t' << update;
|
|
|
|
update.install();
|
|
//if (!update.is_directory) {
|
|
// vendor_path = update.source.parent_path().string();
|
|
// vendor_name = update.vendor;
|
|
//}
|
|
}
|
|
|
|
//if (!vendor_path.empty()) {
|
|
// PresetBundle bundle;
|
|
// // Throw when parsing invalid configuration. Only valid configuration is supposed to be provided over the air.
|
|
// bundle.load_vendor_configs_from_json(vendor_path, vendor_name, PresetBundle::LoadConfigBundleAttribute::LoadSystem, ForwardCompatibilitySubstitutionRule::Disable);
|
|
|
|
// BOOST_LOG_TRIVIAL(info) << format("Deleting %1% conflicting presets", bundle.prints.size() + bundle.filaments.size() + bundle.printers.size());
|
|
|
|
// auto preset_remover = [](const Preset& preset) {
|
|
// BOOST_LOG_TRIVIAL(info) << '\t' << preset.file;
|
|
// fs::remove(preset.file);
|
|
// };
|
|
|
|
// for (const auto &preset : bundle.prints) { preset_remover(preset); }
|
|
// for (const auto &preset : bundle.filaments) { preset_remover(preset); }
|
|
// for (const auto &preset : bundle.printers) { preset_remover(preset); }
|
|
//}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
void PresetUpdater::priv::set_waiting_updates(Updates u)
|
|
{
|
|
waiting_updates = u;
|
|
has_waiting_updates = true;
|
|
}
|
|
|
|
PresetUpdater::PresetUpdater() :
|
|
p(new priv())
|
|
{}
|
|
|
|
|
|
// Public
|
|
|
|
PresetUpdater::~PresetUpdater()
|
|
{
|
|
if (p && p->thread.joinable()) {
|
|
// This will stop transfers being done by the thread, if any.
|
|
// Cancelling takes some time, but should complete soon enough.
|
|
p->cancel = true;
|
|
p->thread.join();
|
|
}
|
|
}
|
|
|
|
//BBS: change directories by design
|
|
//BBS: refine the preset updater logic
|
|
void PresetUpdater::sync(std::string http_url, std::string language, std::string plugin_version, PresetBundle *preset_bundle)
|
|
{
|
|
//p->set_download_prefs(GUI::wxGetApp().app_config);
|
|
if (!p->enabled_version_check && !p->enabled_config_update) { return; }
|
|
|
|
// Copy the whole vendors data for use in the background thread
|
|
// Unfortunatelly as of C++11, it needs to be copied again
|
|
// into the closure (but perhaps the compiler can elide this).
|
|
VendorMap vendors = preset_bundle ? preset_bundle->vendors : VendorMap{};
|
|
|
|
p->thread = std::thread([this, vendors, http_url, language, plugin_version]() {
|
|
this->p->prune_tmps();
|
|
if (p->cancel)
|
|
return;
|
|
this->p->sync_version();
|
|
if (p->cancel)
|
|
return;
|
|
if (!vendors.empty()) {
|
|
this->p->sync_config(http_url, std::move(vendors));
|
|
if (p->cancel)
|
|
return;
|
|
GUI::wxGetApp().CallAfter([] {
|
|
GUI::wxGetApp().check_config_updates_from_updater();
|
|
});
|
|
}
|
|
if (p->cancel)
|
|
return;
|
|
this->p->sync_plugins(http_url, plugin_version);
|
|
this->p->sync_printer_config(http_url);
|
|
//if (p->cancel)
|
|
// return;
|
|
//remove the tooltip currently
|
|
//this->p->sync_tooltip(http_url, language);
|
|
});
|
|
}
|
|
|
|
void PresetUpdater::slic3r_update_notify()
|
|
{
|
|
if (! p->enabled_version_check)
|
|
return;
|
|
}
|
|
|
|
static bool reload_configs_update_gui()
|
|
{
|
|
wxString header = _L("Need to check the unsaved changes before configuration updates.");
|
|
if (!GUI::wxGetApp().check_and_save_current_preset_changes(_L("Configuration updates"), header, false ))
|
|
return false;
|
|
|
|
// Reload global configuration
|
|
auto* app_config = GUI::wxGetApp().app_config;
|
|
// System profiles should not trigger any substitutions, user profiles may trigger substitutions, but these substitutions
|
|
// were already presented to the user on application start up. Just do substitutions now and keep quiet about it.
|
|
// However throw on substitutions in system profiles, those shall never happen with system profiles installed over the air.
|
|
GUI::wxGetApp().preset_bundle->load_presets(*app_config, ForwardCompatibilitySubstitutionRule::EnableSilentDisableSystem);
|
|
GUI::wxGetApp().load_current_presets();
|
|
GUI::wxGetApp().plater()->set_bed_shape();
|
|
|
|
return true;
|
|
}
|
|
|
|
//BBS: refine the preset updater logic
|
|
PresetUpdater::UpdateResult PresetUpdater::config_update(const Semver& old_slic3r_version, UpdateParams params) const
|
|
{
|
|
if (! p->enabled_config_update) { return R_NOOP; }
|
|
|
|
auto updates = p->get_config_updates(old_slic3r_version);
|
|
//if (updates.incompats.size() > 0) {
|
|
// BOOST_LOG_TRIVIAL(info) << format("%1% bundles incompatible. Asking for action...", updates.incompats.size());
|
|
|
|
// std::unordered_map<std::string, wxString> incompats_map;
|
|
// for (const auto &incompat : updates.incompats) {
|
|
// const auto min_slic3r = incompat.version.min_slic3r_version;
|
|
// const auto max_slic3r = incompat.version.max_slic3r_version;
|
|
// wxString restrictions;
|
|
// if (min_slic3r != Semver::zero() && max_slic3r != Semver::inf()) {
|
|
// restrictions = GUI::format_wxstr(_L("requires min. %s and max. %s"),
|
|
// min_slic3r.to_string(),
|
|
// max_slic3r.to_string());
|
|
// } else if (min_slic3r != Semver::zero()) {
|
|
// restrictions = GUI::format_wxstr(_L("requires min. %s"), min_slic3r.to_string());
|
|
// BOOST_LOG_TRIVIAL(debug) << "Bundle is not downgrade, user will now have to do whole wizard. This should not happen.";
|
|
// } else {
|
|
// restrictions = GUI::format_wxstr(_L("requires max. %s"), max_slic3r.to_string());
|
|
// }
|
|
|
|
// incompats_map.emplace(std::make_pair(incompat.vendor, std::move(restrictions)));
|
|
// }
|
|
|
|
// GUI::MsgDataIncompatible dlg(std::move(incompats_map));
|
|
// const auto res = dlg.ShowModal();
|
|
// if (res == wxID_REPLACE) {
|
|
// BOOST_LOG_TRIVIAL(info) << "User wants to re-configure...";
|
|
|
|
// // This effectively removes the incompatible bundles:
|
|
// // (snapshot is taken beforehand)
|
|
// if (! p->perform_updates(std::move(updates)) ||
|
|
// ! GUI::wxGetApp().run_wizard(GUI::ConfigWizard::RR_DATA_INCOMPAT))
|
|
// return R_INCOMPAT_EXIT;
|
|
|
|
// return R_INCOMPAT_CONFIGURED;
|
|
// }
|
|
// else {
|
|
// BOOST_LOG_TRIVIAL(info) << "User wants to exit Slic3r, bye...";
|
|
// return R_INCOMPAT_EXIT;
|
|
// }
|
|
|
|
//} else
|
|
if (updates.updates.size() > 0) {
|
|
|
|
bool force_update = false;
|
|
for (const auto& update : updates.updates) {
|
|
force_update = (update.forced_update ? true : force_update);
|
|
//td::cout << update.forced_update << std::endl;
|
|
//BOOST_LOG_TRIVIAL(info) << format("Update requires higher version.");
|
|
}
|
|
|
|
//forced update
|
|
if (force_update)
|
|
{
|
|
BOOST_LOG_TRIVIAL(info) << format("[BBL Updater]:Force updating will start, size %1% ", updates.updates.size());
|
|
bool ret = p->perform_updates(std::move(updates));
|
|
if (!ret) {
|
|
BOOST_LOG_TRIVIAL(warning) << format("[BBL Updater]:perform_updates failed");
|
|
return R_INCOMPAT_EXIT;
|
|
}
|
|
|
|
ret = reload_configs_update_gui();
|
|
if (!ret) {
|
|
BOOST_LOG_TRIVIAL(warning) << format("[BBL Updater]:reload_configs_update_gui failed");
|
|
return R_INCOMPAT_EXIT;
|
|
}
|
|
Semver cur_ver = GUI::wxGetApp().preset_bundle->get_vendor_profile_version(PresetBundle::BBL_BUNDLE);
|
|
|
|
GUI::wxGetApp().plater()->get_notification_manager()->push_notification(GUI::NotificationType::PresetUpdateFinished, GUI::NotificationManager::NotificationLevel::ImportantNotificationLevel, _u8L("Configuration package updated to ")+cur_ver.to_string());
|
|
|
|
return R_UPDATE_INSTALLED;
|
|
}
|
|
|
|
// regular update
|
|
if (params == UpdateParams::SHOW_NOTIFICATION) {
|
|
p->set_waiting_updates(updates);
|
|
GUI::wxGetApp().plater()->get_notification_manager()->push_notification(GUI::NotificationType::PresetUpdateAvailable);
|
|
}
|
|
else {
|
|
BOOST_LOG_TRIVIAL(info) << format("[BBL Updater]:Configuration package available. size %1%, need to confirm...", p->waiting_updates.updates.size());
|
|
|
|
std::vector<GUI::MsgUpdateConfig::Update> updates_msg;
|
|
for (const auto& update : updates.updates) {
|
|
//BBS: skip directory
|
|
if (update.is_directory)
|
|
continue;
|
|
std::string changelog = update.change_log;
|
|
updates_msg.emplace_back(update.vendor, update.version.config_version, update.descriptions, std::move(changelog));
|
|
}
|
|
|
|
GUI::MsgUpdateConfig dlg(updates_msg, params == UpdateParams::FORCED_BEFORE_WIZARD);
|
|
|
|
const auto res = dlg.ShowModal();
|
|
if (res == wxID_OK) {
|
|
BOOST_LOG_TRIVIAL(debug) << "[BBL Updater]:selected yes to update";
|
|
if (! p->perform_updates(std::move(updates)) ||
|
|
! reload_configs_update_gui())
|
|
return R_ALL_CANCELED;
|
|
return R_UPDATE_INSTALLED;
|
|
}
|
|
else {
|
|
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]:selected no for updating";
|
|
if (params == UpdateParams::FORCED_BEFORE_WIZARD && res == wxID_CANCEL)
|
|
return R_ALL_CANCELED;
|
|
return R_UPDATE_REJECT;
|
|
}
|
|
}
|
|
|
|
// MsgUpdateConfig will show after the notificaation is clicked
|
|
} else {
|
|
BOOST_LOG_TRIVIAL(info) << "[BBL Updater]:No configuration updates available.";
|
|
}
|
|
|
|
return R_NOOP;
|
|
}
|
|
|
|
//BBS: add json related logic
|
|
bool PresetUpdater::install_bundles_rsrc(std::vector<std::string> bundles, bool snapshot) const
|
|
{
|
|
return p->install_bundles_rsrc(bundles, snapshot);
|
|
}
|
|
|
|
void PresetUpdater::on_update_notification_confirm()
|
|
{
|
|
if (!p->has_waiting_updates)
|
|
return;
|
|
BOOST_LOG_TRIVIAL(info) << format("Update of %1% bundles available. Asking for confirmation ...", p->waiting_updates.updates.size());
|
|
|
|
std::vector<GUI::MsgUpdateConfig::Update> updates_msg;
|
|
for (const auto& update : p->waiting_updates.updates) {
|
|
//BBS: skip directory
|
|
if (update.is_directory)
|
|
continue;
|
|
std::string changelog = update.change_log;
|
|
updates_msg.emplace_back(update.vendor, update.version.config_version, update.descriptions, std::move(changelog));
|
|
}
|
|
|
|
GUI::MsgUpdateConfig dlg(updates_msg);
|
|
|
|
const auto res = dlg.ShowModal();
|
|
if (res == wxID_OK) {
|
|
BOOST_LOG_TRIVIAL(debug) << "User agreed to perform the update";
|
|
if (p->perform_updates(std::move(p->waiting_updates)) &&
|
|
reload_configs_update_gui()) {
|
|
p->has_waiting_updates = false;
|
|
}
|
|
}
|
|
else {
|
|
BOOST_LOG_TRIVIAL(info) << "User refused the update";
|
|
}
|
|
}
|
|
|
|
void PresetUpdater::do_printer_config_update()
|
|
{
|
|
if (!p->has_waiting_printer_updates)
|
|
return;
|
|
BOOST_LOG_TRIVIAL(info) << "Update of printer configs available. Asking for confirmation ...";
|
|
|
|
std::vector<GUI::MsgUpdateConfig::Update> updates_msg;
|
|
for (const auto &update : p->waiting_printer_updates.updates) {
|
|
std::string changelog = update.change_log;
|
|
updates_msg.emplace_back(update.vendor, update.version.config_version, update.descriptions, std::move(changelog));
|
|
}
|
|
|
|
GUI::MsgUpdateConfig dlg(updates_msg);
|
|
|
|
const auto res = dlg.ShowModal();
|
|
if (res == wxID_OK) {
|
|
BOOST_LOG_TRIVIAL(debug) << "User agreed to perform the update";
|
|
if (p->perform_updates(std::move(p->waiting_printer_updates)))
|
|
p->has_waiting_printer_updates = false;
|
|
} else {
|
|
BOOST_LOG_TRIVIAL(info) << "User refused the update";
|
|
}
|
|
}
|
|
|
|
bool PresetUpdater::version_check_enabled() const
|
|
{
|
|
return p->enabled_version_check;
|
|
}
|
|
|
|
}
|