diff --git a/CANVIS b/CANVIS
index 88fd476..5fb8532 100644
--- a/CANVIS
+++ b/CANVIS
@@ -102,13 +102,38 @@ afegit generació i actualització automàtica del fitxer json per als impulsos
0.5.6 β (04/05/2023)
Afegida utilitat per recuperar mencions del fitxer .json al fitxer .txt
-Sincronitzat el fitxer compte_pub amb el nombre de publicacions
+Sincronitzat el fitxer compte_pub amb el nombre de publicacions (en proves encara)
+(04/07/2023)
+ajustats els colors dels gràfics segons combinacions de @randomColorContrasts@botsin.space
+
+
+0.5.8 β (05/07/2023)
+Inicie les proves per analitzar les mencions amb vadersentiment
+I registrar-les al fitxer json.
+Només publica l'avaluació amb la cadena "@aPunt_bot #comentabot"
+
+0.5.9 β (03/08/2023)
+Dona la opcio de conèixer les etiquetes de les funcions al missatge de benvinguda.
+Opcions fetes:
+#saludabot
+#comentabot
+#infobot
+#oratgebot
+#saludabot
+#usuaribot
+
+-- (10/09/2023)
+Afegit el fitxer de registre de noticies publicades en format json
+
+-- (22/11/2023)
+Modificat el ratell de fitxers de tail a SplFileObject
+
+0.6.0 β (XX/05/2023)
+
-0.5.7 β (XX/05/2023)
PER FER (?)
Reduir a una connexió de notificacions per impulsos i mencions (estalviarà temps)
-Incloure de forma automàtica fitxers json de impulsos i mencions. (permet fer gràfics i altres funcions noves).
Una enquesta mensual, de durada setmanal, sobre el funcionament del bot. (fase 1)
(encara no he conseguit la publicacio de l'enquesta (23-4-2023)
El resultat canviarà les opcions. (fase 2)
diff --git a/LICENSE b/LICENSE
index baee873..f288702 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,170 +1,674 @@
-Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International
-
- Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.
-
-Considerations for licensors: Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. More considerations for licensors.
-
-Considerations for the public: By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. More considerations for the public.
-
-Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License
-
-By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
-
-Section 1 – Definitions.
-
- a. Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
-
- b. Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.
-
- c. BY-NC-SA Compatible License means a license listed at creativecommons.org/compatiblelicenses, approved by Creative Commons as essentially the equivalent of this Public License.
-
- d. Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
-
- e. Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
-
- f. Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
-
- g. License Elements means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution, NonCommercial, and ShareAlike.
-
- h. Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
-
- i. Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
-
- j. Licensor means the individual(s) or entity(ies) granting rights under this Public License.
-
- k. NonCommercial means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange.
-
- l. Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
-
- m. Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
-
- n. You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
-
-Section 2 – Scope.
-
- a. License grant.
-
- 1. Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
-
- A. reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and
-
- B. produce, reproduce, and Share Adapted Material for NonCommercial purposes only.
-
- 2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
-
- 3. Term. The term of this Public License is specified in Section 6(a).
-
- 4. Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
-
- 5. Downstream recipients.
-
- A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
-
- B. Additional offer from the Licensor – Adapted Material. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.
-
- C. No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
-
- 6. No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
-
- b. Other rights.
-
- 1. Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
-
- 2. Patent and trademark rights are not licensed under this Public License.
-
- 3. To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes.
-
-Section 3 – License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the following conditions.
-
- a. Attribution.
-
- 1. If You Share the Licensed Material (including in modified form), You must:
-
- A. retain the following if it is supplied by the Licensor with the Licensed Material:
-
- i. identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
-
- ii. a copyright notice;
-
- iii. a notice that refers to this Public License;
-
- iv. a notice that refers to the disclaimer of warranties;
-
- v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
-
- B. indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
-
- C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
-
- 2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
-
- 3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
-
- b. ShareAlike.In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply.
-
- 1. The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-NC-SA Compatible License.
-
- 2. You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.
-
- 3. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.
-
-Section 4 – Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
-
- a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only;
-
- b. if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section 3(b); and
-
- c. You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
-For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
-
-Section 5 – Disclaimer of Warranties and Limitation of Liability.
-
- a. Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.
-
- b. To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.
-
- c. The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
-
-Section 6 – Term and Termination.
-
- a. This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
-
- b. Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
-
- 1. automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
-
- 2. upon express reinstatement by the Licensor.
-
- For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
-
- c. For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
-
- d. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
-
-Section 7 – Other Terms and Conditions.
-
- a. The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
-
- b. Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
-
-Section 8 – Interpretation.
-
- a. For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
-
- b. To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
-
- c. No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
-
- d. Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
-
-Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at creativecommons.org/policies, Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.
-
-Creative Commons may be contacted at creativecommons.org.
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ Copyright (C)
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+.
diff --git a/LLEGIU-ME b/LLEGIU-ME
index 9147255..6867c1e 100644
--- a/LLEGIU-ME
+++ b/LLEGIU-ME
@@ -1,8 +1,9 @@
-bot plus v0.5.5β
+bot plus v0.4.4β
autor: @bonobo@mastodont.cat
+( β )( α )
La utilitat agafa una font xml/rss i fa publicacions a mastodon
Està escrit amb php i utilitza elements de bash de linux.
diff --git a/bot_plus.php b/bot_plus.php
index b42bc11..7ff740b 100644
--- a/bot_plus.php
+++ b/bot_plus.php
@@ -1,3 +1,4 @@
+#!/usr/bin/php
lfile("/var/log/mastodon_bot.log");
$log->lfile("".$log_fitxer."");
if ( ($log_detall == "DETALLAT") || ($log_detall == "COMPLET") ) {
$log -> lwrite ("INICIE ".$bot_nom." ".$bot_versio."");
$log -> lwrite ("Entre a ".$lloc." per a iniciar el procés.");
-} else {
- $log -> lwrite ("INICIE ".$bot_nom." ".$bot_versio."");
+} else { $log -> lwrite ("INICIE ".$bot_nom." ".$bot_versio."");
+ if($mem_on == 1) { $log -> lwrite ( mostra_us_memoria()." ".mostra_pic_memoria() ); }
}
// guarda la opció de visib_tut a un fitxer
// Escriu la opció de visib_tut al fitxer (cal per reiniciar les opcions de visib_tut de les publicacions)
@@ -33,10 +33,11 @@ if ( ($log_detall == "DETALLAT") || ($log_detall == "COMPLET") ) {
fwrite($vis_escr, $visib_tut);
fclose($vis_escr);
-
// bucle de microsites
$pt = 0;
-$f = 0;
+$pr = 0;
+$f = 0;
+
// Nombre segons les fonts. (1,2 o 3 màxim definides a cfg primer)
for ($f = 0; $f<$fitxers_nombre; $f++) {
if ($f == 0) { $fitxer = $fitxer0; }
@@ -46,13 +47,7 @@ for ($f = 0; $f<$fitxers_nombre; $f++) {
// Obtenim la font XML/RSS 2.0
$feed = new ExportRSS($fitxer , "2.0");
$channel = $feed->get_channel_data();
- // fer detecció de la errada i enviar un correu si falla.
-/**
- if($act_correu == 1) {
- $msg = "Errada en obtindre font RSS".>$f."";
- enviaCorreu($elmeucompte,"| ".$bot_nom." v".$bot_versio." |",$msg,$elremitent);
- }
-**/
+
// variables per a fer la matriu del que arriba del fitxer XML/RSS 2.0
$i = 0;
$j = 0;
@@ -66,7 +61,6 @@ for ($f = 0; $f<$fitxers_nombre; $f++) {
$enllac = $item['link'];
// prepare els filtres per generar la matriu
// filtre les URL que continguen estes paraules
-// (str_contains($enllac,"programes")) ||
if ( (str_contains($enllac, $p0)) ||
(str_contains($enllac, $p1)) ||
(str_contains($enllac, $p2)) ||
@@ -84,12 +78,13 @@ for ($f = 0; $f<$fitxers_nombre; $f++) {
(str_contains($enllac, $p14)) ||
(str_contains($enllac, $p15)) ||
(str_contains($enllac, $p16)) ) {
- if ( (strpos($enllac,$np0) == false)||(strpos($enllac,$np1)) ) {
+ if ( (strpos($enllac,$np0) == false)||
+ (strpos($enllac,$np1) == false ) ) {
$tria = 1;
$n++;
- } else {
- $tria = 0;
}
+ else { $tria = 0; }
+
} else { $tria = 0; }
//genere la matriu amb les dades filtrades
if ($tria == 1) {
@@ -123,137 +118,106 @@ for ($f = 0; $f<$fitxers_nombre; $f++) {
}
if (count($llista) === 0) {
- $log->lwrite("ERRADA: no he pugut generar la matriu de la font RSS. Acabe esta execució.");
+ $log->lwrite("ERRADA: no he pugut generar la matriu de la font RSS".$f.". Bote a les funcions activades. - ".__LINE__);
+ $log -> lwrite ( mostra_us_memoria()." ".mostra_pic_memoria()." - ".__LINE__ );
$errada_tecnica = shell_exec("/usr/bin/php -f ".$lloc."/utils/bot_plus_erradatecnica.php ".$lloc."");
- $log -> lwrite ("FINAL!! ".$bot_nom." ".$bot_versio."");
- exit;
+// enviaCorreu($elmeucompte,"| ".$bot_nom." v".$bot_versio." |",$msg,$elremitent);
+ if ($pt == 0) { goto benvinguda; } else { goto retallar; }
}
-// a voltes (?!) el fitxer registre queda buit. No sé el motiu.
+// a voltes (?!) el fitxer registre queda buit o perd línies. Ignore el motiu. (Manca de memòria?)
// per evitar-ho verifique el tamany i si és 0 o menor de max_linies inclou les darreres de la matriu llevat de la primera
$reg_tam = filesize("".$lloc."/fitxers/dates.txt");
$reg_lin = count(file("".$lloc."/fitxers/dates.txt"));
+$reg_lin_bak = count(file("".$lloc."/fitxers/dates.bak"));
-if (($reg_tam == 0) || ($reg_lin < ($max_linies-$max_linies_ad)) ) {
-$log -> lwrite ("ALERTA! El fitxer de dates te ".$reg_lin." linies. Cal posar dates abans de la comparació.");
-$recuperar = 1;
-} else { $recuperar = 0; }
-// if (($reg_tam == 0) || ($reg_lin < ($max_linies-$max_linies_ad)) ) {
- if ($recuperar == 1) {
-// $log -> lwrite ("ALERTA! El fitxer de dates te ".$reg_lin." linies. Cal posar dates abans de la comparació.");
-// per recuperar dades de les diferents fonts rss ?
- $reg_lin = count(file("".$lloc."/fitxers/dates.txt"));
- if ($reg_lin < ($max_linies-10)) {
- $c = 1;
+//if ( ($reg_tam == 0) || ($reg_lin < ($max_linies-$max_linies_ad)) || ($reg_lin < ($reg_lin_bak)) ) {
+if ( ($reg_tam == 0) || ($reg_lin < ($reg_lin_bak)) ) {
+$log -> lwrite ("ALERTA! El fitxer de dates te ".$reg_lin." | ".$reg_lin_bak." linies. Cal posar dates abans de la comparació. - ".__LINE__);
+
+ if ( $reg_lin < $max_linies ) {
// guarda les dates de les publicació de la matriu en el dates.txt
// utilitze $j que és el comptador de les dades de la matriu ja filtrada si no fa registres buits
for( $c = 1; $c<$j ; $c++ ) {
$escriu_magatzem = fopen($lloc . "/fitxers/dates.txt", "a") or die("No puc escriure al registre!");
fwrite($escriu_magatzem, strtotime($llista[$c]['pub'])." ".$llista[$c]['pub']."\n");
fclose($escriu_magatzem);
- //$log -> lwrite ("Escrita linia ".$c." data ".strtotime($llista[$c]['pub'])." ".$llista[$c]['pub']." ");
}
-// }
// recuperar la còpia de seguretat
$copia_seguretat_rec = shell_exec("cat ".$lloc."/fitxers/dates.bak >> ".$lloc."/fitxers/dates.txt");
-// $copia_seguretat_rec_url = shell_exec("cat ".$lloc."/fitxers/urls_pub.bak >> ".$lloc."/fitxers/urls_pub.txt");
- }
- } else {
-// $log -> lwrite ("El fitxer registre OK.");
-// $log -> lwrite("INFO: comprovar: ".(($resposta_comprovar == 0)?"correcte":"ERRADA")." - url_hist: ".((($url_hist!=null) )?"correcte":"ERRADA")."");
- if ( ($log_detall == "DETALLAT") || ($log_detall == "COMPLET") ) {
-// echo "El fitxer de registre té un tamany de ".$reg_tam." bytes.";
- $log -> lwrite ("El fitxer de registre té tamany de ".$reg_tam." bytes.");
}
+} else {
+ if ( ($log_detall == "DETALLAT") || ($log_detall == "COMPLET") ) {
+ $log -> lwrite ("El fitxer de registre té tamany de ".$reg_tam." bytes.");
}
-
-$url_tam = filesize("".$lloc."/fitxers/urls_pub.txt");
+}
$url_lin = count(file("".$lloc."/fitxers/urls_pub.txt"));
-$url_tam_b = filesize("".$lloc."/fitxers/urls_pub.bak");
+$url_tam = filesize("".$lloc."/fitxers/urls_pub.txt");
$url_lin_b = count(file("".$lloc."/fitxers/urls_pub.bak"));
+$url_tam_b = filesize("".$lloc."/fitxers/urls_pub.bak");
- if ( ($url_tam == 0) || ($url_lin < (($max_linies+$max_linies_ad)-10)) ) {
- $log -> lwrite ("ALERTA! El fitxer de url te ".$url_lin." linies. Cal posar-ne més.");
- if ($url_lin_b >= $url_lin) {
- $copia_seguretat_rec_url = shell_exec("cat ".$lloc."/fitxers/urls_pub.bak >> ".$lloc."/fitxers/urls_pub.txt");
- $c = 1;
- // guarda les dates de les publicació de la matriu en el dates.txt
- // utilitze $j que és el comptador de les dades de la matriu ja filtrada si no fa registres buits
- for( $c = 1; $c<$j ; $c++ ) {
- $escriu_url = fopen($lloc . "/fitxers/urls_pub.txt", "a") or die("No puc escriure al registre!");
- fwrite($escriu_url, $llista[$c]['enllac']."\n");
- fclose($escriu_url);
- //$log -> lwrite ("Escrita linia ".$c." data ".strtotime($llista[$c]['pub'])." ".$llista[$c]['pub']." ");
- }
- } else {
- if ( ($log_detall == "DETALLAT") || ($log_detall == "COMPLET") ) {
- $log -> lwrite ("El fitxer de urls té un tamany de ".$url_tam." bytes.");
- }
- }
+if ( ($url_tam == 0) || ($url_lin < $url_lin_b) ) {
+//if ( $url_lin < ($max_linies+$max_linies_ad) ) {
+ $log -> lwrite ("ALERTA! El fitxer de url te ".$url_lin." | ".$url_lin_b." linies. Cal posar-ne més. - ".__LINE__);
+ $eix_urlsr = array();
+ $urlsr = exec("php -f ".$lloc."/utils_cli/bot_plus_urls_json_cli_refer.php ".$lloc, $eix_urlsr, $resp_urlsr);
+ if ( $urlsr != 0 ){
+ $log -> lwrite("INFO: recuperar url: ".(($resp_urlsr == 0)?"correcte":"ERRADA")." - ".__LINE__);
}
+
+ if ( ($log_detall == "DETALLAT") || ($log_detall == "COMPLET") ) {
+ $url_tam = filesize("".$lloc."/fitxers/urls_pub.txt");
+ $log -> lwrite ("El fitxer de urls té un tamany de ".$url_tam." bytes.");
+ }
+// final recuperar
+}
+
// generar cadena comprovar amb les dates recuperades
-// $comprovar = shell_exec("cat ".$lloc."/fitxers/dates.txt");
$comprovar = exec("cat ".$lloc."/fitxers/dates.txt",$eixida_comprovar,$resposta_comprovar);
$comprovar = implode(" ",$eixida_comprovar);
-// $comp_bo = is_string($comprovar);
-// $log -> lwrite("valor comp_bo: ".$comp_bo."");
+
$url_hist = shell_exec("cat ".$lloc."/fitxers/urls_pub.txt");
$url_hist = preg_replace('/[^A-Za-z0-9\-]/','',$url_hist);
$url_hist = preg_replace('/https/',' ',$url_hist);
-//// $log -> lwrite("INFO: comprovar: ".((($comprovar !== null)||($comprovar !== false))?"correcte":"ERRADA")." - url_hist: ".((($url_hist!=null) )?"correcte":"ERRADA")."");
-//// $log -> lwrite("INFO: comprovar: ".((($resposta_comprovar == 0)&&($comp_bo == 1))?"correcte":"ERRADA")." - url_hist: ".((($url_hist!=null) )?"correcte":"ERRADA")."");
-// $log -> lwrite("INFO: comprovar: ".(($resposta_comprovar == 0)?"correcte":"ERRADA")." - url_hist: ".(($url_hist!=null)?"correcte":"ERRADA")."");
-
- $reg_fit = "".$lloc."/fitxers/dates.txt";
- $reg_lin = count(file($reg_fit));
- if ( ($log_detall == "COMPLET") || ($log_detall == "DETALLAT") ) {
- $log -> lwrite ("Abans ".$reg_fit." té ".$reg_lin." linies.");
- }
// cadena per trobar la data de les darreres publicades
// si troba la cadena amb strpos NO publica, si no la troba, PUBLICA
- $c = 0;
- $n = $j-1;
- $w = 0;
- $p = 0;
+ $c = 0;
+ $k = 0;
+ $n = $j-1;
+ $p = 0;
+ $w = 0;
$verifica = 0;
for( $c = 0; $c<$n ; $c++ ) {
+ // variables (en proves)
+ $publicat = $llista[$c]['pub'];
+ $publicat_str = strtotime($llista[$c]['pub']);
+ $titol = trim($llista[$c]['titol']);
+ $descripcio = trim($llista[$c]['descripcio']);
+ $enllac = $llista[$c]['enllac'];
// cadena numerica de temps per comparar
$rss_ara = strtotime($llista[$c]['pub']);
- $rssu_ara = $llista[$c]['enllac'];
+ $rssu_ara = trim($llista[$c]['enllac']);
$rssu_ara = preg_replace('/[^A-Za-z0-9\-]/','',$rssu_ara);
$rssu_ara = preg_replace('/https/',' ',$rssu_ara);
- $rsst_ara = $llista[$c]['titol']." ".$llista[$c]['descripcio']." ".$llista[$c]['enllac']." ";
+// $rsst_ara = trim($llista[$c]['titol'])." ".trim($llista[$c]['descripcio'])." ".$llista[$c]['enllac']." ";
+// $descripcio = preg_replace("/\\\\n/","'", $descripcio);
+ $descripcio = str_replace("\n"," ", $descripcio);
+ $rsst_ara = $titol." ".$descripcio." ".$enllac." ";
if ( ($log_detall == "COMPLET") || ($log_detall == "DETALLAT") ) {
-// echo "rss_ara: ".$rss_ara."\n";
$log -> lwrite ("Contingut de rss_ara: ".$rss_ara);
}
-// $verifica = strpos($comprovar,$rss_ara);
$verifica = strpos($comprovar,$rss_ara);
$mira_url = strpos($url_hist,$rssu_ara);
if ( ($log_detall == "COMPLET") ) {
-// echo "Contingut de verifica num: ".$c." - ".$verifica."\n";
$log -> lwrite ("Contingut de verifica num: ".$c." - ".$verifica);
$log -> lwrite ("Contingut de mira_url num: ".$c."|".$rssu_ara."|".$mira_url);
}
- // Obre el fitxer del compte per trobar el nombre guardat i generar new_count (si no fa error)
- $compt_lle = fopen($lloc . "/fitxers/compte_pub.txt", "r") or die("No puc obrir el contador!");
- $compt_dar = fread($compt_lle,filesize($lloc . "/fitxers/compte_pub.txt"));
- if ( ($log_detall == "COMPLET") || ($log_detall == "DETALLAT") ) {
-// echo "
Últim registre: " . $compt_dar;
- $log -> lwrite ("Últim registre: " . $compt_dar . " (5)");
- }
- fclose($compt_lle);
- $compt_nou = $compt_dar;
- // Defineix la visib_tut segons el contador
- $count_factor = $compt_nou/$public_freq;
-// incloure aqui filtre d'un mes per publicar (ara on està fa falsos positius(?)
+ // incloure aqui filtre d'un mes per publicar (ara on està fa falsos positius(?)
if (($verifica !== false) || ($mira_url !== false)) {
-// if ($verifica !== false) {
- // posar aqui la generació de count_factor?
-// echo "No publica num : ".$c." ".$llista[$c]['titol']."\n";
+
if ( ($log_detall == "COMPLET") || ($log_detall == "DETALLAT") ) {
$log -> lwrite ("No publica num: ".$c." ".$llista[$c]['titol']);
}
@@ -263,79 +227,128 @@ $url_lin_b = count(file("".$lloc."/fitxers/urls_pub.bak"));
}
}
} else {
-// echo "PUBLICA -> (rss".$f.") nº:".$c." ".$llista[$c]['titol']."\n";
$log -> lwrite ("PUBLICA (rss".$f.") num: ".$c." ".$llista[$c]['titol']);
+
+ // variables a utilitzar
+ $titol = trim($llista[$c]['titol']);
+ $descripcio = trim($llista[$c]['descripcio']);
+ $descripcio = str_replace("\n"," ",$descripcio);
+ $enllac = trim($llista[$c]['enllac']);
+ $pub = $llista[$c]['pub'];
+ $pub_str = $rss_ara;
+ $etiqueta = MstEtiquetes($rsst_ara);
+ $etiqueta_pub = substr($etiqueta,0,-4);
+ $fontrss = $fitxer;
+
//guarda la data de la publicació en el dates.txt
$escriu_magatzem = fopen($lloc . "/fitxers/dates.txt", "a") or die("No puc escriure la data!");
- fwrite($escriu_magatzem, strtotime($llista[$c]['pub'])." ". $llista[$c]['pub']."\n");
+// fwrite($escriu_magatzem, $rss_ara." ". $llista[$c]['pub']."\n");
+ fwrite($escriu_magatzem, $rss_ara." ". $pub."\n");
fclose($escriu_magatzem);
+ usleep(100000);
+
+ $fp_oratge = preg_replace('/[^A-Za-z0-9\-]/','',$enllac);
+ $fp_oratge = preg_replace('/https/',' ',$fp_oratge);
+ $filt_oratge = strpos($fp_oratge,"previsioprevisio");
+ if($filt_oratge == false) {
//guarda la URL de la publicació en el urls_pub.txt
$escriu_url = fopen($lloc . "/fitxers/urls_pub.txt", "a") or die("No puc escriure la url!");
- fwrite($escriu_url, $llista[$c]['enllac']."\n");
+// fwrite($escriu_url, $llista[$c]['enllac']."\n");
+ fwrite($escriu_url, $enllac."\n");
fclose($escriu_url);
+ usleep(10000);
+ } else {
+// $log -> lwrite ("filt_oratge: ".$filt_oratge." línia 288");
+ }
+
+// $filtre_pilota = strpos($rssu_ara,"pilota");
+// if( ((strtotime("now") - $rss_ara) <= $antic_max) && ($filtre_pilota !== false) ) {
+ if( ((strtotime("now") - $rss_ara) <= $antic_max) ) {
+
+ // Obre el fitxer del compte per trobar el nombre guardat i generar new_count (si no fa error)
+ $compt_lle = fopen($lloc . "/fitxers/compte_pub.txt", "r") or die("No puc obrir el contador!");
+ $compt_dar = fread($compt_lle,filesize($lloc . "/fitxers/compte_pub.txt"));
+ if ( ($log_detall == "COMPLET") || ($log_detall == "DETALLAT") ) {
+ $log -> lwrite ("Últim registre: " . $compt_dar . " (5)");
+ }
+ fclose($compt_lle);
+ $compt_nou = $compt_dar;
+
// genera la publicació (activació d'etiquetes o no)
if ($act_etiquetes == 1) {
- $publicacio = $llista[$c]['titol']." \n".$llista[$c]['descripcio']." ".MstEtiquetes($rsst_ara)." \n".$llista[$c]['enllac']."";
+// $publicacio = trim($llista[$c]['titol'])."\n".trim($llista[$c]['descripcio'])."\n".MstEtiquetes($rsst_ara)."\n".$llista[$c]['enllac']."";
+ $publicacio = $titol."\n".$descripcio."\n".$etiqueta_pub."\n".$enllac."";
$log -> lwrite("Etiqueta triada: ".MstEtiquetes($rsst_ara)."");
} else {
- $publicacio = $llista[$c]['titol']."\n".$llista[$c]['descripcio']."\n".$llista[$c]['enllac']."";
+ $publicacio = $titol."\n".$descripcio."\n".$enllac."";
$log -> lwrite("Etiqueta proposada: ".MstEtiquetes($rsst_ara)."");
}
- // Defineix la visib_tut segons el nombre indicat en la configuració
- // Obre el fitxer del compte per trobar el nombre guardat
- $compt_nou=$compt_dar+1;
-// echo "
Nou registre: " . $compt_nou;
- if ( ($log_detall == "COMPLET") || ($log_detall == "DETALLAT") ) {
- $log -> lwrite ("Nou registre: " .$compt_nou . " (6)");
- }
- // Escriu el nou nombre al fitxer
- $compt_esc = fopen($lloc . "/fitxers/compte_pub.txt", "w") or die("No puc obrir el contador!");
- if ( ($log_detall == "DETALLAT") ) {
- $log -> lwrite ($lloc . "/fitxers/compte_pub.txt");
- }
- fwrite($compt_esc, $compt_nou);
- fclose($compt_esc);
- // Defineix la visib_tut segons el contador
- $count_factor = $compt_nou/$public_freq;
- if ( ($log_detall == "DETALLAT") ) {
- $log -> lwrite ("count_factor: " .$count_factor. " (8)");
- $log -> lwrite ("resultat filtre: ".is_int($count_factor)." (9)");
- }
- // reinicia la opció de visib_tut des del fitxer de txt
- $vis_ll = fopen($lloc . "/fitxers/compte_vis.txt", "r") or die("No puc obrir el contador!");
- $vis_lect = fread($vis_ll,filesize($lloc . "/fitxers/compte_vis.txt"));
- if ( ($log_detall == "COMPLET") || ($log_detall == "DETALLAT") ) {
-// echo "
Visibilitat des del fitxer: " . $vis_lect;
- $log -> lwrite ("Visibilitat des del fitxer: " . $vis_lect . " (10)");
- }
- fclose($vis_ll);
- // recupera segons la configuració
- $visib_tut = $vis_lect;
- if ( ($log_detall == "COMPLET") || ($log_detall == "DETALLAT") ) {
- $log -> lwrite("Variable visib_tut cfg: ".$visib_tut."");
- }
- if(is_int($count_factor)){
- if ( ($log_detall == "COMPLET") || ($log_detall == "DETALLAT") ) {
-// echo "
Visibilitat: " . $visib_tut ."\n";
- $log -> lwrite ("Visibilitat: " .$visib_tut . " (11)");
+ // Defineix la visib_tut segons el contador
+ $count_factor = $compt_nou/$public_freq;
+ if ( ($log_detall == "DETALLAT") ) {
+ $log -> lwrite ("count_factor: " .$count_factor. " (8)");
+ $log -> lwrite ("resultat filtre: ".is_int($count_factor)." (9)");
}
- }else{
- $visib_tut="unlisted";
+
+ // reinicia la opció de visib_tut des del fitxer de txt
+ $vis_ll = fopen($lloc . "/fitxers/compte_vis.txt", "r") or die("No puc obrir el contador!");
+ $vis_lect = fread($vis_ll,filesize($lloc . "/fitxers/compte_vis.txt"));
if ( ($log_detall == "COMPLET") || ($log_detall == "DETALLAT") ) {
-// echo "
Visibilitat: " . $visib_tut ."\n";
- $log -> lwrite ("Visibilitat: " .$visib_tut . " (12)");
+ $log -> lwrite ("Visibilitat des del fitxer: " . $vis_lect . " (10)");
+ }
+ fclose($vis_ll);
+
+ // recupera segons la configuració
+ $visib_tut = $vis_lect;
+ if ( ($log_detall == "COMPLET") || ($log_detall == "DETALLAT") ) {
+ $log -> lwrite("Variable visib_tut cfg: ".$visib_tut."");
+ }
+ if(is_int($count_factor)){
+ if ( ($log_detall == "COMPLET") || ($log_detall == "DETALLAT") ) {
+ $log -> lwrite ("Visibilitat: " .$visib_tut . " (11)");
+ }
+ }else{
+ $visib_tut="unlisted";
+ if ( ($log_detall == "COMPLET") || ($log_detall == "DETALLAT") ) {
+ $log -> lwrite ("Visibilitat: " .$visib_tut . " (12)");
}
}
- if( (strtotime("now") - $rss_ara) < 1900800 ) {
+ //registre json (EN PROVES)
+ $fitxer_json = $lloc."/fitxers/registre.json";
+ //matriu a partir del fitxer
+ $json_dec = json_decode(file_get_contents($fitxer_json), true);
+ $no_rep = in_array($pub_str, array_column($json_dec,"pub_str"));
+ $no_url = in_array($pub_str, array_column($json_dec,"enllac"));
+ $ara = strtotime("now");
+ $ara_reg = date('d/m/Y H:i:s',$ara);
+
+ if(($no_rep == false)||($no_url == false)) {
+ $etiqueta = MstEtiquetes($rsst_ara);
+ array_push($json_dec,
+ [
+ "titol" => (string)$titol,
+ "descripcio" => (string)$descripcio,
+ "enllac"=>(string)$enllac,
+ "etiqueta"=>(string)$etiqueta,
+ "pub"=>(string)$pub,
+ "pub_str"=>(int)$pub_str,
+ "publicada"=>(string)$ara_reg,
+// "media"=>(string)$media
+// "media_tit"=>(string)$media_titol,
+// "media_img"=>(string)$media_img
+ "font"=>$fontrss
+ ]);
+ $k++;
+// print_r($json_dec);
+ $fes_json = json_encode($json_dec, JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);
+ $escriu_f_json = fopen($lloc."/fitxers/registre.json", "w") or die("No puc escriure al registre!");
+ fwrite($escriu_f_json, $fes_json);
+ fclose($escriu_f_json);
+ if($mem_net == 1) { $json_dec = null; $fes_json = null; unset($json_dec, $fes_json); }
// Publica a Mastodon
- // passat per cfg
-// $headers = [
-// "Authorization: Bearer " . $token
-// ];
-
$dades_tut = array(
"status" => $publicacio,
"language" => $llengua,
@@ -344,51 +357,58 @@ $url_lin_b = count(file("".$lloc."/fitxers/urls_pub.bak"));
PublicaMissatge($base_url,$headers,$dades_tut);
+ if($control_memoria == 1) { $log -> lwrite ( "Publicació: ".mostra_us_memoria()." ".mostra_pic_memoria()." - ".__LINE__ ); }
+
+ } else { $log->lwrite("INFO: Ja ha estat registrada."); }
+
+ // Calcula i escriu el nou nombre al fitxer
+ $compt_nou++;
+ $compt_esc = fopen($lloc . "/fitxers/compte_pub.txt", "w") or die("No puc obrir el contador!");
+ if ( ($log_detall == "DETALLAT") ) {
+ $log -> lwrite ($lloc . "/fitxers/compte_pub.txt");
+ }
+ fwrite($compt_esc, $compt_nou);
+ fclose($compt_esc);
$p++;
$pt++;
sleep($espera_tut+30);
+ // final if temps màxim
}
+ else { $log -> lwrite ("NO publique per tindre data superior al límit."); usleep(100000); $pr++; }
+
+ if($control_memoria == 1) { $log -> lwrite ( "NO publique: ".mostra_us_memoria()." ".mostra_pic_memoria()." - ".__LINE__ ); }
$w++;
- // final if 1 mes
}
+
+ // dronometre
+ $temps_pub = microtime(true);
+ $durad_pub = $temps_pub - $temps;
+ if($durad_pub >= $temp_max_pub ) { goto acabar; }
//final publicació (else)
}
- // dronometre
+ // cronometre
$temps2 = microtime(true);
$duradab = $temps2 - $temps1;
if ($p >= 1) {
// escriu la data de la darrera publicació
$data_tam = filesize($lloc."/fitxers/data_pub.txt");
-// echo "data_tam: ".$data_tam."\n";
$data_esc = fopen($lloc . "/fitxers/data_pub.txt", "w+") or die("No puc obrir el contador!");
$data_ant = fread($data_esc,filesize("".$lloc ."/fitxers/data_pub.txt"));
- $data_nova = strtotime("now");
-
+// $data_nova = strtotime("now");
+ $data_nova = $ara;
fwrite($data_esc, $data_nova);
fclose($data_esc);
$log -> lwrite("data_pub actualitzada: ".$data_nova );
-// TriaOpcio($data_nova);
-// $log -> lwrite("prova de TriaOpcio: ".TriaOpcio($data_nova)."" );
-
// $log -> lwrite("data_pub actualitzada: ".$data_nova." | ".date("d-m-Y H:i:s",$data_nova) );
-/**
- // Torna a llegir el fitxer data_pub (moure davat execució?)
- $data_lle = fopen($lloc . "/fitxers/data_pub.txt", "r") or die("No puc obrir la darrera data!");
- $data_ant = fread($data_lle,filesize($lloc . "/fitxers/data_pub.txt"));
- $data_com = strtotime($espera_coment);
- $data_ara = strtotime("now");
- $data_dif = ($data_com - $data_ara);
- $data_ina = ($data_ara - $data_ant);
- fclose($data_lle);
-**/
// per tallar l'execució si dura més de 10 minuts i evita solapar execucions
- if ($duradab > 540) { exit; }
+ if ($duradab > $temp_max_pub) { goto acabar; }
if($duradab < 60) { $duradab = round($duradab,4); $nomt = "segons"; }
else { $duradab = date("i:s",$duradab); $nomt = "minuts"; }
$log->lwrite("He publicat ".$p." ".(($p<>1)?"novetats":"novetat")." (rss".$f.") en ".$duradab." ".$nomt."." );
+ if( ($control_memoria == 0)&&($mem_net == 0) ) { $log -> lwrite ( "rss".$f." - ".mostra_us_memoria()." ".mostra_pic_memoria()." - ".__LINE__ ); }
if ( ($log_detall == "COMPLET") || ($log_detall == "DETALLAT") ) {
// $log -> lwrite("Temps publicació: ".$duradab." ".($duradab < 60)? "segons.":"minuts.")."" );
$log -> lwrite("Temps publicació: ".$duradab." ".$nomt."." );
@@ -399,92 +419,153 @@ $url_lin_b = count(file("".$lloc."/fitxers/urls_pub.bak"));
$log -> lwrite ("NO he publicat res (rss".$f.").");
}
}
-
// final for multimicrosite
}
-/**
-// dronometre
-$temps2 = microtime(true);
-$duradab = $temps2 - $temps1;
-$log->lwrite("Temps RSS".$f." i publicació: ".round($duradab,4)."");
-**/
+retallar:
+if($pt == 0) {
+// dronometre en cas de no publicar
+ $temps2 = microtime(true);
+ $duradab = $temps2 - $temps;
+ if($duradab < 60) { $duradab = round($duradab,4); $nomt = "segons"; }
+ else { $duradab = date("i:s",$duradab); $nomt = "minuts"; }
+ $log->lwrite("Temps de ".$f." RSS : ".$duradab."" );
+
+ if( ($control_memoria == 0)&&($mem_net == 0) ) { $log -> lwrite ( "Després rss: ".mostra_us_memoria()." ".mostra_pic_memoria()." - ".__LINE__ );
+ } else {
+ $llista = null; $duradaa = null; $duradab = null; $comprovar = null; $dades_tut = null; unset($llista, $comprovar, $dades_tut);
+ $log -> lwrite ( "Després rss amb neteja ".mostra_us_memoria()." ".mostra_pic_memoria()." - ".__LINE__ );
+ }
+ //goto benvinguda;
+}
+//if($pt>=1) {
//retalle a un màxim de $max_linies
$registre = "".$lloc."/fitxers/dates.txt";
-$linies = count(file($registre));
+$registre_b = "".$lloc."/fitxers/dates.bak";
$urls_reg = "".$lloc."/fitxers/urls_pub.txt";
-$lin_urls = count(file($urls_reg));
+$urls_reg_b = "".$lloc."/fitxers/urls_pub.bak";
+$linies = count(file($registre));
+$linies_b = count(file($registre_b));
+$url_lin = count(file($urls_reg));
+$url_tam = filesize($urls_reg);
+$url_lin_b = count(file($urls_reg_b));
+$url_tam_b = filesize($urls_reg_b);
+$fitxerreg = $lloc."/fitxers/registre.json";
+$json_dec = json_decode(file_get_contents($fitxerreg), true);
+$maxim = count($json_dec);
-if ( ($linies > $max_linies) || ($lin_urls > ($max_linies+$max_linies_ad)) || ($pt >= 1) ){
-// actualitze el fitxer de registre
+// if ( ($linies > $max_linies) || ($url_lin > ($max_linies+$max_linies_ad)) || ($url_lin > $url_lin_b) || ($maxim > ($max_linies+$max_linies_ad)) && ($pt >= 1) ){
+if ( ($linies > $max_linies) || ($url_lin > ($max_linies+$max_linies_ad)) || ($url_lin > $url_lin_b) || ($maxim > ($max_linies+$max_linies_ad)) ){
+// retalle el fitxer de registre
// per a que siguen les primeres cal canviar tail per head
-// retalla dates
- $neteja = shell_exec("tail -".$max_linies." ".$lloc."/fitxers/dates.txt | sort | uniq | tee ".$lloc."/fitxers/dates.txt");
-// $neteja = exec("tail -".$max_linies." ".$lloc."/fitxers/dates.txt | sort | uniq | tee ".$lloc."/fitxers/dates.txt", $eixida_n, $resposta_n);
- if ( ($neteja == null)||($neteja == false) ) {
-// $log -> lwrite("ALERTA: Ha fallat la neteja de dates.txt");
- $log -> lwrite("INFO: neteja: ".(($neteja != null)?"correcte":"ERRADA")."");
- $msg = "INFO: neteja: ".(($neteja != null)?"correcte":"ERRADA")."";
- if($act_correu == 1) {
- enviaCorreu($elmeucompte,"| ".$bot_nom." v".$bot_versio." |",$msg,$elremitent);
+ if ( ($linies > $max_linies) ){
+ if ( ($log_detall == "COMPLET") || ($log_detall == "DETALLAT") ) {
+ $log -> lwrite ("Retalle el fitxer de dates.");
+ if ( ($log_detall == "COMPLET") ) {
+ $log -> lwrite ("El fitxer de dates té ".$linies." línies, el retalle i deixe les ".$max_linies." darreres dates.");
}
+ }
+
+// retalla dates
+ $fitx = new SplFileObject($lloc."/fitxers/dates.txt", "r");
+ $fitx->seek(PHP_INT_MAX);
+ $last_line = $fitx->key();
+ $lines = new LimitIterator($fitx, $last_line - $max_linies, $last_line); //n being non-zero positive integer $max_linies
+// print_r(iterator_to_array($lines));
+ // Iterate each element
+ $it = iterator_to_array($lines);
+
+ $escriu_magatzem = fopen($lloc . "/fitxers/dates.txt", "w") or die("No puc escriure la data!");
+ foreach($it as $ele){
+// echo nl2br($ele . "\n");
+ fwrite($escriu_magatzem, $ele);
+// usleep(100000);
}
+ fclose($escriu_magatzem);
+
// còpia de seguretat dates
- $dat_a = shell_exec("wc -l ".$lloc."/fitxers/dates.txt | awk '{print $1}'");
-// $dat_a = exec("wc -l ".$lloc."/fitxers/dates.txt | awk '{print $1}'", $eixida_dat_a, $resposta_dat_a);
- if ($dat_a == null) {
- $log -> lwrite("INFO: dat_a: ".(($dat_a != null)?"correcte":"ERRADA")."");
- }
- $dat_an = explode("\n", $dat_a);
- $dat_b = shell_exec("wc -l ".$lloc."/fitxers/dates.bak | awk '{print $1}'");
-// $dat_b = exec("wc -l ".$lloc."/fitxers/dates.bak | awk '{print $1}'", $eixida_dat_b, $resposta_dat_b);
- if ($dat_b == null) {
- $log -> lwrite("INFO: dat_b: ".(($dat_b != null)?"correcte":"ERRADA")."");
- }
- $dat_bn = explode("\n", $dat_b);
-// $log->lwrite("".$dat_an[0].":".$dat_bn[0]."");
- if ($dat_an >= $dat_bn) {
+
+// $log->lwrite("".$url_lin.":".$url_lin_b."");
+ if ($linies >= $linies_b) {
// $copia_seguretat_dat = shell_exec("sort ".$lloc."/fitxers/dates.txt > ".$lloc."/fitxers/dates.bak");
$copia_seguretat_dat = exec("cat ".$lloc."/fitxers/dates.txt > ".$lloc."/fitxers/dates.bak", $eixida_cs, $resposta_cs);
-// if (($copia_seguretat_dat !=null) || ($copia_seguretat_dat !=false)) {
-// $log -> lwrite("INFO: copia_seguretat_dat contesta: ".( (($copia_seguretat_dat != null)||($copia_seguretat_dat != false))?"correcte":"ERRADA")."");
- if ($resposta_cs !=0) {
- $log -> lwrite("INFO: copia_seguretat_dat: ".( (($resposta_cs == 0))?"correcte":"ERRADA")."");
+// if (($copia_seguretat_dat ==null) || ($copia_seguretat_dat ==false)) {
+ if ($resposta_cs != 0) {
+ $log -> lwrite("INFO: copia_seguretat_dat: ".( (($resposta_cs == 0))?"correcte":"ERRADA")." - ".__LINE__);
}
}
+ if ($mem_net == 1) { $url_lin = null; $url_lin_b = null; $urls_reg = null; $urls_reg_b = null; $eixida_cs =null; unset($url_lin, $url_lin_b, $urls_reg, $urls_reg_b, $eixida_cs); }
+ //final neteja i copia seguretat dates
+ }
+
+ if ( ($url_lin > ($max_linies+$max_linies_ad)) || ($maxim > ($max_linies+$max_linies_ad)) || ($url_tam > $url_tam_b) ){
// retalla urls
-// $net_url = exec("tail -".($max_linies + $max_linies_ad)." ".$lloc."/fitxers/urls_pub.txt | tee ".$lloc."/fitxers/urls_pub.txt", $eixida_nu,$resposta_nu);
- $net_url = shell_exec("tail -".($max_linies + $max_linies_ad)." ".$lloc."/fitxers/urls_pub.txt | tee ".$lloc."/fitxers/urls_pub.txt");
- if ( ($net_url == null)||($net_url == false) ){
- $log -> lwrite("INFO: net_url: ".(($net_url != null)?"correcte":"ERRADA")."");
- $msg = "INFO: net_url: ".(($net_url != null)?"correcte":"ERRADA")."";
+ $max_lin_url = $max_linies + $max_linies_ad;
+// $log -> lwrite ("max_lin_url: ".$max_lin_url );
+ $fitx = new SplFileObject($lloc."/fitxers/urls_pub.txt", "r");
+ $fitx->seek(PHP_INT_MAX);
+ $last_line = $fitx->key();
+ if(($last_line - $max_lin_url) >=1) {
+ $lines = new LimitIterator($fitx, $last_line - $max_lin_url, $last_line); //n being non-zero positive integer
+// print_r(iterator_to_array($lines));
+ // Iterate each element
+ $it = iterator_to_array($lines);
+
+ $escriu_magatzem = fopen($lloc . "/fitxers/urls_pub.txt", "w") or die("No puc escriure la data!");
+ foreach($it as $ele){
+// echo nl2br($ele . "\n");
+ fwrite($escriu_magatzem, $ele);
+// usleep(100000);
+ }
+ fclose($escriu_magatzem);
+ }
+
+/* $eixida_nu = array();
+ $net_url = exec("tail -".($max_linies + $max_linies_ad)." ".$lloc."/fitxers/urls_pub.txt | tee ".$lloc."/fitxers/urls_pub.txt", $eixida_nu, $resposta_nu);
+// $net_url = shell_exec("tail -".($max_linies + $max_linies_ad)." ".$lloc."/fitxers/urls_pub.txt | tee ".$lloc."/fitxers/urls_pub.txt");
+// $log -> lwrite("resposta_nu: ".$resposta_nu);
+ if ( $resposta_nu != 0 ){
+ $log -> lwrite("INFO: net_url: ".(($resposta_nu == 0)?"correcte":"ERRADA")." - ".__LINE__);
+ $log -> lwrite (print_r($eixida_nu));
if($act_correu == 1) {
+ $msg = "INFO: net_url: ".(($resposta_nu == 0)?"correcte":"ERRADA")." - ".__LINE__;
enviaCorreu($elmeucompte,"| ".$bot_nom." v".$bot_versio." |",$msg,$elremitent);
}
}
+*/
//fer còpia de seguretat urls
- $urls_a = shell_exec("wc -l ".$lloc."/fitxers/urls_pub.txt | awk '{print $1}'");
-// $urls_a = exec("wc -l ".$lloc."/fitxers/urls_pub.txt | awk '{print $1}'",$eixida_urls_a,$resposta_urls_a);
- if ($urls_a == null) {
- $log -> lwrite("INFO: urls_a: ".((($urls_a !=null)||($urls_a != false)) ?"correcte":"ERRADA")."");
- }
- $urls_an = explode("\n", $urls_a);
- $urls_b = shell_exec("wc -l ".$lloc."/fitxers/urls_pub.bak | awk '{print $1}'");
-// $urls_b = exec("wc -l ".$lloc."/fitxers/urls_pub.bak | awk '{print $1}'",$eixida_urls_a,$resposta_urls_b);
- if ($urls_b == null) {
- $log -> lwrite("INFO: urls_b: ".((($urls_b !=null)||($urls_b != false)) ?"correcte":"ERRADA")."");
- }
- $urls_bn = explode("\n", $urls_b);
- if ($urls_an >= $urls_bn) {
-// $copia_seguretat_url = shell_exec("cat ".$lloc."/fitxers/urls_pub.txt > ".$lloc."/fitxers/urls_pub.bak");
+// $log -> lwrite( $url_lin." : ".$url_lin );
+ if ($url_lin >= $url_lin_b) {
+ $eixida_csu = array();
$copia_seguretat_url = exec("cat ".$lloc."/fitxers/urls_pub.txt > ".$lloc."/fitxers/urls_pub.bak", $eixida_csu, $resposta_csu);
- if ($resposta_csu !=0) {
- $log -> lwrite("INFO: copia_seguretat_url: ".(($resposta_csu == 0)?"correcte":"ERRADA")."");
+// $log -> lwrite("resposta_csu: ".$resposta_csu);
+ if ($resposta_csu != 0) {
+ $log -> lwrite("INFO: copia_seguretat_url: ".(($resposta_csu == 0)?"correcte":"ERRADA")." - ".__LINE__);
+ $log -> lwrite (print_r($eixida_csu));
}
}
+
+ if($mem_net == 1) { $urls_lin = null; $urls_lin_b = null; $urls_reg = null; $urls_reg_b = null; $eixida_csu= null; unset($urls_lin, $urls_lin_b, $urls_reg, $urls_reg_b, $eixida_csu); }
+
+ if( $maxim > ($max_linies+$max_linies_ad) ) {
+ // retallar fitxer registre json
+ $json_dec = array_splice($json_dec,($maxim-($max_linies+$max_linies_ad)),$maxim);
+
+ $fes_json = json_encode($json_dec, JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);
+ $escriu_f_json = fopen($lloc."/fitxers/registre.json", "w") or die("No puc escriure al registre!");
+ fwrite($escriu_f_json, $fes_json);
+ fclose($escriu_f_json);
+ }
+// unset($json_dec, $linies, $url_lin);
+ if($mem_net == 1) { $json_dec = null; $linies = null; $url_lin = null; unset($json_dec,$linie,$url_lin); }
+ // final neteja urls i copia seguretat
+ }
+// }
+//final
} else {
echo "El fitxers de dates i urls OK.\n";
// $log -> lwrite ("Els fitxer de dates ".$cop_seg_dat." i el de urls ".$cop_seg_url.".");
+
}
// cronometre
$temps3 = microtime(true);
@@ -492,29 +573,23 @@ if ( ($linies > $max_linies) || ($lin_urls > ($max_linies+$max_linies_ad)) || ($
$duradad = $temps3 - $temps2;
$log -> lwrite("Temps retall registre: ".round($duradad,4)." segons.");
}
-// $neteja = shell_exec("tail -". $w ." " . $lloc . "/fitxers/dates.txt | tee ".$lloc."/fitxers/dates.txt");
- if ( ($log_detall == "COMPLET") || ($log_detall == "DETALLAT") ) {
-// echo "Retalle el registre.\n";
- $log -> lwrite ("Retalle el registre.");
- if ( ($log_detall == "COMPLET") ) {
-// echo "El fitxer de registre té ".$linies." línies, el retalle i deixe les ".$max_linies." darreres dates\n";
- $log -> lwrite ("El fitxer de registre té ".$linies." línies, el retalle i deixe les ".$max_linies." darreres dates.");
- }
- }
// per donar la benvinguda als nous seguidors
+benvinguda:
if ($act_bencom == 1) {
// $log -> lwrite("Arranque benvinguda.");
// $gracies = shell_exec("/usr/bin/php -f ".$lloc."/utils/bot_plus_benvinguda.php ".$lloc."");
$gracies = exec("/usr/bin/php -f ".$lloc."/utils/bot_plus_benvinguda.php ".$lloc."", $eixida_gr, $resposta_gr);
// per verificar que exec funciona correctament
if ($resposta_gr != 0) {
- $log -> lwrite("INFO: benvinguda: ".(($resposta_gr == 0)?"correcte":"ERRADA")."");
- $msg = "INFO: benvinguda: ".(($resposta_gr == 0)?"correcte":"ERRADA")."";
+ $log -> lwrite("INFO: benvinguda: ".(($resposta_gr == 0)?"correcte":"ERRADA")." - ".__LINE__);
if($act_correu == 1) {
+ $msg = "INFO: benvinguda: ".(($resposta_gr == 0)?"correcte":"ERRADA")."";
enviaCorreu($elmeucompte,"| ".$bot_nom." v".$bot_versio." |",$msg,$elremitent);
}
}
+ if($mem_net == 1) { $gracies = null; $msg = null; $temps3 = null; $duradad = null; unset($gracies); $log -> lwrite ( "amb neteja ".mostra_us_memoria()." ".mostra_pic_memoria()." - ".__LINE__ ); }
+ else { if($control_memoria == 1) { $log -> lwrite ( mostra_us_memoria()." ".mostra_pic_memoria()." - ".__LINE__ ); } }
}
$temps4 = microtime(true);
@@ -528,20 +603,31 @@ if ( ($linies > $max_linies) || ($lin_urls > ($max_linies+$max_linies_ad)) || ($
if ($act_mencio == 1) {
// $resp_mencio = shell_exec("/usr/bin/php -f ".$lloc."/utils/bot_plus_mencions.php ".$lloc);
$resp_mencio = exec("/usr/bin/php -f ".$lloc."/utils/bot_plus_mencions.php ".$lloc."", $eixida_menc, $resposta_menc);
-// per verificar que exit ha funcionat
+ // per verificar que exec ha funcionat
if ($resposta_menc !=0) {
- $log -> lwrite("INFO: mencions: ".(($resposta_menc == 0)?"correcte":"ERRADA")."");
- $msg = "INFO: mencions: ".(($resposta_menc == 0)?"correcte":"ERRADA")."";
+ $log -> lwrite("INFO: mencions: ".(($resposta_menc == 0)?"correcte":"ERRADA")." - ".__LINE__);
if($act_correu == 1) {
+ $msg = "INFO: mencions: ".(($resposta_menc == 0)?"correcte":"ERRADA")." - ".__LINE__;
enviaCorreu($elmeucompte,"| ".$bot_nom." v".$bot_versio." |",$msg,$elremitent);
}
}
+if($control_memoria == 1) { $log -> lwrite ( mostra_us_memoria()." ".mostra_pic_memoria()." - ".__LINE__ ); }
}
-// fer comentrais segons el temps d'inactivitat
-// calcul del temps d'inactivitat aqui(?)
+if ($act_impuls == 1) {
+ $com = exec("/usr/bin/php -f ".$lloc."/utils/bot_plus_impulsos.php ".$lloc." ", $eixida_imp, $resposta_imp);
+ // per verificar que exec ha funcionat
+ if ($resposta_imp != 0) {
+ $log -> lwrite("INFO: impulsos: ".(($resposta_imp == 0)?"correcte":"ERRADA")." - ".__LINE__);
+ if($act_correu == 1) {
+ $msg = "INFO: impulsos: ".(($resposta_imp == 0)?"correcte":"ERRADA")."\n".mostra_us_memoria()." ".mostra_pic_memoria()."" ;
+ enviaCorreu($elmeucompte,"| ".$bot_nom." v".$bot_versio." |",$msg,$elremitent);
+ }
+ }
+if($control_memoria == 1) { $log -> lwrite ( mostra_us_memoria()." ".mostra_pic_memoria()." - ".__LINE__ ); }
+}
-// activar comentari (private) als seguidors després d'un temps d'inactivitat
+// fer comentaris segons el temps d'inactivitat
// llegir data de la darrera publicació
$data_lle = fopen($lloc . "/fitxers/data_pub.txt", "r") or die("No puc obrir la darrera data!");
$data_ant = fread($data_lle,filesize($lloc . "/fitxers/data_pub.txt"));
@@ -551,23 +637,21 @@ if ($act_mencio == 1) {
$data_ina = ($data_ara - $data_ant);
fclose($data_lle);
-// per verificar dades enviades a bot_plus_comentaris
-// $log->lwrite("".$lloc."|".$data_ina."|".$data_dif."");
if ($act_coment == 1) {
-// $log -> lwrite("Estan activats els comentaris.");
if ( ($log_detall == "COMPLET") || ($log_detall == "DETALLAT") ) {
$log -> lwrite("La publicació és ".$visib_com."");
}
// $com = shell_exec("/usr/bin/php -f ".$lloc."/utils/bot_plus_comentaris.php ".$lloc." ".$data_ina." ".$data_dif."");
$com = exec("/usr/bin/php -f ".$lloc."/utils/bot_plus_comentaris.php ".$lloc." ".$data_ina." ".$data_dif."", $eixida_com, $resposta_com);
-// per verificar que exec ha funcionat
+ // per verificar que exec ha funcionat
if ($resposta_com != 0) {
- $log -> lwrite("INFO: comentaris: ".(($resposta_com == 0)?"correcte":"ERRADA")."");
- $msg = "INFO: comentaris: ".(($resposta_com == 0)?"correcte":"ERRADA")."";
+ $log -> lwrite("INFO: comentaris: ".(($resposta_com == 0)?"correcte":"ERRADA")." - ".__LINE__);
if($act_correu == 1) {
+ $msg = "INFO: comentaris: ".(($resposta_com == 0)?"correcte":"ERRADA")."\n".mostra_us_memoria()." ".mostra_pic_memoria()."";
enviaCorreu($elmeucompte,"| ".$bot_nom." v".$bot_versio." |",$msg,$elremitent);
}
}
+ if($control_memoria == 1) { $log -> lwrite ( mostra_us_memoria()." ".mostra_pic_memoria()." - ".__LINE__ ); }
}
// cronometre
$temps5 = microtime(true);
@@ -578,28 +662,19 @@ if ($act_coment == 1) {
$log -> lwrite("Temps comentari: ".$duradac." ".$nomt.".");
}
-if ($act_impuls == 1) {
- $com = exec("/usr/bin/php -f ".$lloc."/utils/bot_plus_impulsos.php ".$lloc." ", $eixida_imp, $resposta_imp);
- // per verificar que exec ha funcionat
- if ($resposta_imp != 0) {
- $log -> lwrite("INFO: impulsos: ".(($resposta_imp == 0)?"correcte":"ERRADA")."");
- $msg = "INFO: impulsos: ".(($resposta_imp == 0)?"correcte":"ERRADA")."";
- if($act_correu == 1) {
- enviaCorreu($elmeucompte,"| ".$bot_nom." v".$bot_versio." |",$msg,$elremitent);
- }
- }
-}
-
+acabar:
$log -> lwrite("He fet ".$pt." ".(($pt<>1)?"publicacions":"publicació")." en total.");
$temps6 = microtime(true);
$durada = $temps6 - $temps;
-//$log -> lwrite("Temps total: ".date("i:s",$durada)." minuts | ".round($durada,4)." segons ");
-$log -> lwrite("Temps total: ".(($durada>60)?date("i:s",$durada)." minuts | ".round($durada,4)." segons ":"".round($durada,4)." segons ")."");
-//echo "FINAL\n";
-$log -> lwrite ("FINAL!! ".$bot_nom." ".$bot_versio."");
+$log -> lwrite("Temps total: ".(($durada>60)?date("i:s",$durada)." minuts | ".round($durada,4)." segons.":"".round($durada,4)." segons.") );
+// buidar memoria amb variables null o unset
+if($mem_net_fin == 1) {
+$llista = null; $json_dec = null; $url_lin = null;$url_lin_b = null;$urls_an = null;$urls_bn = null;$linies = null;$comprovar = null;$url_hist = null;
+$channel = null; $registre = null; $registre_b = null; $msg = null; $filt_oratge = null; $eixida_csu = null;
+$durada = null; $temps1 = null; $temps2 = null; $temps3 = null; $temps4 = null; $temps5 = null; $temps6 = null; $eix_urlsr = null; $it = null; $gracies = null; $eixida_gr = null; $eixida_imp = null; $eixida_menc = null; $eixida_com = null;
+unset($llista,$json_dec,$url_lin,$url_lin_b,$urls_an,$urls_bn,$linies,$comprovar,$url_hist, $channel, $reg_lin, $reg_lin_bak, $msg, $eixida_csu, $eix_urlsr, $it, $gracies, $eixida_gr, $eixida_imp, $eixida_menc, $eixida_com);
+$log -> lwrite ( mostra_us_memoria()." ".mostra_pic_memoria()." - ".__LINE__ );
+} else { $log -> lwrite ( mostra_us_memoria()." ".mostra_pic_memoria()." - ".__LINE__ ); }
+$log -> lwrite ("FINAL!! ".$bot_nom." ".$bot_versio);
echo "Final manual. \n";
-//final
-if ($durada > 570) {
- exit;
-}
?>
diff --git a/bot_plus_utils.php b/bot_plus_utils.php
index 429f1aa..5c97be3 100644
--- a/bot_plus_utils.php
+++ b/bot_plus_utils.php
@@ -8,9 +8,25 @@ if (!empty($_SERVER["argv"][1])){
$data = $_SERVER["argv"][2];
} else {
presenta_ajuda();
+ goto memoria;
+ }
+ }
+ if($argument == "-regs") {
+ $opcio = null;
+ if(!empty($_SERVER["argv"][2])) {
+ $opcio = $_SERVER["argv"][2];
+ } else {
+ echo "Has de indicar la opció:\n a -> afegir\n ".
+ " b -> esborrar tot\n ".
+ " d -> darrera publicació\n ".
+ " e -> eliminar duplicats\n ".
+ " n -> triar un numero de registre\n ".
+ " r -> repassar registres.\n";
+// presenta_ajuda();
exit;
}
}
+
} else {
// Presenta l'ajuda
//$opcio = getopt("i::hp::");
@@ -23,87 +39,353 @@ if (!empty($_SERVER["argv"][1])){
$lloc = realpath(dirname(__FILE__));
include("configuracio/bot_plus_cfg.php");
+include("utils/bot_plus_funcions.php");
if ($argument == "-imp") {
$impuls = shell_exec("php utils/bot_plus_consultaimpulsos.php ".$lloc);
echo $impuls."\n";
+//$impuls_inst = shell_exec("php -f proves/proves_estadistiques_inst_impulsos_nopub.php ".$lloc);
+//echo $impuls_inst."\n";
}
elseif ($argument == "-impj") {
-$impuls_json = shell_exec("php proves/proves_impulsos_json_cli.php ".$lloc);
+$impuls_json = shell_exec("php utils_cli/bot_plus_impulsos_json_cli.php ".$lloc);
echo $impuls_json."\n";
+
+// preguntar si vols volcar-ho al fitxer .txt
+echo "\nVols actualitzar el fitxer json dels impulsos amb les dades del fitxer txt? (Si/No)\n";
+$handle = fopen ("php://stdin","r");
+$line = fgets($handle);
+if( (trim($line) != 'Si') ){
+ echo "HE ACABAT DONCS!\n";
+ goto memoria;
+ exit;
+}
+fclose($handle);
+echo "\n";
+echo "Gràcies, l'actualitze...\n";
+
+$act_imps = shell_exec("php utils_cli/bot_plus_cli_impulsos_txtjson_cli_refer.php ".$lloc);
+echo $act_imps;
+
}
elseif ($argument == "-fitxs") {
-$data_pu = shell_exec("wc -l fitxers/dates.txt");
-$data_bc = shell_exec("wc -l fitxers/dates.bak");
-$urls_pu = shell_exec("wc -l fitxers/urls_pub.txt");
-$urls_bc = shell_exec("wc -l fitxers/urls_pub.bak");
-$imps_rg = shell_exec("wc -l fitxers/impulsos.txt");
-$menc_rg = shell_exec("wc -l fitxers/mencions.txt");
+$data_pu = shell_exec("wc -l < fitxers/dates.txt");
+$data_bc = shell_exec("wc -l < fitxers/dates.bak");
+$urls_pu = shell_exec("wc -l < fitxers/urls_pub.txt");
+$urls_bc = shell_exec("wc -l < fitxers/urls_pub.bak");
+$imps_ri = shell_exec("wc -l < fitxers/impulsos.txt");
+$imps_rb = shell_exec("wc -l < fitxers/impulsos.bak");
+//$imps_rgm = exec("wc -l fitxers/impulsos.txt", $eix_irgm, $resp_irgm);
+$menc_ax = shell_exec("wc -l < fitxers/mencions.txt");
+$menc_ab = shell_exec("wc -l < fitxers/mencions.bak");
+$menc_rm = shell_exec("wc -l < fitxers/mencions_r.txt");
+$menc_rb = shell_exec("wc -l < fitxers/mencions_r.bak");
+//$menc_jm = shell_exec("wc -l < fitxers/mencions.json");
+//$menc_em = shell_exec("wc -l < fitxers/mencions_em.json");
+$fitxer = "fitxers/mencions.json";
+$json_dec = json_decode(file_get_contents($fitxer), true);
+$menc_jm = count($json_dec);
+$fitxer1 = "fitxers/mencions_em.json";
+$json_dec1 = json_decode(file_get_contents($fitxer1), true);
+$menc_em = count($json_dec1);
+$fitxer2 = "fitxers/impulsos.json";
+$json_dec2 = json_decode(file_get_contents($fitxer2), true);
+$imps_js = count($json_dec2);
+
echo "LINIES DELS FITXERS \n";
-echo $data_pu;
-echo $data_bc;
-echo $urls_pu;
-echo $urls_bc."\n";
-echo $imps_rg."";
-echo $menc_rg."\n";
+echo trim($data_pu)." linies al fitxer de dates. \t\t\t".(($data_pu == $data_bc)?"\t\e[92m[correcte]\e[0m":"\t\e[91mATENCIÓ!!\e[0m")."\n";
+echo trim($data_bc)." linies al fitxer de seguretat de les dates. \n";
+echo trim($urls_pu)." linies al fitxer de url. \t\t\t".(($urls_pu == $urls_bc)?"\t\e[92m[correcte]\e[0m":"\t\e[91mATENCIÓ!!\e[0m")."\n";
+echo trim($urls_bc)." linies al fitxer de seguretat de les url.\n";
+echo trim($menc_ax)." linies al fitxer de les mencions.\t\t ".(($menc_ax == $menc_ab)?"\t\e[92m[correcte]\e[0m":"\t\e[91mATENCIÓ!!\e[0m")."\n";
+echo trim($menc_ab)." linies al fitxer de seguretat de les mencions.\n";
+echo trim($menc_rm)." linies al fitxer de registre de les mencions. ".(($menc_rm == $menc_rb)?"\t\e[92m[correcte]\e[0m":"\t\e[91mATENCIÓ!!\e[0m")."\n";
+echo trim($menc_rb)." linies al fitxer de seguretat del registre de les mencions.\n";
+echo trim($menc_jm)." registres al fitxer json de les mencions.\n";
+echo trim($menc_em)." registres al fitxer json de les emocions.\n";
+echo trim($imps_ri)." linies al fitxer dels impulsos. \t\t".(($imps_ri == $imps_rb)?"\t\e[92m[correcte]\e[0m":"\t\e[91mATENCIÓ!!\e[0m") ."\n";
+echo trim($imps_rb)." linies al fitxer de seguretat dels impulsos. \n";
+echo trim($imps_js)." registres al fitxer json dels impulsos.\t ".((($imps_ri == $imps_rb)&&($imps_rb == $imps_js))?"\t\e[92m[correcte]\e[0m":"\t\e[91mATENCIÓ!!\e[0m")."\n";
+
+/**
+echo "matriu\n";
+$imps_rgm = explode(" ",$imps_rg);
+print_r($imps_rgm);
+echo $imps_rgm[0];
+**/
}
elseif ($argument == "-mencs") {
//include("proves/proves_mencions_json.php");
-$mencions = shell_exec("php ".$lloc."/proves/proves_mencions_json_cli.php ".$lloc);
-echo $mencions."\n";
+//$mencions = shell_exec("php ".$lloc."/proves/proves_mencions_json_cli.php ".$lloc);
+$mencions = exec("php ".$lloc."/utils_cli/bot_plus_cli_mencions_json_cli.php ".$lloc, $eix_mencs, $resp_mencs);
+//echo $mencions."\n";
+
+ foreach ($eix_mencs as $clau => $valor) {
+// echo $det_segs;
+ echo $valor."\n";
+ usleep(400000);
+ }
+
+// preguntar si vols volcar-ho al fitxer .txt
+echo "\nVols actualitzar el fitxer de les mencions? (Si/No)\n";
+$handle = fopen ("php://stdin","r");
+$line = fgets($handle);
+ if( (trim($line) != 'Si') ){
+ echo "HE ACABAT DONCS!\n";
+ goto memoria;
+// exit;
+ }
+fclose($handle);
+echo "\n";
+echo "Gràcies, els actualitze...\n";
+
+$act_mencs = shell_exec("php utils_cli/bot_plus_cli_mencions_json_cli_refer.php ".$lloc);
+echo $act_mencs;
+// bolcat a fitxer .txt
+echo "\nActualització feta.\n";
+$menc_reg = shell_exec("wc -l fitxers/mencions.txt");
+echo "El fitxer té ara ".$menc_reg."";
+goto memoria;
}
+elseif ($argument == "-emoci") {
+//$mencs_em = shell_exec("php proves/proves_mencions_em_json_cli.php ".$lloc." 1");
+//echo $mencs_em;
+$mencs_em = exec("php utils_cli/bot_plus_cli_mencions_em_json_cli.php ".$lloc." 1", $eix_em,$resp_em);
+
+ foreach ($eix_em as $clau => $valor) {
+ echo $valor."\n";
+ usleep(200000);
+ }
+
+// preguntar si vols volcar-ho al fitxer .txt
+echo "\nVols actualitzar el fitxer de les emocions? (Si/No)\n";
+$handle = fopen ("php://stdin","r");
+$line = fgets($handle);
+if( (trim($line) != 'Si') ){
+ echo "HE ACABAT DONCS!\n";
+ goto memoria;
+// exit;
+}
+fclose($handle);
+echo "\n";
+echo "Gràcies, l'actualitze...\n";
+
+$act_emjson = shell_exec("php utils_cli/bot_plus_cli_mencions_em_json_cli.php ".$lloc." 0");
+echo $act_emjson;
+}
+
elseif ($argument == "-info") {
//include("proves/proves_mencions_json.php");
-echo "La versió actual és la ".$bot_versio."\n";
+echo "\e[1mINFORME \e[0m ".$bot_nom." ".$bot_versio." - ".date('d/m/Y H:i:s',strtotime('now'))."\n";
+//echo "La versió actual és la ".$bot_versio."\n";
+$n_pub = shell_exec("cat ".$lloc."/fitxers/compte_pub.txt");
+$n_pub = shell_exec("cat ".$lloc."/fitxers/compte_pub.txt");
+$s_pub = shell_exec("cat ".$lloc."/fitxers/compte_setm.txt");
+$tuts_setm = ($n_pub - $s_pub);
+$fit_imp = $lloc."/fitxers/impulsos_temps.txt";
+
+echo "N'he publicat un total de ".$n_pub." tuts, ".$tuts_setm." des del ".date("d/m/Y",(filemtime($fit_imp)))." a les ".date("H:i:s",(filemtime($fit_imp))).".\n";
$d_pub = shell_exec("cat ".$lloc."/fitxers/data_pub.txt");
echo "La darrera publicació l'he feta el ".date("d/m/Y",$d_pub)." a les ".date("H:i:s",$d_pub)."\n";
+$comentari_anterior = $lloc."/fitxers/comentari_pub.txt";
+echo "El darrer comentari automàtic l'he publicat a ".date('d/m/Y H:i:s',filemtime(($comentari_anterior)))."\n";
+$fitxer = $lloc."/fitxers/compte_vis.txt";
+echo "La darrera connexió l'he fet a ".date("d/m/Y H:i:s",(filemtime($fitxer)))."\n";
echo "Els fixers estan a ".$lloc."\n";
-$data_pu = shell_exec("wc -l fitxers/dates.txt");
-$data_bc = shell_exec("wc -l fitxers/dates.bak");
-$urls_pu = shell_exec("wc -l fitxers/urls_pub.txt");
-$urls_bc = shell_exec("wc -l fitxers/urls_pub.bak");
-$imps_rg = shell_exec("wc -l fitxers/impulsos.txt");
-$menc_rg = shell_exec("wc -l fitxers/mencions.txt");
-echo "\nLINIES DELS FITXERS \n";
-echo $data_pu;
-echo $data_bc;
-echo $urls_pu;
-echo $urls_bc."\n";
-echo $imps_rg."";
-echo $menc_rg."\n";
+$data_pu = shell_exec("wc -l < fitxers/dates.txt");
+$data_bc = shell_exec("wc -l < fitxers/dates.bak");
+$urls_pu = shell_exec("wc -l < fitxers/urls_pub.txt");
+$urls_bc = shell_exec("wc -l < fitxers/urls_pub.bak");
+$imps_rg = shell_exec("wc -l < fitxers/impulsos.txt");
+$menc_rg = shell_exec("wc -l < fitxers/mencions_r.txt");
+$menc_ax = shell_exec("wc -l < fitxers/mencions.txt");
+$menc_bk = shell_exec("wc -l < fitxers/mencions.bak");
-$errada = shell_exec("cat ".$lloc."/fitxers/errada_cont.txt");
-echo "En ".$errada." voltes no he pogut connectar per obtindre la font xml o RSS.\n";
+echo "\e[1mLINIES DELS FITXERS \e[0m (més detalls amb la opció -fitxs) \n";
+echo trim($data_pu)." linies al fitxer de dates. ".(($data_pu == $data_bc)?"\t\e[92m[correcte]\e[0m":"\t\e[91mATENCIÓ!! ".trim($data_bc)." al de seguretat\e[0m")."\n";
+//echo trim($data_bc)." linies al fitxer de seguretat de les dates.\n";
+echo trim($urls_pu)." linies al fitxer de urls. ".(($urls_pu == $urls_bc)?"\t\e[92m[correcte]\e[0m":"\t\e[91mATENCIÓ!! ".trim($urls_bc)." al de seguretat\e[0m")."\n";
+$fit_json = $lloc."/fitxers/registre.json";
+$json_dec = json_decode(file_get_contents($fit_json), true);
+$reg_arx = count($json_dec);
+echo "Registre de publicacions en format json té ".$reg_arx." registres.\n";
+//echo trim($urls_bc)." linies al fitxer de seguretat de les url.\n";
+echo trim($menc_rg)." linies al registre txt de les mencions. ".(($menc_ax == $menc_bk)?"\t\e[92m[correcte]\e[0m":"\t\e[91mATENCIÓ!! ".trim($menc_bk)." al de seguretat\e[0m")."\n";
+//echo trim($menc_ax)." linies a l'arxiu de les mencions.\n";
+$fitx_json2 = $lloc."/fitxers/mencions.json";
+$json_deco = json_decode(file_get_contents($fitx_json2), true);
+$reg_arxs = count($json_deco);
+echo "Registre de mencions en format json té ".$reg_arxs." registres.\n";
+$fitx_json3 = $lloc."/fitxers/mencions_em.json";
+$json_decod = json_decode(file_get_contents($fitx_json3), true);
+if($json_decod<>null){
+$reg_emos = count($json_decod);
+}else{
+print "\e[91mEl fitxer json de les emocions està buit. Prova a restaurar-lo amb l'opció -emoci.\e[0m\n";
+goto graficainfo;
+}
+echo "Registre de les emocions en format json té ".$reg_emos." registres. ".(($reg_emos == $reg_arxs)?"\t\e[92m[els dos json son iguals]\e[0m":"\t\e[91mATENCIÓ!! son diferents.\e[0m")."\n";
+graficainfo:
+echo "\e[1mGRAFICS \e[0m \n";
+$fitxer_g01 = $lloc."/grafic/grafic.png";
+$fitxer_g02 = $lloc."/grafic/grafic_imp.png";
+$fitxer_g03 = $lloc."/grafic/grafic_setm_imp.png";
+$fitxer_g04 = $lloc."/grafic/grafic_setm_fav.png";
+echo "El gràfic dels impulsos l'he fet el ".date("d/m/Y H:i:s",(filemtime($fitxer_g02)))."\n";
+echo "Els gràfics dels reblocs pels dies de la setmana l'he fet el ".date("d/m/Y H:i:s",(filemtime($fitxer_g03)))."\n".
+"i el dels favorits el ".date("d/m/Y H:i:s",(filemtime($fitxer_g04)))."\n";
+echo "El gràfic d'activitat dels seguidors l'he fet el ".date("d/m/Y H:i:s",(filemtime($fitxer_g01)))."\n";
+//echo "Els gràfics son a ".$lloc."/grafic/\n\n";
+
+echo "\e[1mESTADÍSTIQUES \e[0m (més detalls amb la opció -imp)\n";
+$fit_imp = $lloc."/fitxers/impulsos.txt";
+$espera_ob = fopen($lloc . "/fitxers/impulsos_temps.txt", "r") or die("No puc obrir la darrera data!");
+$espera_ll = fread($espera_ob,filesize($lloc . "/fitxers/impulsos_temps.txt"));
+$espera_imp = $espera_ll;
+fclose($espera_ob);
+//echo "".$espera_imp." | ".date("r",($espera_imp))."\n";
+
+//echo "La propera publicació d'estadístiques la faré el ".date("r",$espera_imp)."\n\n";
+setlocale(LC_ALL, 'ca_ES.UTF-8');
+//echo setlocale(LC_ALL, 'ca_ES');
+//echo(strftime("%B %d %Y, %X %Z",$espera_imp)."
");
+//echo "strfotime\n";
+echo "Hi ha ".trim($imps_rg)." registres d'impulsos (favorits i reblocs).\n";
+echo "Darrer registre: ".date("d/m/Y H:i:s",(filemtime($fit_imp)))."\n";
+echo "Propera publicació: ".(strftime("%A %d/%m/%Y a les %H:%M:%S", $espera_imp))."\n";
+//echo "La propera publicació d'estadístiques la faré el ".date("r",$espera_imp)."\n\n";
+
+echo "\e[1mSEGUIDORS \e[0m (més dades amb -segs o -asegs)\n";
$seguid = shell_exec("cat fitxers/seg_cont.txt");
$seguidc = shell_exec("cat fitxers/cents_cont.txt");
-echo "\n".$seguid." seguidors actualment\n";
-echo $seguidc. " és el máxim de seguidors. (cents) \n";
-
+$segs_f = $lloc."/fitxers/seg_cont.txt";
+$segs_c = $lloc."/fitxers/cents_cont.txt";
+echo "".$seguid." seguidors actualment ".(($seguid == $seguidc)?"i és el màxim que n'he tingut.":"i el màxim ha sigut de ".$seguidc." seguidors.")."\n";
+echo "Màxim assolit el ".date("d/m/Y H:i:s",(filemtime($segs_c)))."\n";
+echo "Darrer moviment: ".date("d/m/Y H:i:s",(filemtime($segs_f)))."\n";
+//echo $seguidc. " és el máxim de seguidors. (cents) \n";
+echo "\e[1mERRADES \e[0m \n";
+$errada = shell_exec("cat ".$lloc."/fitxers/errada_cont.txt");
+$errada_f = $lloc."/fitxers/errada_cont.txt";
+$errada_mod = $errada -1;
+$fit_imp = $lloc."/fitxers/impulsos_temps.txt";
+echo "En ".$errada_mod." ".(($errada_mod == 1)?"volta ":"voltes ")."no he pogut connectar per obtindre la font xml o RSS.\n";
+echo "Inici del registre: ".date("d/m/Y H:i:s",(filemtime($fit_imp)))."\n";
+echo "Darrer registre: ".date("d/m/Y H:i:s",(filemtime($errada_f)))."\n";
}
elseif ($argument == "-graf") {
+// preguntar si vols crear els gràfics
+echo "\nNOMÉS EN CAS DE EXTREMA NECESSITAT\nHas de confirmar que vols generar els gràfics amb les dades que hi ha. (Si/No)\n";
+$handle = fopen ("php://stdin","r");
+$line = fgets($handle);
+if( (trim($line) != 'Si') ){
+ echo "HAS EVITAT UNA CATASTROFE PER AL BOT. GRÀCIES,\nJA HE ACABAT DONCS!\n";
+ goto memoria;
+// exit;
+}
+fclose($handle);
+echo "\n";
+echo "Gràcies, els genere i la data de moficicació a -info serà errònia.\n";
+
$graf_est = shell_exec("/usr/bin/php -f ".$lloc."/utils/bot_plus_fergrafic.php ".$lloc."/");
$graf_imp = shell_exec("php ".$lloc."/utils/bot_plus_fergrafic_imp.php ".$lloc."/");
-//echo $inst_est;
+$graf_setm = shell_exec("php ".$lloc."/utils/bot_plus_fergrafic_setm.php ".$lloc."/");
+echo "Grafics creats el ".date('d/m/Y H:i:s',strtotime('now'))."\n";
+
+goto memoria;
}
elseif ($argument == "-inst") {
-$inst_est = shell_exec("php proves/proves_estadistiques_seguidors_nopub.php ".$lloc);
+$inst_est = shell_exec("php utils_cli/bot_plus_cli_estadistiques_seguidors_nopub.php ".$lloc);
echo $inst_est;
+
+// preguntar si vols volcar-ho al fitxer .txt
+echo "\nVols publicar el tut del repartiment d'instàncies? (Si/No)\n";
+$handle = fopen ("php://stdin","r");
+$line = fgets($handle);
+if( (trim($line) != 'Si') ){
+ echo "HE ACABAT DONCS!\n";
+ goto memoria;
+// exit;
+}
+fclose($handle);
+echo "\n";
+echo "Gràcies, el publique...\n";
+
+$pub_inst = shell_exec("php utils/bot_plus_estadistiques_seguidors.php ".$lloc);
+echo $pub_inst;
+
+goto memoria;
+
+}
+elseif ($argument == "-regs") {
+
+ if($opcio == "r") {
+ $registres = exec("php utils_cli/bot_plus_cli_registre_json_cli.php ".$lloc." r ", $eix_reg, $resp_reg);
+ //echo $pub_inst;
+ $e = 0;
+ foreach ($eix_reg as $clau => $valor) {
+// echo $det_segs;
+ echo $valor."\n";
+ if(is_int($e/9)) {
+// usleep(280000);
+ sleep(2);
+ }
+ $e++;
+ }
+ }
+ elseif($opcio == "a") {
+ $registres = exec("php utils_cli/bot_plus_cli_registre_json_cli.php ".$lloc." a ", $eix_reg, $resp_reg);
+ echo $registres."\n";
+ }
+ elseif($opcio == "b") {
+ $registres = exec("php utils_cli/bot_plus_cli_registre_json_cli.php ".$lloc." b ", $eix_reg, $resp_reg);
+ echo $registres."\n";
+ }
+ elseif($opcio == "d") {
+ $registres = exec("php utils_cli/bot_plus_cli_registre_json_cli.php ".$lloc." d ", $eix_reg, $resp_reg);
+ echo implode("\n",$eix_reg)."\n";
+// print_r($eix_reg);
+ }
+ elseif($opcio == "e") {
+ $registres = exec("php utils_cli/bot_plus_cli_registre_json_cli.php ".$lloc." e ", $eix_reg, $resp_reg);
+ echo implode("\n",$eix_reg)."\n";
+// print_r($eix_reg);
+ }
+ elseif($opcio == "n") {
+ $registres = exec("php utils_cli/bot_plus_cli_registre_json_cli.php ".$lloc." n ", $eix_reg, $resp_reg);
+ echo implode("\n",$eix_reg)."\n";
+// print_r($eix_reg);
+ }
+ else {
+ echo "Has de indicar la opció:\n a -> afegir\n b -> esborrar tot\n r -> repassar registres.\n";
+ exit;
+ }
+ goto memoria;
+}
+
+elseif ($argument == "-urlsr") {
+$url_rec = shell_exec("php utils_cli/bot_plus_urls_json_cli_refer.php ".$lloc);
+echo $url_rec."\n";
+goto memoria;
}
elseif ($argument == "-ctemps") {
$dataconv = shell_exec("php utils/bot_plus_convdate.php ".$data);
echo $dataconv."\n";
+goto memoria;
+
}
elseif ($argument == "-vvars") {
$matvars = get_defined_vars();
ksort($matvars);
print_r($matvars);
+goto memoria;
}
elseif ($argument == "-segs") {
@@ -123,20 +405,51 @@ elseif ($argument == "-segs") {
echo "\nVols revisar els seguidors un a un? (Si/No)\n";
$handle = fopen ("php://stdin","r");
$line = fgets($handle);
- if( (trim($line) != 'Si') ){
+ if( (trim($line) != "Si") ){
+ echo "HE ACABAT DONCS!\n";
+ goto memoria;
+// exit;
+ }
+ fclose($handle);
+ echo "\n";
+ echo "Gràcies, els repassem...\n";
+
+// $det_segs = shell_exec("php proves/bot_plus_seguidors_json.php ".$lloc);
+ $det_segs = exec("php utils_cli/bot_plus_cli_seguidors_json.php ".$lloc, $eixida_segs, $resposta_segs);
+// print_r($eixida_segs);
+// $eixida_segs_cad = implode("\n",$eixida_segs);
+// echo $eixida_segs_cad;
+// $eixida_segs_m = explode("\n",$eixida_segs_cad);
+// print_r($eixida_segs_m);
+// for($l=0;$l<$seguid;$l++) {
+ foreach ($eixida_segs as $clau => $valor) {
+// echo $det_segs;
+ echo $valor."\n";
+ usleep(400000);
+ }
+ }
+ goto memoria;
+/**
+ echo "\nVols actualitzar els fitxers de seguidors? (Si/No)\n";
+ $handle = fopen ("php://stdin","r");
+ $line = fgets($handle);
+ if( (trim($line) != "Si") ){
echo "HE ACABAT DONCS!\n";
exit;
}
fclose($handle);
echo "\n";
- echo "Gràcies, els repassem...\n";
- include("proves/proves_seguidors_json.php");
-// $det_segs = shell_exec("php proves/proves_seguidors_json.php ".$lloc);
-// echo $det_segs;
- }
+ echo "Gràcies, els actualitze...\n";
+// include("proves/proves_seguidors_json.php");
+
+ $act_segs = shell_exec("php utils/bot_plus_benvinguda.php ".$lloc);
+// for($l=0;$l<$seguid;$l++) {
+// echo $act_segs;
+**/
} elseif ($argument == "-asegs") {
- $act_segs = shell_exec("php proves/proves_activitat_seguidors_nopub.php ".$lloc);
+ $act_segs = shell_exec("php utils_cli/bot_plus_activitat_seguidors_nopub.php ".$lloc." 0");
echo $act_segs."\n";
+ goto memoria;
} elseif ($argument == "-ajuda"){
echo "Estes on les opcions disponibles de \n";
presenta_ajuda();
@@ -144,7 +457,8 @@ presenta_ajuda();
else {
echo "\nLA OPCIÓ ÉS INCORRECTA.\n\n";
presenta_ajuda();
-exit;
+goto memoria;
+//exit;
}
/**
$opcions_curtes = "i::m::s::a::n::";
@@ -160,6 +474,7 @@ echo "he rebut la opció impulsos en versió ";
}
}
**/
+
function presenta_ajuda() {
echo "bot_plus_utils per bonobo <@bonobo@mastodont.cat>.\n\n";
echo "Ús de ".$_SERVER["argv"][0]." \n";
@@ -170,7 +485,10 @@ function presenta_ajuda() {
echo "\t -imp \tConsulta els impulsos guardats fins el moment i els presenta per pantalla.\n";
echo "\t -impj \tConsulta els impulsos guardats fins el moment i els presenta i actualitza el fitxer json.\n";
echo "\t -mencs \tActualitza el fitxer json de mencions al bot.\n";
- echo "\t -graf \tGenera els gràfics del resum setmanal.(en proves)\n";
+ echo "\t -emoci \tConsulta els fitxer json de les valoracions de les mencions.\n";
+ echo "\t -regs \tRepassa el registre de noticies publicades. (Té opcions)\n";
+ echo "\t -urlsr \tRecupera els fitxers d'url a partir del registre json de les publicades.\n";
+ echo "\t -graf \tGenera els gràfics del resum setmanal.\n";
echo "\t -segs \tEt mostra el nombre de seguidors actuals del compte.\n";
echo "\t -asegs \tEt la estadística per setmanes de la darrera publicació de tuts dels seguidors.\n";
echo "\t -inst \tEstadistica de quina instància son els seguidors.\n";
@@ -182,4 +500,9 @@ function presenta_ajuda() {
echo "\t /el/cami/fins/la/carpeta/".$_SERVER["argv"][0]." -opció\n";
echo "Espere que't siga util. 😉 \n";
}
+
+memoria:
+echo "\n".mostra_us_memoria()." ".mostra_pic_memoria()."\n";
+exit;
+
?>